3 files changed, 4 insertions, 4 deletions

diff --git a/firmware/export/config-creativezvm.h b/firmware/export/config-creativezvm.h
index ea3cc871a5..2e14f7440c 100644
--- a/firmware/export/config-creativezvm.h
+++ b/firmware/export/config-creativezvm.h
@@ -167,8 +167,10 @@
 
 #define CONFIG_USBOTG USBOTG_ISP1583
 #define HAVE_USBSTACK
+#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x041e 
 #define USB_PRODUCT_ID 0x4133
+#define USB_NUM_ENDPOINTS 7
 
 /*DEBUGGING!*/
 /*
diff --git a/firmware/export/dm320.h b/firmware/export/dm320.h
index 0e1623365a..bf7295d463 100644
--- a/firmware/export/dm320.h
+++ b/firmware/export/dm320.h
@@ -43,8 +43,6 @@
 #define PHY_IO_BASE2     0x00060000
 #define DM320_REG2(addr) (*(volatile unsigned int *)(PHY_IO_BASE2 + (addr)))
 
-/* USBOTG */
-#define USB_NUM_ENDPOINTS  3
 /* This needs to be 2048 byte aligned, but USB_QHARRAY_ATTR should take care
  * of that */
 #define USB_QHARRAY_ATTR   __attribute__((section(".qharray"),nocommon,aligned(4)))
diff --git a/firmware/export/isp1583.h b/firmware/export/isp1583.h
index b65cc078f3..0bdbba886c 100644
--- a/firmware/export/isp1583.h
+++ b/firmware/export/isp1583.h
@@ -52,10 +52,10 @@
 #define ISP1583_GEN_UNLCKDEV        (*((volatile unsigned short*)(ISP1583_IOBASE+0x7C)))

 #define ISP1583_GEN_TSTMOD          (*((volatile unsigned char*)(ISP1583_IOBASE+0x84)))

 

-#define set_int_value(a,b,value)    a = value;

+#define set_int_value(a,b,value)    (a) = (value);

 #endif

 

-#define ISP1583_UNLOCK_CODE         (unsigned short)0xAA37

+#define ISP1583_UNLOCK_CODE         ((unsigned short)0xAA37)

 

 /* Initialization registers' bits */