Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-07-07 10:28:56 +00:00
Code Issues Projects Releases Wiki Activity

Callers to identify() converted the endianness of the buffer. So did

Browse Source 
identify().  This meant big endian systems had a NUXI problem.  Removed
the redundant conversion from the callers, and made some in-passing cleanups
while I was there.
This commit is contained in:
Rob Landley 2006-06-07 00:27:25 +00:00
parent eb29d6ce6a
commit 0753f4a15e
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
miscutils/hdparm.c
View File

@ -565,10 +565,8 @@ static void print_ascii(uint16_t *p, uint8_t length) {
printf("\n"); printf("\n");
} }
/* identify() is the only extern function used across two source files. The // Parse 512 byte disk identification block and print much crap.
others, though, were declared in hdparm.c with global scope; since other
functions in that file have static (file) scope, I assume the difference is
intentional. */
static void identify(uint16_t *id_supplied) static void identify(uint16_t *id_supplied)
{ {
uint16_t buf[256]; uint16_t buf[256];
@ -581,6 +579,8 @@ static void identify(uint16_t *id_supplied)
uint64_t bbbig; /* (:) */ uint64_t bbbig; /* (:) */
const char *strng; const char *strng;
// Adjust for endianness if necessary.
if (BB_BIG_ENDIAN) { if (BB_BIG_ENDIAN) {
swab(id_supplied, buf, sizeof(buf)); swab(id_supplied, buf, sizeof(buf));
val = buf; val = buf;
@ -1997,16 +1997,12 @@ static void process_dev(char *devname)
if (get_IDentity) if (get_IDentity)
{ {
unsigned char args1[4+512]; /* = { ... } will eat 0.5k of rodata! */ unsigned char args1[4+512]; /* = { ... } will eat 0.5k of rodata! */
unsigned i;
memset(args1, 0, sizeof(args1)); memset(args1, 0, sizeof(args1));
args1[0] = WIN_IDENTIFY; args1[0] = WIN_IDENTIFY;
args1[3] = 1; args1[3] = 1;
if (!bb_ioctl_alt(fd, HDIO_DRIVE_CMD, args1, WIN_PIDENTIFY, "HDIO_DRIVE_CMD(identify)")) { if (!bb_ioctl_alt(fd, HDIO_DRIVE_CMD, args1, WIN_PIDENTIFY, "HDIO_DRIVE_CMD(identify)"))
uint16_t *ptr = (uint16_t *)args1; identify((void *)(args1 + 4));
for (i=0; i<sizeof(args1)/2; i++) ptr[i] = SWAP_LE16(ptr[i]);
identify((void *)(ptr+2));
}
} }
#endif #endif
#ifdef CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF #ifdef CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF
@ -2053,19 +2049,23 @@ static int fromhex(unsigned char c)
static void identify_from_stdin(void) static void identify_from_stdin(void)
{ {
uint16_t sbuf[800]; uint16_t sbuf[256];
unsigned char buf[1600], *b = (unsigned char *)buf; unsigned char buf[1280], *b = (unsigned char *)buf;
int i, count = read(0, buf, 1280); int i, count = read(0, buf, 1280);
if (count != 1280) if (count != 1280)
bb_error_msg_and_die("read(%d bytes) failed (rc=%d)", 1280, count); bb_error_msg_and_die("read(%d bytes) failed (rc=%d)", 1280, count);
for (i = 0; count >= 4; ++i) // Convert the newline-separated hex data into an identify block.
for (i = 0; i<256; i++)
{ {
sbuf[i] = SWAP_LE16((fromhex(b[0]) << 12) | (fromhex(b[1]) << 8) | (fromhex(b[2]) << 4) | fromhex(b[3])); int j;
b += 5; for(j=0;j<4;j++) sbuf[i] = (sbuf[i] <<4) + fromhex(*(b++));
count -= 5;
} }
// Parse the data.
identify(sbuf); identify(sbuf);
} }
#endif #endif