GlasgowEmbedded · Aug 6, 2019 · Aug 6, 2019
Showing with 7 additions and 2 deletions.

+1 −1 firmware/glasgow.h

+5 −0 firmware/main.c

+1 −1 vendor/libfx2
diff --git a/firmware/glasgow.h b/firmware/glasgow.h
@@ -63,7 +63,7 @@ enum {
 #define BITSTREAM_ID_SIZE 16
 
 __xdata __at(0x4000 - CONF_SIZE) struct glasgow_config {
-  char      revision;
+  uint8_t   revision;
   char      serial[16];
   uint32_t  bitstream_size;
   char      bitstream_id[BITSTREAM_ID_SIZE];

diff --git a/firmware/main.c b/firmware/main.c
@@ -127,7 +127,12 @@ usb_configuration_c usb_config_1_pipe = {
   }
 };
 
+// check for "earlier than 3.5", but version macros shipped in 3.6
+#if !defined(__SDCC_VERSION_MAJOR)
+__code const struct usb_configuration *__code const usb_configs[] = {
+#else
 usb_configuration_set_c usb_configs[] = {
+#endif
   &usb_config_2_pipes,
   &usb_config_1_pipe,
 };

diff --git a/vendor/libfx2 b/vendor/libfx2
+5 −0		firmware/boot-cypress/main.c
+1 −2		firmware/library/bswap.c
+1 −1		firmware/library/delay.c