svn commit: r349359 - head/sbin/camcontrol
Warner Losh
imp at FreeBSD.org
Tue Jun 25 06:14:30 UTC 2019
Author: imp
Date: Tue Jun 25 06:14:26 2019
New Revision: 349359
URL: https://svnweb.freebsd.org/changeset/base/349359
Log:
Replay r349341 by imp accidentally reverted by r349352
Use ata_param_fixup instead of a custom copy here
Modified:
head/sbin/camcontrol/camcontrol.c
Modified: head/sbin/camcontrol/camcontrol.c
==============================================================================
--- head/sbin/camcontrol/camcontrol.c Tue Jun 25 06:14:21 2019 (r349358)
+++ head/sbin/camcontrol/camcontrol.c Tue Jun 25 06:14:26 2019 (r349359)
@@ -2326,9 +2326,11 @@ ata_do_identify(struct cam_device *device, int retry_c
}
}
+ 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;
}
@@ -2345,26 +2347,6 @@ ata_do_identify(struct cam_device *device, int retry_c
free(ptr);
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;
More information about the svn-src-all
mailing list