Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-22 14:30:31 +00:00
Code Issues Projects Releases Wiki Activity

Patch from Dennis Vlasenko resetting values that get reused.

Browse Source
This commit is contained in:
Rob Landley 2006-05-05 16:52:28 +00:00
parent 2381f702c9
commit 39cf645ce0
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
miscutils/hdparm.c
View File

@ -1325,11 +1325,8 @@ static void dump_identity(const struct hd_driveid *id)
} }
if_printf((!(id->field_valid&1))," (maybe):"); if_printf((!(id->field_valid&1))," (maybe):");
#if __BYTE_ORDER == __BIG_ENDIAN if (BB_BIG_ENDIAN) capacity = (id->cur_capacity0 << 16) | id->cur_capacity1;
capacity = (id->cur_capacity0 << 16) | id->cur_capacity1; else capacity = (id->cur_capacity1 << 16) | id->cur_capacity0;
#else
capacity = (id->cur_capacity1 << 16) | id->cur_capacity0;
#endif
printf(" CurCHS=%u/%u/%u, CurSects=%lu, LBA=%s",id->cur_cyls, id->cur_heads, printf(" CurCHS=%u/%u/%u, CurSects=%lu, LBA=%s",id->cur_cyls, id->cur_heads,
id->cur_sectors, capacity , id->cur_sectors, capacity ,
((id->capability&2)==0)?"no":"yes"); ((id->capability&2)==0)?"no":"yes");
@ -1827,6 +1824,8 @@ static void process_dev(char *devname)
#ifndef HDIO_DRIVE_CMD #ifndef HDIO_DRIVE_CMD
int force_operation = 0; int force_operation = 0;
#endif #endif
/* Please restore args[n] to these values after each ioctl
except for args[2] */
unsigned char args[4] = {WIN_SETFEATURES,0,0,0}; unsigned char args[4] = {WIN_SETFEATURES,0,0,0};
fd = bb_xopen(devname, O_RDONLY|O_NONBLOCK); fd = bb_xopen(devname, O_RDONLY|O_NONBLOCK);
@ -1852,6 +1851,8 @@ static void process_dev(char *devname)
args[1] = hwif_ctrl; args[1] = hwif_ctrl;
args[2] = hwif_irq; args[2] = hwif_irq;
bb_ioctl(fd, HDIO_SCAN_HWIF, args, "HDIO_SCAN_HWIF"); bb_ioctl(fd, HDIO_SCAN_HWIF, args, "HDIO_SCAN_HWIF");
args[0] = WIN_SETFEATURES;
args[1] = 0;
} }
#endif #endif
if (set_piomode) if (set_piomode)
@ -1921,8 +1922,10 @@ static void process_dev(char *devname)
if (set_doorlock) if (set_doorlock)
{ {
args[0] = doorlock ? WIN_DOORLOCK : WIN_DOORUNLOCK; args[0] = doorlock ? WIN_DOORLOCK : WIN_DOORUNLOCK;
args[2] = 0;
if_printf_on_off(get_doorlock," setting drive doorlock to %ld", doorlock); if_printf_on_off(get_doorlock," setting drive doorlock to %ld", doorlock);
bb_ioctl(fd, HDIO_DRIVE_CMD, &args,"HDIO_DRIVE_CMD(doorlock)"); bb_ioctl(fd, HDIO_DRIVE_CMD, &args,"HDIO_DRIVE_CMD(doorlock)");
args[0] = WIN_SETFEATURES;
} }
if (set_dkeep) if (set_dkeep)
{ {
@ -1943,6 +1946,7 @@ static void process_dev(char *devname)
args[2] = 0xab; args[2] = 0xab;
if_printf(get_prefetch," setting drive prefetch to %ld\n", prefetch); if_printf(get_prefetch," setting drive prefetch to %ld\n", prefetch);
bb_ioctl(fd, HDIO_DRIVE_CMD, &args, "HDIO_DRIVE_CMD(setprefetch)"); bb_ioctl(fd, HDIO_DRIVE_CMD, &args, "HDIO_DRIVE_CMD(setprefetch)");
args[1] = 0;
} }
if (set_xfermode) if (set_xfermode)
{ {
@ -1954,6 +1958,7 @@ static void process_dev(char *devname)
interpret_xfermode(xfermode_requested); interpret_xfermode(xfermode_requested);
} }
bb_ioctl(fd, HDIO_DRIVE_CMD, &args,"HDIO_DRIVE_CMD(setxfermode)"); bb_ioctl(fd, HDIO_DRIVE_CMD, &args,"HDIO_DRIVE_CMD(setxfermode)");
args[1] = 0;
} }
if (set_lookahead) if (set_lookahead)
{ {
@ -1980,6 +1985,7 @@ static void process_dev(char *devname)
if_printf(get_apmmode," 0x%02lX (%ld)\n",apmmode,apmmode); if_printf(get_apmmode," 0x%02lX (%ld)\n",apmmode,apmmode);
} }
bb_ioctl(fd, HDIO_DRIVE_CMD, &args,"HDIO_DRIVE_CMD"); bb_ioctl(fd, HDIO_DRIVE_CMD, &args,"HDIO_DRIVE_CMD");
args[1] = 0;
} }
if (set_wcache) if (set_wcache)
{ {
@ -2001,6 +2007,11 @@ static void process_dev(char *devname)
bb_ioctl(fd, HDIO_DRIVE_CMD, &flushcache, "HDIO_DRIVE_CMD(flushcache)"); bb_ioctl(fd, HDIO_DRIVE_CMD, &flushcache, "HDIO_DRIVE_CMD(flushcache)");
#endif /* DO_FLUSHCACHE */ #endif /* DO_FLUSHCACHE */
} }
/* In code below, we do not preserve args[0], but the rest
is preserved, including args[2] */
args[2] = 0;
if (set_standbynow) if (set_standbynow)
{ {
#ifndef WIN_STANDBYNOW1 #ifndef WIN_STANDBYNOW1
@ -2041,6 +2052,7 @@ static void process_dev(char *devname)
interpret_standby(standby_requested); interpret_standby(standby_requested);
} }
bb_ioctl(fd, HDIO_DRIVE_CMD, &args, "HDIO_DRIVE_CMD(setidle1)"); bb_ioctl(fd, HDIO_DRIVE_CMD, &args, "HDIO_DRIVE_CMD(setidle1)");
args[1] = 0;
} }
#else /* HDIO_DRIVE_CMD */ #else /* HDIO_DRIVE_CMD */
if (force_operation) if (force_operation)
@ -2173,6 +2185,7 @@ static void process_dev(char *devname)
} }
else else
state = (args[2] == 255) ? "active/idle" : "standby"; state = (args[2] == 255) ? "active/idle" : "standby";
args[1] = args[2] = 0;
printf(" drive state is: %s\n", state); printf(" drive state is: %s\n", state);
} }