X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fanalyzer.c;h=79377f184e591d92d529c3a8b4323245a573550d;hb=c2fa697afa86a8e6f37bef13acb5b8532714274e;hp=6f3e6cf904727949c60e8972d1577ee862501e41;hpb=0ab0cb942f59e2232921c10d79ed43cad6cf3153;p=libsigrok.git diff --git a/hardware/zeroplus-logic-cube/analyzer.c b/hardware/zeroplus-logic-cube/analyzer.c index 6f3e6cf9..79377f18 100644 --- a/hardware/zeroplus-logic-cube/analyzer.c +++ b/hardware/zeroplus-logic-cube/analyzer.c @@ -1,5 +1,5 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrok project. * * Copyright (C) 2010 Sven Peter * Copyright (C) 2010 Haxx Enterprises @@ -30,9 +30,11 @@ */ #include +#include "libsigrok.h" +#include "libsigrok-internal.h" #include "analyzer.h" #include "gl_usb.h" -#include "libsigrok-internal.h" +#include "protocol.h" enum { HARD_DATA_CHECK_SUM = 0x00, @@ -244,7 +246,7 @@ static int __analyzer_set_freq(libusb_device_handle *devh, int freq, int scale) break; } - sr_dbg("zp: Setting samplerate regs (freq=%d, scale=%d): " + sr_dbg("Setting samplerate regs (freq=%d, scale=%d): " "reg0: %d, reg1: %d, reg2: %d, reg3: %d.", freq, scale, divisor, reg0, 0x02, reg2); @@ -318,7 +320,7 @@ static int __analyzer_set_freq(libusb_device_handle *devh, int freq, int scale) if (!f[i].freq) return -1; - sr_dbg("zp: Setting samplerate regs (freq=%d, scale=%d): " + sr_dbg("Setting samplerate regs (freq=%d, scale=%d): " "reg0: %d, reg1: %d, reg2: %d, reg3: %d.", freq, scale, f[i].div, f[i].mul, 0x02, f[i].sel); @@ -399,6 +401,7 @@ SR_PRIV void analyzer_initialize(libusb_device_handle *devh) SR_PRIV void analyzer_wait(libusb_device_handle *devh, int set, int unset) { int status; + while (1) { status = gl_reg_read(devh, DEV_STATUS); if ((status & set) && ((status & unset) == 0))