Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / usb / storage / shuttle_usbat.h

diff --git a/drivers/usb/storage/shuttle_usbat.h b/drivers/usb/storage/shuttle_usbat.h
index 5b8e867..25e7d8b 100644 (file)
--- a/drivers/usb/storage/shuttle_usbat.h
+++ b/drivers/usb/storage/shuttle_usbat.h
@@ -55,8 +55,8 @@
 #define USBAT_UIO_WRITE        0
 
 /* Qualifier bits */
-#define USBAT_QUAL_FCQ 0x20 // full compare
-#define USBAT_QUAL_ALQ 0x10 // auto load subcount
+#define USBAT_QUAL_FCQ 0x20    /* full compare */
+#define USBAT_QUAL_ALQ 0x10    /* auto load subcount */
 
 /* USBAT Flash Media status types */
 #define USBAT_FLASH_MEDIA_NONE 0
@@ -67,39 +67,39 @@
 #define USBAT_FLASH_MEDIA_CHANGED      1
 
 /* USBAT ATA registers */
-#define USBAT_ATA_DATA      0x10  // read/write data (R/W)
-#define USBAT_ATA_FEATURES  0x11  // set features (W)
-#define USBAT_ATA_ERROR     0x11  // error (R)
-#define USBAT_ATA_SECCNT    0x12  // sector count (R/W)
-#define USBAT_ATA_SECNUM    0x13  // sector number (R/W)
-#define USBAT_ATA_LBA_ME    0x14  // cylinder low (R/W)
-#define USBAT_ATA_LBA_HI    0x15  // cylinder high (R/W)
-#define USBAT_ATA_DEVICE    0x16  // head/device selection (R/W)
-#define USBAT_ATA_STATUS    0x17  // device status (R)
-#define USBAT_ATA_CMD       0x17  // device command (W)
-#define USBAT_ATA_ALTSTATUS 0x0E  // status (no clear IRQ) (R)
+#define USBAT_ATA_DATA      0x10  /* read/write data (R/W) */
+#define USBAT_ATA_FEATURES  0x11  /* set features (W) */
+#define USBAT_ATA_ERROR     0x11  /* error (R) */
+#define USBAT_ATA_SECCNT    0x12  /* sector count (R/W) */
+#define USBAT_ATA_SECNUM    0x13  /* sector number (R/W) */
+#define USBAT_ATA_LBA_ME    0x14  /* cylinder low (R/W) */
+#define USBAT_ATA_LBA_HI    0x15  /* cylinder high (R/W) */
+#define USBAT_ATA_DEVICE    0x16  /* head/device selection (R/W) */
+#define USBAT_ATA_STATUS    0x17  /* device status (R) */
+#define USBAT_ATA_CMD       0x17  /* device command (W) */
+#define USBAT_ATA_ALTSTATUS 0x0E  /* status (no clear IRQ) (R) */
 
 /* USBAT User I/O Data registers */
-#define USBAT_UIO_EPAD         0x80 // Enable Peripheral Control Signals
-#define USBAT_UIO_CDT          0x40 // Card Detect (Read Only)
-                                    // CDT = ACKD & !UI1 & !UI0
-#define USBAT_UIO_1            0x20 // I/O 1
-#define USBAT_UIO_0            0x10 // I/O 0
-#define USBAT_UIO_EPP_ATA      0x08 // 1=EPP mode, 0=ATA mode
-#define USBAT_UIO_UI1          0x04 // Input 1
-#define USBAT_UIO_UI0          0x02 // Input 0
-#define USBAT_UIO_INTR_ACK     0x01 // Interrupt (ATA & ISA)/Acknowledge (EPP)
+#define USBAT_UIO_EPAD         0x80 /* Enable Peripheral Control Signals */
+#define USBAT_UIO_CDT          0x40 /* Card Detect (Read Only) */
+                                    /* CDT = ACKD & !UI1 & !UI0 */
+#define USBAT_UIO_1            0x20 /* I/O 1 */
+#define USBAT_UIO_0            0x10 /* I/O 0 */
+#define USBAT_UIO_EPP_ATA      0x08 /* 1=EPP mode, 0=ATA mode */
+#define USBAT_UIO_UI1          0x04 /* Input 1 */
+#define USBAT_UIO_UI0          0x02 /* Input 0 */
+#define USBAT_UIO_INTR_ACK     0x01 /* Interrupt (ATA/ISA)/Acknowledge (EPP) */
 
 /* USBAT User I/O Enable registers */
-#define USBAT_UIO_DRVRST       0x80 // Reset Peripheral
-#define USBAT_UIO_ACKD         0x40 // Enable Card Detect
-#define USBAT_UIO_OE1          0x20 // I/O 1 set=output/clr=input
-                                    // If ACKD=1, set OE1 to 1 also.
-#define USBAT_UIO_OE0          0x10 // I/O 0 set=output/clr=input
-#define USBAT_UIO_ADPRST       0x01 // Reset SCM chip
+#define USBAT_UIO_DRVRST       0x80 /* Reset Peripheral */
+#define USBAT_UIO_ACKD         0x40 /* Enable Card Detect */
+#define USBAT_UIO_OE1          0x20 /* I/O 1 set=output/clr=input */
+                                    /* If ACKD=1, set OE1 to 1 also. */
+#define USBAT_UIO_OE0          0x10 /* I/O 0 set=output/clr=input */
+#define USBAT_UIO_ADPRST       0x01 /* Reset SCM chip */
 
 /* USBAT Features */
-#define USBAT_FEAT_ETEN        0x80 // External trigger enable
+#define USBAT_FEAT_ETEN        0x80    /* External trigger enable */
 #define USBAT_FEAT_U1  0x08
 #define USBAT_FEAT_U0  0x04
 #define USBAT_FEAT_ET1 0x02
@@ -112,12 +112,12 @@ struct usbat_info {
        int devicetype;
 
        /* Used for Flash readers only */
-       unsigned long sectors;     // total sector count
-       unsigned long ssize;       // sector size in bytes
+       unsigned long sectors;     /* total sector count */
+       unsigned long ssize;       /* sector size in bytes */
 
        unsigned char sense_key;
-       unsigned long sense_asc;   // additional sense code
-       unsigned long sense_ascq;  // additional sense code qualifier
+       unsigned long sense_asc;   /* additional sense code */
+       unsigned long sense_ascq;  /* additional sense code qualifier */
 };
 
 #endif