diff options
| author | Søren Schmidt <sos@FreeBSD.org> | 2004-10-07 11:43:25 +0000 |
|---|---|---|
| committer | Søren Schmidt <sos@FreeBSD.org> | 2004-10-07 11:43:25 +0000 |
| commit | e59142714c821dd48e2bd98f443f2bc93cfae1f8 (patch) | |
| tree | e437b32080404291771f0e35e5f3d1732beb9270 | |
| parent | 650c2669ee9fedc2e43f539ac3179c0880e29c58 (diff) | |
Notes
| -rw-r--r-- | sys/dev/ata/ata-all.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c index 6bc631dd7c8d..982fdae3cee1 100644 --- a/sys/dev/ata/ata-all.c +++ b/sys/dev/ata/ata-all.c @@ -680,16 +680,18 @@ ata_getparam(struct ata_device *atadev, u_int8_t command) *ptr = bswap16(*ptr); } #endif - if (!((atacap->model[0] == 'N' && atacap->model[1] == 'E') || - (atacap->model[0] == 'F' && atacap->model[1] == 'X') || - (atacap->model[0] == 'P' && atacap->model[1] == 'i'))) + if (!(!strncmp(atacap->model, "FX", 2) || + !strncmp(atacap->model, "NEC", 3) || + !strncmp(atacap->model, "Pioneer", 7) || + !strncmp(atacap->model, "SHARP", 5))) { bswap(atacap->model, sizeof(atacap->model)); + bswap(atacap->revision, sizeof(atacap->revision)); + bswap(atacap->serial, sizeof(atacap->serial)); + } btrim(atacap->model, sizeof(atacap->model)); bpack(atacap->model, atacap->model, sizeof(atacap->model)); - bswap(atacap->revision, sizeof(atacap->revision)); btrim(atacap->revision, sizeof(atacap->revision)); bpack(atacap->revision, atacap->revision, sizeof(atacap->revision)); - bswap(atacap->serial, sizeof(atacap->serial)); btrim(atacap->serial, sizeof(atacap->serial)); bpack(atacap->serial, atacap->serial, sizeof(atacap->serial)); if (bootverbose) |