PERFORCE change 165987 for review

[Sylvestre Gallon]

http://perforce.freebsd.org/chv.cgi?CH=165987

Change 165987 by syl at syl_pablo on 2009/07/13 08:34:25

	Fix S3C24_DCI_MAXP register address.
	Add missing registers definition.

Affected files ...

.. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/s3c24xxdci.h#2 edit

Differences ...

==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/s3c24xxdci.h#2 (text+ko) ====

@@ -39,7 +39,7 @@
 #define S3C24_DCI_EP0_CSR	0x44	/* EP0 status */
 #define S3C24_DCI_IN_CSR1	0x44	/* In ep0 control status */
 #define S3C24_DCI_IN_CSR2	0x48	/* In ep0 control status */
-#define S3C24_DCI_MAXP		0x4c	/* Ep max packet */
+#define S3C24_DCI_MAXP		0x40	/* Ep max packet */
 #define S3C24_DCI_OUT_CSR1	0x50	/* Out ep control status */
 #define S3C24_DCI_OUT_CSR2	0x54	/* Out ep control status */
 #define S3C24_DCI_OUT_FIFO_CNT1	0x58	/* Ep out write count */
@@ -79,7 +79,6 @@
 #define S3C24_DCI_FUNCTION_ADDR(x) (x & 0xfffffff)
 
 /* S3C24_DCI_PWR */
-#define S3C24_DCI_ISO_UPDATE	(1<<7)
 #define S3C24_DCI_USB_RESET	(1<<3)
 #define S3C24_DCI_MCU_RESUME	(1<<2)
 #define S3C24_DCI_SUSPEND_MODE	(1<<1)
@@ -110,7 +109,7 @@
 /* S3C24_DCI_USB_INT_EN	*/
 
 #define S3C24_DCI_INT_RESET_EN	(1<<2)
-#define S3C24_DCI_INT_SUSPEND_EN	(1<<0)
+#define S3C24_DCI_INT_SUSPD_EN	(1<<0)
 
 /* S3C24_DCI_MAXP */
 
@@ -119,6 +118,55 @@
 #define S3C24_DCI_MAXP32	(1<<2)
 #define S3C24_DCI_MAXP64	(1<<3)
 
+/* S3C24_DCI_EP0_CSR */
+
+#define S3C24_DCI_EP0_SERVICED_SETUP_END	(1<<7)
+#define S3C24_DCI_EP0_SERVICED_OUT_PKT_RDY	(1<<6)
+#define S3C24_DCI_EP0_SEND_STALL	(1<<5)
+#define S3C24_DCI_EP0_SETUP_END	(1<<4)
+#define S3C24_DCI_EP0_DATA_END	(1<<3)
+#define S3C24_DCI_EP0_SENT_STALL	(1<<2)
+#define S3C24_DCI_EP0_IN_PKT_RDY	(1<<1)
+#define S3C24_DCI_EP0_OUT_PKT_RDY	(1<<0)
+
+/* S3C24_DCI_IN_CSR1 */
+
+#define S3C24_DCI_IN_CLR_DATA_TOGGLE	(1<<6)
+#define S3C24_DCI_IN_SENT_STALL	(1<<5)
+#define S3C24_DCI_IN_SEND_STALL	(1<<4)
+#define S3C24_DCI_IN_FIFO_FLUSH	(1<<3)
+#define S3C24_DCI_IN_PKT_RDY	(1<<0)
+
+/* S3C24_DCI_IN_CSR2 */
+
+#define S3C24_DCI_IN_AUTOSET	(1<<7)
+#define S3C24_DCI_IN_ISO	(1<<6)
+#define S3C24_DCI_IN_MODE_IN	(1<<5)
+#define S3C24_DCI_IN_DMA_INT_EN	(1<<4)
+
+/* S3C24_DCI_OUT_CSR1 */
+
+#define S3C24_DCI_OUT_CLR_DATA_TOGGLE	(1<<7)
+#define S3C24_DCI_OUT_SENT_STALL	(1<<6)
+#define S3C24_DCI_OUT_SEND_STALL	(1<<5)
+#define S3C24_DCI_OUT_FIFO_FLUSH	(1<<4)
+#define S3C24_DCI_OUT_PKT_RDY	(1<<0)
+
+/* S3C24_DCI_OUT_CSR2 */
+
+#define S3C24_DCI_OUT_AUTO_CLR	(1<<7)
+#define S3C24_DCI_OUT_ISO	(1<<6)
+#define S3C24_DCI_OUT_DMA_INT_MASK	(1<<5)
+
+/* S3C24_DCI_EPn_DMA_CON */
+
+#define S3C24_DCI_RUN_OB	(1<<7)
+#define S3C24_DCI_STATE(x)	(x&0x0fff0000)
+#define S3C24_DCI_DEMAND_MODE	(1<<3)
+#define S3C24_DCI_OUT_RUN_OB	(1<<2)
+#define S3C24_DCI_IN_DMA_RUN	(1<<1)
+#define S3C24_DCI_DMA_MODE_EN	(1<<0)
+
 struct s3c24dci_softc {
 	struct usb_bus sc_bus;