diff --git a/hdparm-6.3-err_return.patch b/hdparm-6.3-err_return.patch index 9eaefea..9fd851c 100644 --- a/hdparm-6.3-err_return.patch +++ b/hdparm-6.3-err_return.patch @@ -63,7 +63,7 @@ } static void on_off (unsigned int value) -@@ -780,7 +786,7 @@ +@@ -784,7 +790,7 @@ void process_dev (char *devname) { @@ -72,7 +72,7 @@ static long parm, multcount; __u16 *id = (void *)-1; -@@ -796,14 +802,18 @@ +@@ -800,14 +806,18 @@ if (set_fsreadahead) { if (get_fsreadahead) printf(" setting fs readahead to %d\n", fsreadahead); @@ -93,7 +93,7 @@ } if (scan_hwif) { int args[3]; -@@ -811,8 +821,10 @@ +@@ -815,8 +825,10 @@ args[0] = hwif_data; args[1] = hwif_ctrl; args[2] = hwif_irq; @@ -105,7 +105,7 @@ } if (set_piomode) { if (get_piomode) { -@@ -825,68 +837,86 @@ +@@ -829,68 +841,86 @@ else printf(" attempting to set UDMA mode to %d\n", (piomode-200)); } @@ -201,7 +201,7 @@ } if (set_doorlock) { __u8 args[4] = {0,0,0,0}; -@@ -895,8 +925,10 @@ +@@ -899,8 +929,10 @@ printf(" setting drive doorlock to %d", doorlock); on_off(doorlock); } @@ -213,7 +213,7 @@ } if (set_dkeep) { /* lock/unlock the drive's "feature" settings */ -@@ -906,24 +938,30 @@ +@@ -910,24 +942,30 @@ on_off(dkeep); } args[2] = dkeep ? 0x66 : 0xcc; @@ -247,7 +247,7 @@ } if (set_xfermode) { __u8 args[4] = {ATA_OP_SETFEATURES,0,3,0}; -@@ -932,8 +970,10 @@ +@@ -936,8 +974,10 @@ printf(" setting xfermode to %d", xfermode_requested); interpret_xfermode(xfermode_requested); } @@ -259,7 +259,7 @@ } if (set_lookahead) { __u8 args[4] = {ATA_OP_SETFEATURES,0,0,0}; -@@ -942,8 +982,10 @@ +@@ -946,8 +986,10 @@ printf(" setting drive read-lookahead to %d", lookahead); on_off(lookahead); } @@ -271,7 +271,7 @@ } if (set_powerup_in_standby) { __u8 args[4] = {ATA_OP_SETFEATURES,0,0,0}; -@@ -978,14 +1020,18 @@ +@@ -982,14 +1024,18 @@ if (get_apmmode) printf(" 0x%02x (%d)\n",apmmode,apmmode); } @@ -292,7 +292,7 @@ } if (set_acoustic) { __u8 args[4]; -@@ -995,8 +1041,10 @@ +@@ -999,8 +1045,10 @@ args[1] = acoustic; args[2] = acoustic ? 0x42 : 0xc2; args[3] = 0; @@ -304,7 +304,7 @@ } if (set_wcache) { __u8 flushcache1[4] = {ATA_OP_FLUSHCACHE,0,0,0}; -@@ -1009,11 +1057,16 @@ +@@ -1013,11 +1061,16 @@ } if (!wcache && do_drive_cmd(fd, flushcache1)) perror (" HDIO_DRIVE_CMD(flushcache1) failed"); @@ -324,7 +324,7 @@ } if (set_standbynow) { __u8 args1[4] = {ATA_OP_STANDBYNOW1,0,0,0}; -@@ -1021,8 +1074,10 @@ +@@ -1025,8 +1078,10 @@ if (get_standbynow) printf(" issuing standby command\n"); if (do_drive_cmd(fd, args1) @@ -336,7 +336,7 @@ } if (set_sleepnow) { __u8 args1[4] = {ATA_OP_SLEEPNOW1,0,0,0}; -@@ -1030,8 +1085,10 @@ +@@ -1034,8 +1089,10 @@ if (get_sleepnow) printf(" issuing sleep command\n"); if (do_drive_cmd(fd, args1) @@ -348,7 +348,7 @@ } if (set_security) { do_set_security(fd); -@@ -1039,15 +1096,19 @@ +@@ -1043,15 +1100,19 @@ if (set_freeze) { __u8 args[4] = {ATA_OP_SECURITY_FREEZE_LOCK,0,0,0}; printf(" issuing Security Freeze command\n"); @@ -370,7 +370,7 @@ } if (set_standby) { __u8 args[4] = {ATA_OP_SETIDLE1,standby,0,0}; -@@ -1055,14 +1116,18 @@ +@@ -1059,14 +1120,18 @@ printf(" setting standby to %u", standby); interpret_standby(); } @@ -389,9 +389,9 @@ perror(" HDIO_SET_BUSSTATE failed"); + } } - if (get_hitachi_temp) { - __u8 args[4] = {0xf0,0,0x01,0}; /* "Sense Condition", vendor-specific */ -@@ -1104,12 +1169,18 @@ + if (do_drq_hsm_error) { + id = get_identify_data(fd, id); +@@ -1122,12 +1187,18 @@ break; default:printf("\?\?\?)\n"); } @@ -410,7 +410,7 @@ } } -@@ -1120,6 +1191,9 @@ +@@ -1138,6 +1209,9 @@ printf(" (DMA-Assisted-PIO)\n"); else on_off(parm); @@ -420,7 +420,7 @@ } } if (get_dma_q) { -@@ -1134,28 +1208,34 @@ +@@ -1152,28 +1226,34 @@ if (0 == ioctl(fd, HDIO_GET_KEEPSETTINGS, &parm)) { printf(" keepsettings = %2ld", parm); on_off(parm); @@ -461,7 +461,7 @@ printf(" readahead = %2ld", parm); on_off(parm); } -@@ -1170,12 +1250,13 @@ +@@ -1188,12 +1268,13 @@ static struct hd_geometry g; static struct local_hd_big_geometry bg; @@ -478,15 +478,20 @@ printf(msg, g.cylinders, g.heads, g.sectors, blksize, g.start); } } -@@ -1185,6 +1266,7 @@ +@@ -1202,9 +1283,10 @@ + const char *state; if (do_drive_cmd(fd, args) && (args[0] = ATA_OP_CHECKPOWERMODE2) /* (single =) try again with 0x98 */ - && do_drive_cmd(fd, args)) { +- && do_drive_cmd(fd, args)) ++ && do_drive_cmd(fd, args)) { + err = errno; - if (errno != EIO || args[0] != 0 || args[1] != 0) - state = "unknown"; - else -@@ -1205,8 +1287,10 @@ + state = "unknown"; +- else ++ } else + state = (args[2] == 255) ? "active/idle" : "standby"; + printf(" drive state is: %s\n", state); + } +@@ -1219,8 +1301,10 @@ dump_identity(id2); } else if (errno == -ENOMSG) printf(" no identification info available\n"); @@ -498,7 +503,7 @@ } if (do_IDentity) { id = get_identify_data(fd, id); -@@ -1259,39 +1343,46 @@ +@@ -1273,39 +1357,46 @@ } } if (get_busstate) { diff --git a/hdparm-7.1.tar.bz2 b/hdparm-7.1.tar.bz2 deleted file mode 100644 index 3985133..0000000 --- a/hdparm-7.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:03ba38f464ad1be1f3574ea2d0893d1aaef9251fc35e383756a20d4d835ff8a9 -size 55061 diff --git a/hdparm-7.2.tar.bz2 b/hdparm-7.2.tar.bz2 new file mode 100644 index 0000000..e70530b --- /dev/null +++ b/hdparm-7.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f283ac9ca09900c2b907a3a4dd3c296daa9e89853d385423420ab5b3044ac58 +size 55285 diff --git a/hdparm.changes b/hdparm.changes index 6749812..24d8016 100644 --- a/hdparm.changes +++ b/hdparm.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Apr 29 21:57:26 CEST 2007 - ro@suse.de + +- update to 7.2 + - tweak -C + - added more debug info from --verbose + - added --drq-hsm-error to test libata EH (VERY DANGEROUS, do not use) + - fixed breakage when used with old IDE driver + ------------------------------------------------------------------- Sun Apr 29 11:50:34 CEST 2007 - ro@suse.de diff --git a/hdparm.spec b/hdparm.spec index e40f3bf..cadeb42 100644 --- a/hdparm.spec +++ b/hdparm.spec @@ -1,5 +1,5 @@ # -# spec file for package hdparm (Version 7.1) +# spec file for package hdparm (Version 7.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,7 +16,7 @@ Group: Hardware/Other PreReq: %insserv_prereq %fillup_prereq coreutils Provides: base:/sbin/hdparm Autoreqprov: on -Version: 7.1 +Version: 7.2 Release: 1 Summary: A Program to Get and Set Hard Disk Parameters Source: hdparm-%{version}.tar.bz2 @@ -103,6 +103,12 @@ fi %changelog * Sun Apr 29 2007 - ro@suse.de +- update to 7.2 + - tweak -C + - added more debug info from --verbose + - added --drq-hsm-error to test libata EH (VERY DANGEROUS, do not use) + - fixed breakage when used with old IDE driver +* Sun Apr 29 2007 - ro@suse.de - update to 7.1 - big-endian fixes for -I, --Istdin, --Istdout - cody tidying in sgio.c