From: Uwe Hermann <redacted>
Date: Wed, 18 Jul 2012 10:24:26 +0000 (+0200)
Subject: Update fx2lafw code to work with recent sdcc.
X-Git-Tag: sigrok-firmware-fx2lafw-0.1.0~17
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=8819f75c56450ef49739c3e968d70c7c777d9161;p=sigrok-firmware-fx2lafw.git

Update fx2lafw code to work with recent sdcc.
---

diff --git a/fx2lafw.c b/fx2lafw.c
index 018f7604..7fe95284 100644
--- a/fx2lafw.c
+++ b/fx2lafw.c
@@ -50,7 +50,7 @@
 #include <gpif-acquisition.h>
 
 /* ... */
-volatile bit got_sud;
+volatile __bit got_sud;
 BYTE vendor_command;
 
 static void setup_endpoints(void)
@@ -194,24 +194,24 @@ BOOL handle_set_configuration(BYTE cfg)
 	return (cfg == 1) ? TRUE : FALSE;
 }
 
-void sudav_isr(void) interrupt SUDAV_ISR
+void sudav_isr(void) __interrupt SUDAV_ISR
 {
 	got_sud = TRUE;
 	CLEAR_SUDAV();
 }
 
-void sof_isr(void) interrupt SOF_ISR using 1
+void sof_isr(void) __interrupt SOF_ISR __using 1
 {
 	CLEAR_SOF();
 }
 
-void usbreset_isr(void) interrupt USBRESET_ISR
+void usbreset_isr(void) __interrupt USBRESET_ISR
 {
 	handle_hispeed(FALSE);
 	CLEAR_USBRESET();
 }
 
-void hispeed_isr(void) interrupt HISPEED_ISR
+void hispeed_isr(void) __interrupt HISPEED_ISR
 {
 	handle_hispeed(TRUE);
 	CLEAR_HISPEED();
diff --git a/gpif-acquisition.c b/gpif-acquisition.c
index 3d80280a..4878b513 100644
--- a/gpif-acquisition.c
+++ b/gpif-acquisition.c
@@ -27,7 +27,7 @@
 #include <fx2lafw.h>
 #include <gpif-acquisition.h>
 
-bit gpif_acquiring;
+__bit gpif_acquiring;
 
 static void gpif_reset_waveforms(void)
 {