: IDE-CS Add additional id string (corsair, 1GB)
Hi,
Could you also add the id strings for the device to drivers/ata/pata_pcmcia.c?
Thanks,
Vlad
____________________________________________________________________________________
Boardwalk for $500? In 2007? Ha! Play Monopoly Here and Now (it's updated for today's economy) at Yahoo! Games.
http://get.games.yahoo.com/proddesc?gamekey=monopolyherenow
Greetings,
Of course. Not sure how you want it so I've kept the patches seperate for now.
drivers/ata/pata_pcmcia.c +2 -0
@@ -353,6 +353,7 @@ static void pcmcia_remove_one(struct pcmcia_device *pdev)static struct pcmcia_device_id pcmcia_devices[] = {PCMCIA_DEVICE_FUNC_ID (4 ), +PCMCIA_DEVICE_MANF_CARD (0x0000 ,0x0000 ),/* Corsair */ PCMCIA_DEVICE_MANF_CARD (0x0007 ,0x0000 ),/* Hitachi */ PCMCIA_DEVICE_MANF_CARD (0x000a ,0x0000 ),/* I-O Data CFA */ PCMCIA_DEVICE_MANF_CARD (0x001c ,0x0001 ),/* Mitsubishi CFA */
@@ -378,6 +379,7 @@ static struct pcmcia_device_id pcmcia_devices[] = {PCMCIA_DEVICE_PROD_ID12 ("EXP " ,"CD-ROM" ,0x0a5c52fd ,0x66536591 ),PCMCIA_DEVICE_PROD_ID12 ("EXP " ,"PnPIDE" ,0x0a5c52fd ,0x0c694728 ),PCMCIA_DEVICE_PROD_ID12 ("FREECOM" ,"PCCARD-IDE" ,0x5714cbf7 ,0x48e0ab8e ), +PCMCIA_DEVICE_PROD_ID12 ("Hyperstone" ,"Model1" ,0x3d5b9ef5 ,0xca6ab420 ),PCMCIA_DEVICE_PROD_ID12 ("HITACHI" ,"FLASH" ,0xf4f43949 ,0x9eb86aae ),PCMCIA_DEVICE_PROD_ID12 ("HITACHI" ,"microdrive" ,0xf4f43949 ,0xa6d76178 ), PCMCIA_DEVICE_PROD_ID12("IBM", "microdrive", 0xb569a6e5, 0xa6d76178),
drivers/ide/legacy/ide-cs.c +7 -5
@@ -28,7 +28,7 @@and other provisions required by the GPL. If you do not delete the provisions above, a recipient may use your version of this file under either the MPL or the GPL. -+ ======================================================================*/ #include <linux/module.h>
@@ -327,13 +327,13 @@ failed:After a card is removed, ide_release() will unregister the net device, and release the PCMCIA configuration. If the device is still open, this will be postponed until it is closed. -+ ======================================================================*/ void ide_release (struct pcmcia_device *link) {ide_info_t *info = link->priv; - +DEBUG (0 ,"ide_release(0x%p)\n" , link);if (info->ndev) {
@@ -353,11 +353,12 @@ void ide_release(struct pcmcia_device *link)stuff to run after an event is received. A CARD_REMOVAL event also sets some flags to discourage the ide drivers from talking to the ports. -+ ======================================================================*/ static struct pcmcia_device_id ide_ids[] = {PCMCIA_DEVICE_FUNC_ID (4 ), +PCMCIA_DEVICE_MANF_CARD (0x0000 ,0x0000 ),/* Corsair */ PCMCIA_DEVICE_MANF_CARD (0x0007 ,0x0000 ),/* Hitachi */ PCMCIA_DEVICE_MANF_CARD (0x000a ,0x0000 ),/* I-O Data CFA */ PCMCIA_DEVICE_MANF_CARD (0x001c ,0x0001 ),/* Mitsubishi CFA */
@@ -366,7 +367,7 @@ static struct pcmcia_device_id ide_ids[] = {PCMCIA_DEVICE_MANF_CARD (0x0098 ,0x0000 ),/* Toshiba */ PCMCIA_DEVICE_MANF_CARD (0x00a4 ,0x002d ),PCMCIA_DEVICE_MANF_CARD (0x00ce ,0x0000 ),/* Samsung */ -PCMCIA_DEVICE_MANF_CARD (0x0319 ,0x0000 ),/* Hitachi */ +PCMCIA_DEVICE_MANF_CARD (0x0319 ,0x0000 ),/* Hitachi */ PCMCIA_DEVICE_MANF_CARD (0x2080 ,0x0001 ),PCMCIA_DEVICE_MANF_CARD (0x4e01 ,0x0100 ),/* Viking CFA */ PCMCIA_DEVICE_MANF_CARD(0x4e01, 0x0200), /* Lexar, Viking CFA */
@@ -384,6 +385,7 @@ static struct pcmcia_device_id ide_ids[] = {PCMCIA_DEVICE_PROD_ID12 ("FREECOM" ,"PCCARD-IDE" ,0x5714cbf7 ,0x48e0ab8e ),PCMCIA_DEVICE_PROD_ID12 ("HITACHI" ,"FLASH" ,0xf4f43949 ,0x9eb86aae ),PCMCIA_DEVICE_PROD_ID12 ("HITACHI" ,"microdrive" ,0xf4f43949 ,0xa6d76178 ), +PCMCIA_DEVICE_PROD_ID12 ("Hyperstone" ,"Model1" ,0x3d5b9ef5 ,0xca6ab420 ),PCMCIA_DEVICE_PROD_ID12 ("IBM" ,"microdrive" ,0xb569a6e5 ,0xa6d76178 ),PCMCIA_DEVICE_PROD_ID12 ("IBM" ,"IBM17JSSFP20" ,0xb569a6e5 ,0xf2508753 ), PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF8GB", 0x2e6d1829, 0xacbe682e),
Quoted 13 lines · On Sun, 14 Oct 2007 13:16:24 -0700 (PDT) Vlad Codrea <[email protected]> wrote:
Hi,
Could you also add the id strings for the device to
drivers/ata/pata_pcmcia.c?Thanks,
Vlad____________________________________________________________________________________
Boardwalk for $500? In 2007? Ha! Play Monopoly Here and Now (it's updated for today's economy) at Yahoo! Games.
http://get.games.yahoo.com/proddesc?gamekey=monopolyherenow
Signature · 1 line
Kristoffer Ericson <[email protected]>
drivers/ide/legacy/ide-cs.c +7 -5
@@ -28,7 +28,7 @@and other provisions required by the GPL. If you do not delete the provisions above, a recipient may use your version of this file under either the MPL or the GPL. -+ ======================================================================*/ #include <linux/module.h>
@@ -327,13 +327,13 @@ failed:After a card is removed, ide_release() will unregister the net device, and release the PCMCIA configuration. If the device is still open, this will be postponed until it is closed. -+ ======================================================================*/ void ide_release (struct pcmcia_device *link) {ide_info_t *info = link->priv; - +DEBUG (0 ,"ide_release(0x%p)\n" , link);if (info->ndev) {
@@ -353,11 +353,12 @@ void ide_release(struct pcmcia_device *link)stuff to run after an event is received. A CARD_REMOVAL event also sets some flags to discourage the ide drivers from talking to the ports. -+ ======================================================================*/ static struct pcmcia_device_id ide_ids[] = {PCMCIA_DEVICE_FUNC_ID (4 ), +PCMCIA_DEVICE_MANF_CARD (0x0000 ,0x0000 ),/* Corsair */ PCMCIA_DEVICE_MANF_CARD (0x0007 ,0x0000 ),/* Hitachi */ PCMCIA_DEVICE_MANF_CARD (0x000a ,0x0000 ),/* I-O Data CFA */ PCMCIA_DEVICE_MANF_CARD (0x001c ,0x0001 ),/* Mitsubishi CFA */
@@ -366,7 +367,7 @@ static struct pcmcia_device_id ide_ids[] = {PCMCIA_DEVICE_MANF_CARD (0x0098 ,0x0000 ),/* Toshiba */ PCMCIA_DEVICE_MANF_CARD (0x00a4 ,0x002d ),PCMCIA_DEVICE_MANF_CARD (0x00ce ,0x0000 ),/* Samsung */ -PCMCIA_DEVICE_MANF_CARD (0x0319 ,0x0000 ),/* Hitachi */ +PCMCIA_DEVICE_MANF_CARD (0x0319 ,0x0000 ),/* Hitachi */ PCMCIA_DEVICE_MANF_CARD (0x2080 ,0x0001 ),PCMCIA_DEVICE_MANF_CARD (0x4e01 ,0x0100 ),/* Viking CFA */ PCMCIA_DEVICE_MANF_CARD(0x4e01, 0x0200), /* Lexar, Viking CFA */
@@ -384,6 +385,7 @@ static struct pcmcia_device_id ide_ids[] = {PCMCIA_DEVICE_PROD_ID12 ("FREECOM" ,"PCCARD-IDE" ,0x5714cbf7 ,0x48e0ab8e ),PCMCIA_DEVICE_PROD_ID12 ("HITACHI" ,"FLASH" ,0xf4f43949 ,0x9eb86aae ),PCMCIA_DEVICE_PROD_ID12 ("HITACHI" ,"microdrive" ,0xf4f43949 ,0xa6d76178 ), +PCMCIA_DEVICE_PROD_ID12 ("Hyperstone" ,"Model1" ,0x3d5b9ef5 ,0xca6ab420 ),PCMCIA_DEVICE_PROD_ID12 ("IBM" ,"microdrive" ,0xb569a6e5 ,0xa6d76178 ),PCMCIA_DEVICE_PROD_ID12 ("IBM" ,"IBM17JSSFP20" ,0xb569a6e5 ,0xf2508753 ), PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF8GB", 0x2e6d1829, 0xacbe682e),
drivers/ata/pata_pcmcia.c +2 -0
@@ -353,6 +353,7 @@ static void pcmcia_remove_one(struct pcmcia_device *pdev)static struct pcmcia_device_id pcmcia_devices[] = {PCMCIA_DEVICE_FUNC_ID (4 ), +PCMCIA_DEVICE_MANF_CARD (0x0000 ,0x0000 ),/* Corsair */ PCMCIA_DEVICE_MANF_CARD (0x0007 ,0x0000 ),/* Hitachi */ PCMCIA_DEVICE_MANF_CARD (0x000a ,0x0000 ),/* I-O Data CFA */ PCMCIA_DEVICE_MANF_CARD (0x001c ,0x0001 ),/* Mitsubishi CFA */
@@ -378,6 +379,7 @@ static struct pcmcia_device_id pcmcia_devices[] = {PCMCIA_DEVICE_PROD_ID12 ("EXP " ,"CD-ROM" ,0x0a5c52fd ,0x66536591 ),PCMCIA_DEVICE_PROD_ID12 ("EXP " ,"PnPIDE" ,0x0a5c52fd ,0x0c694728 ),PCMCIA_DEVICE_PROD_ID12 ("FREECOM" ,"PCCARD-IDE" ,0x5714cbf7 ,0x48e0ab8e ), +PCMCIA_DEVICE_PROD_ID12 ("Hyperstone" ,"Model1" ,0x3d5b9ef5 ,0xca6ab420 ),PCMCIA_DEVICE_PROD_ID12 ("HITACHI" ,"FLASH" ,0xf4f43949 ,0x9eb86aae ),PCMCIA_DEVICE_PROD_ID12 ("HITACHI" ,"microdrive" ,0xf4f43949 ,0xa6d76178 ), PCMCIA_DEVICE_PROD_ID12("IBM", "microdrive", 0xb569a6e5, 0xa6d76178),
Jeff Garzik
AppliedQuoted 5 lines · Kristoffer Ericson
Greetings,
Of course. Not sure how you want it so I've kept the patches seperate for now.
Signed-off-by Kristoffer Ericson <[email protected]>
applied to pata_pcmcia