* [PATCH] : IDE-CS Add additional id string (corsair, 1GB)
@ 2007-10-15 4:04 Kristoffer Ericson
2007-10-16 19:35 ` Bartlomiej Zolnierkiewicz
0 siblings, 1 reply; 3+ messages in thread
From: Kristoffer Ericson @ 2007-10-15 4:04 UTC (permalink / raw)
To: linux-ide, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 3094 bytes --]
Greetings,
The manf string looks weird (0x0 + 0x0), but I assume its correct. Also, whitespaces seems almost intentional, so am I missing something?
Shortlog:
This patch adds id strings for Corsair 1GB (identified as Hyperstone Model1) inside legacy/ide-cs.c
It also includes some minor whitespace cleanups.
Signed-off-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
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 <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),
--
Kristoffer Ericson <Kristoffer.Ericson@Gmail.com>
[-- Attachment #2: ide-cs.c-add-corsair-cf.patch --]
[-- Type: application/octet-stream, Size: 2660 bytes --]
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 <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),
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] : IDE-CS Add additional id string (corsair, 1GB)
2007-10-15 4:04 [PATCH] : IDE-CS Add additional id string (corsair, 1GB) Kristoffer Ericson
@ 2007-10-16 19:35 ` Bartlomiej Zolnierkiewicz
2007-10-17 6:37 ` Kristoffer Ericson
0 siblings, 1 reply; 3+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2007-10-16 19:35 UTC (permalink / raw)
To: Kristoffer Ericson; +Cc: linux-ide, linux-kernel
On Monday 15 October 2007, Kristoffer Ericson wrote:
> Greetings,
>
> The manf string looks weird (0x0 + 0x0), but I assume its correct. Also,
> whitespaces seems almost intentional, so am I missing something?
Nope, thanks for cleaning this.
> Shortlog:
> This patch adds id strings for Corsair 1GB (identified as Hyperstone Model1)
> inside legacy/ide-cs.c
>
> It also includes some minor whitespace cleanups.
>
> Signed-off-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
applied
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] : IDE-CS Add additional id string (corsair, 1GB)
2007-10-16 19:35 ` Bartlomiej Zolnierkiewicz
@ 2007-10-17 6:37 ` Kristoffer Ericson
0 siblings, 0 replies; 3+ messages in thread
From: Kristoffer Ericson @ 2007-10-17 6:37 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: Kristoffer Ericson, linux-ide, linux-kernel
On Tue, 16 Oct 2007 21:35:51 +0200
Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> wrote:
> On Monday 15 October 2007, Kristoffer Ericson wrote:
> > Greetings,
> >
> > The manf string looks weird (0x0 + 0x0), but I assume its correct. Also,
> > whitespaces seems almost intentional, so am I missing something?
>
> Nope, thanks for cleaning this.
Ah, good.
>
> > Shortlog:
> > This patch adds id strings for Corsair 1GB (identified as Hyperstone Model1)
> > inside legacy/ide-cs.c
> >
> > It also includes some minor whitespace cleanups.
> >
> > Signed-off-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
>
> applied
Thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-10-16 21:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-15 4:04 [PATCH] : IDE-CS Add additional id string (corsair, 1GB) Kristoffer Ericson
2007-10-16 19:35 ` Bartlomiej Zolnierkiewicz
2007-10-17 6:37 ` Kristoffer Ericson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).