From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763624AbXJNU5v (ORCPT ); Sun, 14 Oct 2007 16:57:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759226AbXJNU5n (ORCPT ); Sun, 14 Oct 2007 16:57:43 -0400 Received: from ug-out-1314.google.com ([66.249.92.173]:54734 "EHLO ug-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758636AbXJNU5m (ORCPT ); Sun, 14 Oct 2007 16:57:42 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:date:to:cc:subject:message-id:in-reply-to:references:organization:x-mailer:mime-version:content-type:from; b=gJatbojlaGBVuroMX/X2CmP8g4kOgrQ55BIlE/Gj/s0jH12E07UzT96/KbJXc8T9ziJhJSu38HKjnzAbMnp1/gptVS7xQPuYk9ER2wnwv2z6SJjxF1yiY+WSyLEZ7+y5jxrlMdkt+zraXWyGTRsiqqnKX98gxvlpt2q/tRCSGIM= Date: Sun, 14 Oct 2007 23:05:56 -0700 To: Vlad Codrea Cc: kristoffer.ericson@gmail.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH] : IDE-CS Add additional id string (corsair, 1GB) Message-Id: <20071014230556.47ffe9cd.Kristoffer.Ericson@Gmail.com> In-Reply-To: <313705.92960.qm@web54404.mail.yahoo.com> References: <313705.92960.qm@web54404.mail.yahoo.com> Organization: JLime X-Mailer: Sylpheed 2.4.5 (GTK+ 2.12.0; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Multipart=_Sun__14_Oct_2007_23_05_56_-0700_A2IjBN6EzYwcjon_" From: Kristoffer Ericson Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org This is a multi-part message in MIME format. --Multipart=_Sun__14_Oct_2007_23_05_56_-0700_A2IjBN6EzYwcjon_ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Greetings, Of course. Not sure how you want it so I've kept the patches seperate for now. Signed-off-by: Kristoffer Ericson diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c index 782ff4a..5db2013 100644 --- a/drivers/ata/pata_pcmcia.c +++ b/drivers/ata/pata_pcmcia.c @@ -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), diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c index 4cdb519..e8e360c 100644 --- a/drivers/ide/legacy/ide-cs.c +++ b/drivers/ide/legacy/ide-cs.c @@ -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 @@ -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), On Sun, 14 Oct 2007 13:16:24 -0700 (PDT) Vlad Codrea 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 -- Kristoffer Ericson --Multipart=_Sun__14_Oct_2007_23_05_56_-0700_A2IjBN6EzYwcjon_ Content-Type: application/octet-stream; name="ide-cs.c-add-corsair-cf.patch" Content-Disposition: attachment; filename="ide-cs.c-add-corsair-cf.patch" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2RyaXZlcnMvaWRlL2xlZ2FjeS9pZGUtY3MuYyBiL2RyaXZlcnMvaWRlL2xl Z2FjeS9pZGUtY3MuYwppbmRleCA0Y2RiNTE5Li5lOGUzNjBjIDEwMDY0NAotLS0gYS9kcml2ZXJz L2lkZS9sZWdhY3kvaWRlLWNzLmMKKysrIGIvZHJpdmVycy9pZGUvbGVnYWN5L2lkZS1jcy5jCkBA IC0yOCw3ICsyOCw3IEBACiAgICAgYW5kIG90aGVyIHByb3Zpc2lvbnMgcmVxdWlyZWQgYnkgdGhl IEdQTC4gIElmIHlvdSBkbyBub3QgZGVsZXRlCiAgICAgdGhlIHByb3Zpc2lvbnMgYWJvdmUsIGEg cmVjaXBpZW50IG1heSB1c2UgeW91ciB2ZXJzaW9uIG9mIHRoaXMKICAgICBmaWxlIHVuZGVyIGVp dGhlciB0aGUgTVBMIG9yIHRoZSBHUEwuCi0gICAgCisKID09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0qLwogCiAjaW5j bHVkZSA8bGludXgvbW9kdWxlLmg+CkBAIC0zMjcsMTMgKzMyNywxMyBAQCBmYWlsZWQ6CiAgICAg QWZ0ZXIgYSBjYXJkIGlzIHJlbW92ZWQsIGlkZV9yZWxlYXNlKCkgd2lsbCB1bnJlZ2lzdGVyIHRo ZSBuZXQKICAgICBkZXZpY2UsIGFuZCByZWxlYXNlIHRoZSBQQ01DSUEgY29uZmlndXJhdGlvbi4g IElmIHRoZSBkZXZpY2UgaXMKICAgICBzdGlsbCBvcGVuLCB0aGlzIHdpbGwgYmUgcG9zdHBvbmVk IHVudGlsIGl0IGlzIGNsb3NlZC4KLSAgICAKKwogPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PSovCiAKIHZvaWQgaWRl X3JlbGVhc2Uoc3RydWN0IHBjbWNpYV9kZXZpY2UgKmxpbmspCiB7CiAgICAgaWRlX2luZm9fdCAq aW5mbyA9IGxpbmstPnByaXY7Ci0gICAgCisKICAgICBERUJVRygwLCAiaWRlX3JlbGVhc2UoMHgl cClcbiIsIGxpbmspOwogCiAgICAgaWYgKGluZm8tPm5kZXYpIHsKQEAgLTM1MywxMSArMzUzLDEy IEBAIHZvaWQgaWRlX3JlbGVhc2Uoc3RydWN0IHBjbWNpYV9kZXZpY2UgKmxpbmspCiAgICAgc3R1 ZmYgdG8gcnVuIGFmdGVyIGFuIGV2ZW50IGlzIHJlY2VpdmVkLiAgQSBDQVJEX1JFTU9WQUwgZXZl bnQKICAgICBhbHNvIHNldHMgc29tZSBmbGFncyB0byBkaXNjb3VyYWdlIHRoZSBpZGUgZHJpdmVy cyBmcm9tCiAgICAgdGFsa2luZyB0byB0aGUgcG9ydHMuCi0gICAgCisKID09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0q LwogCiBzdGF0aWMgc3RydWN0IHBjbWNpYV9kZXZpY2VfaWQgaWRlX2lkc1tdID0gewogCVBDTUNJ QV9ERVZJQ0VfRlVOQ19JRCg0KSwKKwlQQ01DSUFfREVWSUNFX01BTkZfQ0FSRCgweDAwMDAsIDB4 MDAwMCksCS8qIENvcnNhaXIgKi8KIAlQQ01DSUFfREVWSUNFX01BTkZfQ0FSRCgweDAwMDcsIDB4 MDAwMCksCS8qIEhpdGFjaGkgKi8KIAlQQ01DSUFfREVWSUNFX01BTkZfQ0FSRCgweDAwMGEsIDB4 MDAwMCksCS8qIEktTyBEYXRhIENGQSAqLwogCVBDTUNJQV9ERVZJQ0VfTUFORl9DQVJEKDB4MDAx YywgMHgwMDAxKSwJLyogTWl0c3ViaXNoaSBDRkEgKi8KQEAgLTM2Niw3ICszNjcsNyBAQCBzdGF0 aWMgc3RydWN0IHBjbWNpYV9kZXZpY2VfaWQgaWRlX2lkc1tdID0gewogCVBDTUNJQV9ERVZJQ0Vf TUFORl9DQVJEKDB4MDA5OCwgMHgwMDAwKSwJLyogVG9zaGliYSAqLwogCVBDTUNJQV9ERVZJQ0Vf TUFORl9DQVJEKDB4MDBhNCwgMHgwMDJkKSwKIAlQQ01DSUFfREVWSUNFX01BTkZfQ0FSRCgweDAw Y2UsIDB4MDAwMCksCS8qIFNhbXN1bmcgKi8KLSAJUENNQ0lBX0RFVklDRV9NQU5GX0NBUkQoMHgw MzE5LCAweDAwMDApLAkvKiBIaXRhY2hpICovCisJUENNQ0lBX0RFVklDRV9NQU5GX0NBUkQoMHgw MzE5LCAweDAwMDApLAkvKiBIaXRhY2hpICovCiAJUENNQ0lBX0RFVklDRV9NQU5GX0NBUkQoMHgy MDgwLCAweDAwMDEpLAogCVBDTUNJQV9ERVZJQ0VfTUFORl9DQVJEKDB4NGUwMSwgMHgwMTAwKSwJ LyogVmlraW5nIENGQSAqLwogCVBDTUNJQV9ERVZJQ0VfTUFORl9DQVJEKDB4NGUwMSwgMHgwMjAw KSwJLyogTGV4YXIsIFZpa2luZyBDRkEgKi8KQEAgLTM4NCw2ICszODUsNyBAQCBzdGF0aWMgc3Ry dWN0IHBjbWNpYV9kZXZpY2VfaWQgaWRlX2lkc1tdID0gewogCVBDTUNJQV9ERVZJQ0VfUFJPRF9J RDEyKCJGUkVFQ09NIiwgIlBDQ0FSRC1JREUiLCAweDU3MTRjYmY3LCAweDQ4ZTBhYjhlKSwKIAlQ Q01DSUFfREVWSUNFX1BST0RfSUQxMigiSElUQUNISSIsICJGTEFTSCIsIDB4ZjRmNDM5NDksIDB4 OWViODZhYWUpLAogCVBDTUNJQV9ERVZJQ0VfUFJPRF9JRDEyKCJISVRBQ0hJIiwgIm1pY3JvZHJp dmUiLCAweGY0ZjQzOTQ5LCAweGE2ZDc2MTc4KSwKKwlQQ01DSUFfREVWSUNFX1BST0RfSUQxMigi SHlwZXJzdG9uZSIsICJNb2RlbDEiLCAweDNkNWI5ZWY1LCAweGNhNmFiNDIwKSwKIAlQQ01DSUFf REVWSUNFX1BST0RfSUQxMigiSUJNIiwgIm1pY3JvZHJpdmUiLCAweGI1NjlhNmU1LCAweGE2ZDc2 MTc4KSwKIAlQQ01DSUFfREVWSUNFX1BST0RfSUQxMigiSUJNIiwgIklCTTE3SlNTRlAyMCIsIDB4 YjU2OWE2ZTUsIDB4ZjI1MDg3NTMpLAogCVBDTUNJQV9ERVZJQ0VfUFJPRF9JRDEyKCJLSU5HU1RP TiIsICJDRjhHQiIsIDB4MmU2ZDE4MjksIDB4YWNiZTY4MmUpLAo= --Multipart=_Sun__14_Oct_2007_23_05_56_-0700_A2IjBN6EzYwcjon_ Content-Type: application/octet-stream; name="pata_pcmcia-add-corsair-cf.patch" Content-Disposition: attachment; filename="pata_pcmcia-add-corsair-cf.patch" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2RyaXZlcnMvYXRhL3BhdGFfcGNtY2lhLmMgYi9kcml2ZXJzL2F0YS9wYXRh X3BjbWNpYS5jCmluZGV4IDc4MmZmNGEuLjVkYjIwMTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvYXRh L3BhdGFfcGNtY2lhLmMKKysrIGIvZHJpdmVycy9hdGEvcGF0YV9wY21jaWEuYwpAQCAtMzUzLDYg KzM1Myw3IEBAIHN0YXRpYyB2b2lkIHBjbWNpYV9yZW1vdmVfb25lKHN0cnVjdCBwY21jaWFfZGV2 aWNlICpwZGV2KQogCiBzdGF0aWMgc3RydWN0IHBjbWNpYV9kZXZpY2VfaWQgcGNtY2lhX2Rldmlj ZXNbXSA9IHsKIAlQQ01DSUFfREVWSUNFX0ZVTkNfSUQoNCksCisJUENNQ0lBX0RFVklDRV9NQU5G X0NBUkQoMHgwMDAwLCAweDAwMDApLAkvKiBDb3JzYWlyICovCiAJUENNQ0lBX0RFVklDRV9NQU5G X0NBUkQoMHgwMDA3LCAweDAwMDApLAkvKiBIaXRhY2hpICovCiAJUENNQ0lBX0RFVklDRV9NQU5G X0NBUkQoMHgwMDBhLCAweDAwMDApLAkvKiBJLU8gRGF0YSBDRkEgKi8KIAlQQ01DSUFfREVWSUNF X01BTkZfQ0FSRCgweDAwMWMsIDB4MDAwMSksCS8qIE1pdHN1YmlzaGkgQ0ZBICovCkBAIC0zNzgs NiArMzc5LDcgQEAgc3RhdGljIHN0cnVjdCBwY21jaWFfZGV2aWNlX2lkIHBjbWNpYV9kZXZpY2Vz W10gPSB7CiAJUENNQ0lBX0RFVklDRV9QUk9EX0lEMTIoIkVYUCAgICIsICJDRC1ST00iLCAweDBh NWM1MmZkLCAweDY2NTM2NTkxKSwKIAlQQ01DSUFfREVWSUNFX1BST0RfSUQxMigiRVhQICAgIiwg IlBuUElERSIsIDB4MGE1YzUyZmQsIDB4MGM2OTQ3MjgpLAogCVBDTUNJQV9ERVZJQ0VfUFJPRF9J RDEyKCJGUkVFQ09NIiwgIlBDQ0FSRC1JREUiLCAweDU3MTRjYmY3LCAweDQ4ZTBhYjhlKSwKKwlQ Q01DSUFfREVWSUNFX1BST0RfSUQxMigiSHlwZXJzdG9uZSIsICJNb2RlbDEiLCAweDNkNWI5ZWY1 LCAweGNhNmFiNDIwKSwKIAlQQ01DSUFfREVWSUNFX1BST0RfSUQxMigiSElUQUNISSIsICJGTEFT SCIsIDB4ZjRmNDM5NDksIDB4OWViODZhYWUpLAogCVBDTUNJQV9ERVZJQ0VfUFJPRF9JRDEyKCJI SVRBQ0hJIiwgIm1pY3JvZHJpdmUiLCAweGY0ZjQzOTQ5LCAweGE2ZDc2MTc4KSwKIAlQQ01DSUFf REVWSUNFX1BST0RfSUQxMigiSUJNIiwgIm1pY3JvZHJpdmUiLCAweGI1NjlhNmU1LCAweGE2ZDc2 MTc4KSwK --Multipart=_Sun__14_Oct_2007_23_05_56_-0700_A2IjBN6EzYwcjon_--