From fb8b36cd41e35afec15e48152fc39bb469d3db86 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Sat, 17 Feb 2018 12:10:46 +0800
Subject: [PATCH] clean up ccc279b8

---
 artiq/firmware/libboard_artiq/build.rs       | 24 --------------------
 artiq/firmware/libboard_artiq/hmc830_7043.rs |  3 +--
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/artiq/firmware/libboard_artiq/build.rs b/artiq/firmware/libboard_artiq/build.rs
index 508c9f935..3548ea5ff 100644
--- a/artiq/firmware/libboard_artiq/build.rs
+++ b/artiq/firmware/libboard_artiq/build.rs
@@ -1,29 +1,5 @@
 extern crate build_misoc;
 
-use std::env;
-use std::fs::File;
-use std::io::Write;
-use std::path::Path;
-use std::process::Command;
-
-fn gen_hmc7043_writes() {
-    println!("cargo:rerun-if-changed=hmc7043_gen_writes.py");
-    println!("cargo:rerun-if-changed=hmc7043_guiexport_6gbps.py");
-
-    let hmc7043_writes =
-        Command::new("python3")
-                .arg("hmc7043_gen_writes.py")
-                .arg("hmc7043_guiexport_6gbps.py")
-                .output()
-                .ok()
-                .and_then(|o| String::from_utf8(o.stdout).ok())
-                .unwrap();
-    let out_dir = env::var("OUT_DIR").unwrap();
-    let mut f = File::create(Path::new(&out_dir).join("hmc7043_writes.rs")).unwrap();
-    write!(f, "{}", hmc7043_writes).unwrap();
-}
-
 fn main() {
     build_misoc::cfg();
-    gen_hmc7043_writes();
 }
diff --git a/artiq/firmware/libboard_artiq/hmc830_7043.rs b/artiq/firmware/libboard_artiq/hmc830_7043.rs
index 96688d661..80406251c 100644
--- a/artiq/firmware/libboard_artiq/hmc830_7043.rs
+++ b/artiq/firmware/libboard_artiq/hmc830_7043.rs
@@ -113,8 +113,7 @@ mod hmc830 {
                     if addr == 0x0d || addr == 0x0e { continue; }
                     error!("[0x{:02x}] = 0x{:04x}", addr, read(addr));
                 }
-            //    return Err("HMC830 lock timeout");
-                break;
+                return Err("HMC830 lock timeout");
             }
         }