1 files changed, 77 insertions, 77 deletions
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/usb-target.h b/firmware/target/arm/tms320dm320/creative-zvm/usb-target.h
index 9ac8dd2fa6..260ddad7cf 100644
--- a/firmware/target/arm/tms320dm320/creative-zvm/usb-target.h
+++ b/firmware/target/arm/tms320dm320/creative-zvm/usb-target.h
@@ -1,81 +1,81 @@
-/***************************************************************************
+/***************************************************************************
- *             __________               __   ___.
+ *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
+ *                     \/            \/     \/    \/            \/
- * $Id$
+ * $Id$
- *
+ *
- * Copyright (C) 2008 by Maurus Cuelenaere
+ * Copyright (C) 2008 by Maurus Cuelenaere
- *
+ *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
 * of the License, or (at your option) any later version.
- *
+ *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
+ * KIND, either express or implied.
- *
+ *
- ****************************************************************************/
+ ****************************************************************************/
-#ifndef USB_TARGET_H
+#ifndef USB_TARGET_H
-#define USB_TARGET_H
+#define USB_TARGET_H
-#include "dm320.h"
+#include "dm320.h"
-/* General purpose memory region #2 */
+/* General purpose memory region #2 */
-#define ISP1583_IOBASE              0x60FFC000
+#define ISP1583_IOBASE              0x60FFC000
-#define ISP1583_H_OVERRIDE
+#define ISP1583_H_OVERRIDE
-#define ISP1583_INIT_ADDRESS        (*((volatile unsigned char*)(ISP1583_IOBASE+0x0))) //char
+#define ISP1583_INIT_ADDRESS        (*((volatile unsigned char*)(ISP1583_IOBASE+0x0))) //char
-#define ISP1583_INIT_MODE           (*((volatile unsigned short*)(ISP1583_IOBASE+0xC*2)))
+#define ISP1583_INIT_MODE           (*((volatile unsigned short*)(ISP1583_IOBASE+0xC*2)))
-#define ISP1583_INIT_INTCONF        (*((volatile unsigned char*)(ISP1583_IOBASE+0x10*2))) //char
+#define ISP1583_INIT_INTCONF        (*((volatile unsigned char*)(ISP1583_IOBASE+0x10*2))) //char
-#define ISP1583_INIT_OTG            (*((volatile unsigned char*)(ISP1583_IOBASE+0x12*2))) //char
+#define ISP1583_INIT_OTG            (*((volatile unsigned char*)(ISP1583_IOBASE+0x12*2))) //char
-#define ISP1583_INIT_INTEN_A        (*((volatile unsigned short*)(ISP1583_IOBASE+0x14*2)))
+#define ISP1583_INIT_INTEN_A        (*((volatile unsigned short*)(ISP1583_IOBASE+0x14*2)))
-#define ISP1583_INIT_INTEN_B        (*((volatile unsigned short*)(ISP1583_IOBASE+0x14*2+4)))
+#define ISP1583_INIT_INTEN_B        (*((volatile unsigned short*)(ISP1583_IOBASE+0x14*2+4)))
-#define ISP1583_INIT_INTEN_READ     (unsigned long)( (ISP1583_INIT_INTEN_A & 0xFFFF) | ((ISP1583_INIT_INTEN_B & 0xFFFF) << 16) )
+#define ISP1583_INIT_INTEN_READ     (unsigned long)( (ISP1583_INIT_INTEN_A & 0xFFFF) | ((ISP1583_INIT_INTEN_B & 0xFFFF) << 16) )
-/* Data flow registers */
+/* Data flow registers */
-#define ISP1583_DFLOW_EPINDEX       (*((volatile unsigned char*)(ISP1583_IOBASE+0xC2*2))) //char
+#define ISP1583_DFLOW_EPINDEX       (*((volatile unsigned char*)(ISP1583_IOBASE+0xC2*2))) //char
-#define ISP1583_DFLOW_CTRLFUN       (*((volatile unsigned char*)(ISP1583_IOBASE+0x28*2))) //char
+#define ISP1583_DFLOW_CTRLFUN       (*((volatile unsigned char*)(ISP1583_IOBASE+0x28*2))) //char
-#define ISP1583_DFLOW_DATA          (*((volatile unsigned short*)(ISP1583_IOBASE+0x20*2)))
+#define ISP1583_DFLOW_DATA          (*((volatile unsigned short*)(ISP1583_IOBASE+0x20*2)))
-#define ISP1583_DFLOW_BUFLEN        (*((volatile unsigned short*)(ISP1583_IOBASE+0x1C*2)))
+#define ISP1583_DFLOW_BUFLEN        (*((volatile unsigned short*)(ISP1583_IOBASE+0x1C*2)))
-#define ISP1583_DFLOW_BUFSTAT       (*((volatile unsigned char*)(ISP1583_IOBASE+0x1E*2))) //char
+#define ISP1583_DFLOW_BUFSTAT       (*((volatile unsigned char*)(ISP1583_IOBASE+0x1E*2))) //char
-#define ISP1583_DFLOW_MAXPKSZ       (*((volatile unsigned short*)(ISP1583_IOBASE+0x04*2)))
+#define ISP1583_DFLOW_MAXPKSZ       (*((volatile unsigned short*)(ISP1583_IOBASE+0x04*2)))
-#define ISP1583_DFLOW_EPTYPE        (*((volatile unsigned short*)(ISP1583_IOBASE+0x08*2)))
+#define ISP1583_DFLOW_EPTYPE        (*((volatile unsigned short*)(ISP1583_IOBASE+0x08*2)))
-/* DMA registers */
+/* DMA registers */
-#define ISP1583_DMA_ENDPOINT        (*((volatile unsigned char*)(ISP1583_IOBASE+0x58*2)))
+#define ISP1583_DMA_ENDPOINT        (*((volatile unsigned char*)(ISP1583_IOBASE+0x58*2)))
-/* General registers */
+/* General registers */
-#define ISP1583_GEN_INT_A           (*((volatile unsigned short*)(ISP1583_IOBASE+0x18*2)))
+#define ISP1583_GEN_INT_A           (*((volatile unsigned short*)(ISP1583_IOBASE+0x18*2)))
-#define ISP1583_GEN_INT_B           (*((volatile unsigned short*)(ISP1583_IOBASE+0x18*2+4)))
+#define ISP1583_GEN_INT_B           (*((volatile unsigned short*)(ISP1583_IOBASE+0x18*2+4)))
-#define ISP1583_GEN_INT_READ        (unsigned long)( (ISP1583_GEN_INT_A & 0xFFFF) | ((ISP1583_GEN_INT_B & 0xFFFF) << 16))
+#define ISP1583_GEN_INT_READ        (unsigned long)( (ISP1583_GEN_INT_A & 0xFFFF) | ((ISP1583_GEN_INT_B & 0xFFFF) << 16))
-#define ISP1583_GEN_CHIPID_A        (*((volatile unsigned short*)(ISP1583_IOBASE+0x70*2)))
+#define ISP1583_GEN_CHIPID_A        (*((volatile unsigned short*)(ISP1583_IOBASE+0x70*2)))
-#define ISP1583_GEN_CHIPID_B        (*((volatile unsigned char*)(ISP1583_IOBASE+0x70*2+4))) //char
+#define ISP1583_GEN_CHIPID_B        (*((volatile unsigned char*)(ISP1583_IOBASE+0x70*2+4))) //char
-#define ISP1583_GEN_CHIPID          (unsigned long)( (ISP1583_GEN_CHIPID_A & 0xFFFF) | ((ISP1583_GEN_CHIPID_B & 0xFFFF) << 16) )
+#define ISP1583_GEN_CHIPID          (unsigned long)( (ISP1583_GEN_CHIPID_A & 0xFFFF) | ((ISP1583_GEN_CHIPID_B & 0xFFFF) << 16) )
-#define ISP1583_GEN_FRAMEN0         (*((volatile unsigned short*)(ISP1583_IOBASE+0x74*2)))
+#define ISP1583_GEN_FRAMEN0         (*((volatile unsigned short*)(ISP1583_IOBASE+0x74*2)))
-#define ISP1583_GEN_SCRATCH         (*((volatile unsigned short*)(ISP1583_IOBASE+0x78*2)))
+#define ISP1583_GEN_SCRATCH         (*((volatile unsigned short*)(ISP1583_IOBASE+0x78*2)))
-#define ISP1583_GEN_UNLCKDEV        (*((volatile unsigned short*)(ISP1583_IOBASE+0x7C*2)))
+#define ISP1583_GEN_UNLCKDEV        (*((volatile unsigned short*)(ISP1583_IOBASE+0x7C*2)))
-#define ISP1583_GEN_TSTMOD          (*((volatile unsigned char*)(ISP1583_IOBASE+0x84*2))) //char
+#define ISP1583_GEN_TSTMOD          (*((volatile unsigned char*)(ISP1583_IOBASE+0x84*2))) //char
-#define EN_INT_CPU_TARGET           IO_INTC_EINT1 |= INTR_EINT1_EXT7
+#define EN_INT_CPU_TARGET           IO_INTC_EINT1 |= INTR_EINT1_EXT7
-#define DIS_INT_CPU_TARGET          IO_INTC_EINT1 &= ~INTR_EINT1_EXT7
+#define DIS_INT_CPU_TARGET          IO_INTC_EINT1 &= ~INTR_EINT1_EXT7
-#define INT_CONF_TARGET             0
+#define INT_CONF_TARGET             0
-//#define INT_CONF_TARGET             2
+//#define INT_CONF_TARGET             2
-#define set_int_value(a,b,value)    a = value & 0xFFFF; \
+#define set_int_value(a,b,value)    a = value & 0xFFFF; \
-                                    b = value >> 16;
+                                    b = value >> 16;
-                                    
-                                    
-#define ZVM_SPECIFIC                asm volatile( \
+#define ZVM_SPECIFIC                asm volatile( \
-                                                 "LDR     R12, =0x50FFC000\n" \
+                                                 "LDR     R12, =0x50FFC000\n" \
-                                                 "LDRH    R12, [R12]\n"  \
+                                                 "LDRH    R12, [R12]\n"  \
-                                                 : : : "r12")
+                                                 : : : "r12")
-//#define ZVM_SPECIFIC
+//#define ZVM_SPECIFIC
-#define USE_IRAM
+#define USE_IRAM
-#include <stdbool.h>
+#include <stdbool.h>
-int usb_detect(void);
+int usb_detect(void);
-void usb_init_device(void);
+void usb_init_device(void);
-bool usb_drv_connected(void);
+bool usb_drv_connected(void);
-#endif
+#endif

diff --git a/firmware/target/arm/tms320dm320/creative-zvm/usb-target.h b/firmware/target/arm/tms320dm320/creative-zvm/usb-target.h index 9ac8dd2fa6..260ddad7cf 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/usb-target.h +++ b/firmware/target/arm/tms320dm320/creative-zvm/usb-target.h
@@ -1,81 +1,81 @@
1	/***************************************************************************	1	/***************************************************************************
2	* __________ __ ___.	2	* __________ __ ___.
3	* Open \______ \ ____ ____ \| \| _\_ \|__ _______ ___	3	* Open \______ \ ____ ____ \| \| _\_ \|__ _______ ___
4	* Source \| _// _ \_/ ___\\| \|/ /\| __ \ / _ \ \/ /	4	* Source \| _// _ \_/ ___\\| \|/ /\| __ \ / _ \ \/ /
5	* Jukebox \| \| ( <_> ) \___\| < \| \_\ ( <_> > < <	5	* Jukebox \| \| ( <_> ) \___\| < \| \_\ ( <_> > < <
6	* Firmware \|____\|_ /\____/ \___ >__\|_ \\|___ /\____/__/\_ \	6	* Firmware \|____\|_ /\____/ \___ >__\|_ \\|___ /\____/__/\_ \
7	* \/ \/ \/ \/ \/	7	* \/ \/ \/ \/ \/
8	* $Id$	8	* $Id$
9	*	9	*
10	* Copyright (C) 2008 by Maurus Cuelenaere	10	* Copyright (C) 2008 by Maurus Cuelenaere
11	*	11	*
12	* This program is free software; you can redistribute it and/or	12	* This program is free software; you can redistribute it and/or
13	* modify it under the terms of the GNU General Public License	13	* modify it under the terms of the GNU General Public License
14	* as published by the Free Software Foundation; either version 2	14	* as published by the Free Software Foundation; either version 2
15	* of the License, or (at your option) any later version.	15	* of the License, or (at your option) any later version.
16	*	16	*
17	* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY	17	* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
18	* KIND, either express or implied.	18	* KIND, either express or implied.
19	*	19	*
20	****************************************************************************/	20	****************************************************************************/
21		21
22	#ifndef USB_TARGET_H	22	#ifndef USB_TARGET_H
23	#define USB_TARGET_H	23	#define USB_TARGET_H
24		24
25	#include "dm320.h"	25	#include "dm320.h"
26		26
27	/* General purpose memory region #2 */	27	/* General purpose memory region #2 */
28	#define ISP1583_IOBASE 0x60FFC000	28	#define ISP1583_IOBASE 0x60FFC000
29	#define ISP1583_H_OVERRIDE	29	#define ISP1583_H_OVERRIDE
30		30
31	#define ISP1583_INIT_ADDRESS (((volatile unsigned char)(ISP1583_IOBASE+0x0))) //char	31	#define ISP1583_INIT_ADDRESS (((volatile unsigned char)(ISP1583_IOBASE+0x0))) //char
32	#define ISP1583_INIT_MODE (((volatile unsigned short)(ISP1583_IOBASE+0xC*2)))	32	#define ISP1583_INIT_MODE (((volatile unsigned short)(ISP1583_IOBASE+0xC*2)))
33	#define ISP1583_INIT_INTCONF (((volatile unsigned char)(ISP1583_IOBASE+0x10*2))) //char	33	#define ISP1583_INIT_INTCONF (((volatile unsigned char)(ISP1583_IOBASE+0x10*2))) //char
34	#define ISP1583_INIT_OTG (((volatile unsigned char)(ISP1583_IOBASE+0x12*2))) //char	34	#define ISP1583_INIT_OTG (((volatile unsigned char)(ISP1583_IOBASE+0x12*2))) //char
35	#define ISP1583_INIT_INTEN_A (((volatile unsigned short)(ISP1583_IOBASE+0x14*2)))	35	#define ISP1583_INIT_INTEN_A (((volatile unsigned short)(ISP1583_IOBASE+0x14*2)))
36	#define ISP1583_INIT_INTEN_B (((volatile unsigned short)(ISP1583_IOBASE+0x14*2+4)))	36	#define ISP1583_INIT_INTEN_B (((volatile unsigned short)(ISP1583_IOBASE+0x14*2+4)))
37	#define ISP1583_INIT_INTEN_READ (unsigned long)( (ISP1583_INIT_INTEN_A & 0xFFFF) \| ((ISP1583_INIT_INTEN_B & 0xFFFF) << 16) )	37	#define ISP1583_INIT_INTEN_READ (unsigned long)( (ISP1583_INIT_INTEN_A & 0xFFFF) \| ((ISP1583_INIT_INTEN_B & 0xFFFF) << 16) )
38	/* Data flow registers */	38	/* Data flow registers */
39	#define ISP1583_DFLOW_EPINDEX (((volatile unsigned char)(ISP1583_IOBASE+0xC2*2))) //char	39	#define ISP1583_DFLOW_EPINDEX (((volatile unsigned char)(ISP1583_IOBASE+0xC2*2))) //char
40	#define ISP1583_DFLOW_CTRLFUN (((volatile unsigned char)(ISP1583_IOBASE+0x28*2))) //char	40	#define ISP1583_DFLOW_CTRLFUN (((volatile unsigned char)(ISP1583_IOBASE+0x28*2))) //char
41	#define ISP1583_DFLOW_DATA (((volatile unsigned short)(ISP1583_IOBASE+0x20*2)))	41	#define ISP1583_DFLOW_DATA (((volatile unsigned short)(ISP1583_IOBASE+0x20*2)))
42	#define ISP1583_DFLOW_BUFLEN (((volatile unsigned short)(ISP1583_IOBASE+0x1C*2)))	42	#define ISP1583_DFLOW_BUFLEN (((volatile unsigned short)(ISP1583_IOBASE+0x1C*2)))
43	#define ISP1583_DFLOW_BUFSTAT (((volatile unsigned char)(ISP1583_IOBASE+0x1E*2))) //char	43	#define ISP1583_DFLOW_BUFSTAT (((volatile unsigned char)(ISP1583_IOBASE+0x1E*2))) //char
44	#define ISP1583_DFLOW_MAXPKSZ (((volatile unsigned short)(ISP1583_IOBASE+0x04*2)))	44	#define ISP1583_DFLOW_MAXPKSZ (((volatile unsigned short)(ISP1583_IOBASE+0x04*2)))
45	#define ISP1583_DFLOW_EPTYPE (((volatile unsigned short)(ISP1583_IOBASE+0x08*2)))	45	#define ISP1583_DFLOW_EPTYPE (((volatile unsigned short)(ISP1583_IOBASE+0x08*2)))
46	/* DMA registers */	46	/* DMA registers */
47	#define ISP1583_DMA_ENDPOINT (((volatile unsigned char)(ISP1583_IOBASE+0x58*2)))	47	#define ISP1583_DMA_ENDPOINT (((volatile unsigned char)(ISP1583_IOBASE+0x58*2)))
48	/* General registers */	48	/* General registers */
49	#define ISP1583_GEN_INT_A (((volatile unsigned short)(ISP1583_IOBASE+0x18*2)))	49	#define ISP1583_GEN_INT_A (((volatile unsigned short)(ISP1583_IOBASE+0x18*2)))
50	#define ISP1583_GEN_INT_B (((volatile unsigned short)(ISP1583_IOBASE+0x18*2+4)))	50	#define ISP1583_GEN_INT_B (((volatile unsigned short)(ISP1583_IOBASE+0x18*2+4)))
51	#define ISP1583_GEN_INT_READ (unsigned long)( (ISP1583_GEN_INT_A & 0xFFFF) \| ((ISP1583_GEN_INT_B & 0xFFFF) << 16))	51	#define ISP1583_GEN_INT_READ (unsigned long)( (ISP1583_GEN_INT_A & 0xFFFF) \| ((ISP1583_GEN_INT_B & 0xFFFF) << 16))
52	#define ISP1583_GEN_CHIPID_A (((volatile unsigned short)(ISP1583_IOBASE+0x70*2)))	52	#define ISP1583_GEN_CHIPID_A (((volatile unsigned short)(ISP1583_IOBASE+0x70*2)))
53	#define ISP1583_GEN_CHIPID_B (((volatile unsigned char)(ISP1583_IOBASE+0x70*2+4))) //char	53	#define ISP1583_GEN_CHIPID_B (((volatile unsigned char)(ISP1583_IOBASE+0x70*2+4))) //char
54	#define ISP1583_GEN_CHIPID (unsigned long)( (ISP1583_GEN_CHIPID_A & 0xFFFF) \| ((ISP1583_GEN_CHIPID_B & 0xFFFF) << 16) )	54	#define ISP1583_GEN_CHIPID (unsigned long)( (ISP1583_GEN_CHIPID_A & 0xFFFF) \| ((ISP1583_GEN_CHIPID_B & 0xFFFF) << 16) )
55	#define ISP1583_GEN_FRAMEN0 (((volatile unsigned short)(ISP1583_IOBASE+0x74*2)))	55	#define ISP1583_GEN_FRAMEN0 (((volatile unsigned short)(ISP1583_IOBASE+0x74*2)))
56	#define ISP1583_GEN_SCRATCH (((volatile unsigned short)(ISP1583_IOBASE+0x78*2)))	56	#define ISP1583_GEN_SCRATCH (((volatile unsigned short)(ISP1583_IOBASE+0x78*2)))
57	#define ISP1583_GEN_UNLCKDEV (((volatile unsigned short)(ISP1583_IOBASE+0x7C*2)))	57	#define ISP1583_GEN_UNLCKDEV (((volatile unsigned short)(ISP1583_IOBASE+0x7C*2)))
58	#define ISP1583_GEN_TSTMOD (((volatile unsigned char)(ISP1583_IOBASE+0x84*2))) //char	58	#define ISP1583_GEN_TSTMOD (((volatile unsigned char)(ISP1583_IOBASE+0x84*2))) //char
59		59
60	#define EN_INT_CPU_TARGET IO_INTC_EINT1 \|= INTR_EINT1_EXT7	60	#define EN_INT_CPU_TARGET IO_INTC_EINT1 \|= INTR_EINT1_EXT7
61	#define DIS_INT_CPU_TARGET IO_INTC_EINT1 &= ~INTR_EINT1_EXT7	61	#define DIS_INT_CPU_TARGET IO_INTC_EINT1 &= ~INTR_EINT1_EXT7
62	#define INT_CONF_TARGET 0	62	#define INT_CONF_TARGET 0
63	//#define INT_CONF_TARGET 2	63	//#define INT_CONF_TARGET 2
64	#define set_int_value(a,b,value) a = value & 0xFFFF; \	64	#define set_int_value(a,b,value) a = value & 0xFFFF; \
65	b = value >> 16;	65	b = value >> 16;
66		66
67		67
68	#define ZVM_SPECIFIC asm volatile( \	68	#define ZVM_SPECIFIC asm volatile( \
69	"LDR R12, =0x50FFC000\n" \	69	"LDR R12, =0x50FFC000\n" \
70	"LDRH R12, [R12]\n" \	70	"LDRH R12, [R12]\n" \
71	: : : "r12")	71	: : : "r12")
72	//#define ZVM_SPECIFIC	72	//#define ZVM_SPECIFIC
73		73
74	#define USE_IRAM	74	#define USE_IRAM
75		75
76	#include <stdbool.h>	76	#include <stdbool.h>
77	int usb_detect(void);	77	int usb_detect(void);
78	void usb_init_device(void);	78	void usb_init_device(void);
79	bool usb_drv_connected(void);	79	bool usb_drv_connected(void);
80		80
81	#endif	81	#endif