X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fzeroplus.c;h=480ee9db7c171bd0bbb1eab990414af5e3c71358;hb=e31b636df6651ae17f9bb28c51157a51fc92c421;hp=415a5a5c605ccc5ef8f51ccd4a1d8161853ba807;hpb=a1bb33afbde769156ad4bef7a60579da64aebbb7;p=libsigrok.git

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index 415a5a5c..480ee9db 100644
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -74,7 +74,7 @@ static GSList *device_instances = NULL;
 
 static libusb_context *usb_context = NULL;
 
-/* The hardware supports more sample rates than these, but these are the options
+/* The hardware supports more samplerates than these, but these are the options
    hardcoded into the vendor's Windows GUI */
 
 // XXX we shouldn't support 150MHz and 200MHz on devices that don't go up that high
@@ -242,7 +242,7 @@ static int configure_probes(GSList *probes)
 					trigger_value[stage] |= probe_bit;
 				stage++;
 				if(stage > NUM_TRIGGER_STAGES)
-					return SIGROK_NOK;
+					return SIGROK_ERR;
 			}
 		}
 	}
@@ -304,13 +304,13 @@ static int hw_opendev(int device_index)
 
 	if( !(sdi = zp_open_device(device_index)) ) {
 		g_warning("unable to open device");
-		return SIGROK_NOK;
+		return SIGROK_ERR;
 	}
 
 	err = libusb_claim_interface(sdi->usb->devhdl, USB_INTERFACE);
 	if(err != 0) {
 		g_warning("Unable to claim interface: %d", err);
-		return SIGROK_NOK;
+		return SIGROK_ERR;
 	}
 	analyzer_reset(sdi->usb->devhdl);
 	analyzer_initialize(sdi->usb->devhdl);
@@ -331,8 +331,8 @@ static int hw_opendev(int device_index)
 
 	if(cur_samplerate == 0) {
 		/* sample rate hasn't been set; default to the slowest it has */
-		if(hw_set_configuration(device_index, HWCAP_SAMPLERATE, &samplerates.low) == SIGROK_NOK)
-			return SIGROK_NOK;
+		if(hw_set_configuration(device_index, HWCAP_SAMPLERATE, &samplerates.low) == SIGROK_ERR)
+			return SIGROK_ERR;
 	}
 
 	return SIGROK_OK;
@@ -393,7 +393,7 @@ static void *hw_get_device_info(int device_index, int device_info_id)
 	case DI_TRIGGER_TYPES:
 		info = TRIGGER_TYPES;
 		break;
-	case DI_CUR_SAMPLE_RATE:
+	case DI_CUR_SAMPLERATE:
 		info = &cur_samplerate;
 		break;
 	}
@@ -442,7 +442,7 @@ static int hw_set_configuration(int device_index, int capability, void *value)
 	uint64_t *tmp_u64;
 
 	if( !(sdi = get_sigrok_device_instance(device_instances, device_index)) )
-		return SIGROK_NOK;
+		return SIGROK_ERR;
 
 	switch (capability) {
 		case HWCAP_SAMPLERATE:
@@ -457,7 +457,7 @@ static int hw_set_configuration(int device_index, int capability, void *value)
 			return SIGROK_OK;
 
 		default:
-			return SIGROK_NOK;
+			return SIGROK_ERR;
 	}
 }
 
@@ -471,7 +471,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	unsigned char *buf;
 
 	if( !(sdi = get_sigrok_device_instance(device_instances, device_index)))
-		return SIGROK_NOK;
+		return SIGROK_ERR;
 
 	analyzer_start(sdi->usb->devhdl);
 	g_message("Waiting for data");
@@ -486,14 +486,14 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	packet.payload = (unsigned char *) &header;
 	header.feed_version = 1;
 	gettimeofday(&header.starttime, NULL);
-	header.rate = cur_samplerate;
+	header.samplerate = cur_samplerate;
 	header.protocol_id = PROTO_RAW;
 	header.num_probes = num_channels;
 	session_bus(session_device_id, &packet);
 
 	buf = g_malloc(PACKET_SIZE);
 	if (!buf)
-		return SIGROK_NOK;
+		return SIGROK_ERR;
 	analyzer_read_start(sdi->usb->devhdl);
 	/* send the incoming transfer to the session bus */
 	for(packet_num = 0; packet_num < (memory_size * 4 / PACKET_SIZE); packet_num++) {