diff options
| author | Warner Losh <imp@FreeBSD.org> | 2019-06-24 20:19:03 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2019-06-24 20:19:03 +0000 |
| commit | 6506ca91d21f5e7f303cb50dd85c6691cade048f (patch) | |
| tree | 7aa7134cd5a5dee25e7dfefacf51735a60eea08f /sbin/camcontrol | |
| parent | 2afaed2d0f4aea7309156870e9d115edbbec3dfe (diff) | |
| download | src-6506ca91d21f5e7f303cb50dd85c6691cade048f.tar.gz src-6506ca91d21f5e7f303cb50dd85c6691cade048f.zip | |
Use ata_param_fixup instead of a custom copy here
Notes
Notes:
svn path=/head/; revision=349341
Diffstat (limited to 'sbin/camcontrol')
| -rw-r--r-- | sbin/camcontrol/camcontrol.c | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index 0784fab75a0e..99d59e59d86c 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -2326,9 +2326,11 @@ ata_do_identify(struct cam_device *device, int retry_count, int timeout, } } + ident_buf = (struct ata_params *)ptr; + ata_param_fixup(ident_buf); + error = 1; for (i = 0; i < sizeof(struct ata_params) / 2; i++) { - ptr[i] = le16toh(ptr[i]); if (ptr[i] != 0) error = 0; } @@ -2346,26 +2348,6 @@ ata_do_identify(struct cam_device *device, int retry_count, int timeout, return (error); } - ident_buf = (struct ata_params *)ptr; - if (strncmp(ident_buf->model, "FX", 2) && - strncmp(ident_buf->model, "NEC", 3) && - strncmp(ident_buf->model, "Pioneer", 7) && - strncmp(ident_buf->model, "SHARP", 5)) { - ata_bswap(ident_buf->model, sizeof(ident_buf->model)); - ata_bswap(ident_buf->revision, sizeof(ident_buf->revision)); - ata_bswap(ident_buf->serial, sizeof(ident_buf->serial)); - ata_bswap(ident_buf->media_serial, sizeof(ident_buf->media_serial)); - } - ata_btrim(ident_buf->model, sizeof(ident_buf->model)); - ata_bpack(ident_buf->model, ident_buf->model, sizeof(ident_buf->model)); - ata_btrim(ident_buf->revision, sizeof(ident_buf->revision)); - ata_bpack(ident_buf->revision, ident_buf->revision, sizeof(ident_buf->revision)); - ata_btrim(ident_buf->serial, sizeof(ident_buf->serial)); - ata_bpack(ident_buf->serial, ident_buf->serial, sizeof(ident_buf->serial)); - ata_btrim(ident_buf->media_serial, sizeof(ident_buf->media_serial)); - ata_bpack(ident_buf->media_serial, ident_buf->media_serial, - sizeof(ident_buf->media_serial)); - *ident_bufp = ident_buf; return (0); |