summaryrefslogtreecommitdiff
path: root/firmware/export
diff options
context:
space:
mode:
authorMaurus Cuelenaere <mcuelenaere@gmail.com>2009-02-05 21:47:54 +0000
committerMaurus Cuelenaere <mcuelenaere@gmail.com>2009-02-05 21:47:54 +0000
commitee1e8be37f38dde1e7a34935140f95f13b60685d (patch)
treeb3e7bb0759d4cabb2507d9656d5d653066b9c10f /firmware/export
parente1aee318782d89e017e1241847706b21ea014974 (diff)
downloadrockbox-ee1e8be37f38dde1e7a34935140f95f13b60685d.zip
rockbox-ee1e8be37f38dde1e7a34935140f95f13b60685d.tar.gz
rockbox-ee1e8be37f38dde1e7a34935140f95f13b60685d.tar.bz2
rockbox-ee1e8be37f38dde1e7a34935140f95f13b60685d.tar.xz
Creative ZVM:
* Re-enable USB * Acknowledge EP0SETUP packets * Spin disk down when no files get loaded in the bootloader * Clean up/fix some other stuff git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19931 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r--firmware/export/config-creativezvm.h2
-rw-r--r--firmware/export/dm320.h2
-rw-r--r--firmware/export/isp1583.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/firmware/export/config-creativezvm.h b/firmware/export/config-creativezvm.h
index ea3cc87..2e14f74 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 0e16233..bf7295d 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 b65cc07..0bdbba8 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 */