Mailinglist Archive: opensuse-commit (1117 mails)
| < Previous | Next > |
commit hdparm for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 03 Feb 2009 23:09:50 +0100
- Message-id: <20090203220950.50F9D678178@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package hdparm for openSUSE:Factory
checked in at Tue Feb 3 23:09:50 CET 2009.
--------
--- hdparm/hdparm.changes 2009-01-26 17:11:07.000000000 +0100
+++ hdparm/hdparm.changes 2009-01-30 11:31:49.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Jan 30 11:15:23 CET 2009 - mseben@xxxxxxx
+
+- update to version 9.10
+ * try and improve CF card detection
+ * fix display of mwdma modes 3,4 for CF cards
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
hdparm-9.9-nostrip.patch
hdparm-9.9.tar.bz2
New:
----
hdparm-9.10-nostrip.patch
hdparm-9.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hdparm.spec ++++++
--- /var/tmp/diff_new_pack.c25110/_old 2009-02-03 23:08:36.000000000 +0100
+++ /var/tmp/diff_new_pack.c25110/_new 2009-02-03 23:08:36.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package hdparm (Version 9.9)
+# spec file for package hdparm (Version 9.10)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,7 +24,7 @@
PreReq: %insserv_prereq %fillup_prereq coreutils
Provides: base:/sbin/hdparm
AutoReqProv: on
-Version: 9.9
+Version: 9.10
Release: 1
Summary: A Program to Get and Set Hard Disk Parameters
Source: %{name}-%{version}.tar.bz2
@@ -116,6 +116,10 @@
/var/adm/fillup-templates/sysconfig.ide
%changelog
+* Fri Jan 30 2009 mseben@xxxxxxx
+- update to version 9.10
+ * try and improve CF card detection
+ * fix display of mwdma modes 3,4 for CF cards
* Mon Jan 26 2009 mseben@xxxxxxx
- update to version 9.9
* recalculate cyls when kernel returns a truncated value
++++++ hdparm-9.9-nostrip.patch -> hdparm-9.10-nostrip.patch ++++++
++++++ hdparm-9.9.tar.bz2 -> hdparm-9.10.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/hdparm-9.9/Changelog new/hdparm-9.10/Changelog
--- old/hdparm-9.9/Changelog 2009-01-25 22:22:28.000000000 +0100
+++ new/hdparm-9.10/Changelog 2009-01-28 15:56:26.000000000 +0100
@@ -1,3 +1,6 @@
+hdparm-9.10
+ - try and improve CF card detection
+ - fix display of mwdma modes 3,4 for CF cards
hdparm-9.9
- recalculate cyls when kernel returns a truncated value
hdparm-9.8
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/hdparm-9.9/hdparm.8 new/hdparm-9.10/hdparm.8
--- old/hdparm-9.9/hdparm.8 2009-01-25 22:22:40.000000000 +0100
+++ new/hdparm-9.10/hdparm.8 2009-01-28 15:56:47.000000000 +0100
@@ -1,4 +1,4 @@
-.TH HDPARM 8 "January 2009" "Version 9.9"
+.TH HDPARM 8 "January 2009" "Version 9.10"
.SH NAME
hdparm \- get/set SATA/IDE device parameters
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/hdparm-9.9/hdparm.c new/hdparm-9.10/hdparm.c
--- old/hdparm-9.9/hdparm.c 2009-01-25 22:30:51.000000000 +0100
+++ new/hdparm-9.10/hdparm.c 2009-01-28 15:56:35.000000000 +0100
@@ -25,7 +25,7 @@
extern const char *minor_str[];
-#define VERSION "v9.9"
+#define VERSION "v9.10"
#ifndef O_DIRECT
#define O_DIRECT 040000 /* direct disk access, not easily obtained from
headers */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/hdparm-9.9/hdparm.lsm new/hdparm-9.10/hdparm.lsm
--- old/hdparm-9.9/hdparm.lsm 2009-01-25 22:59:26.000000000 +0100
+++ new/hdparm-9.10/hdparm.lsm 2009-01-28 15:57:19.000000000 +0100
@@ -1,8 +1,9 @@
Begin4
Title: hdparm
-Version: 9.9
-Entered-date: 2009-01-25
+Version: 9.10
+Entered-date: 2009-01-28
Description: hdparm - get/set hard disk parameters for Linux SATA/IDE drives.
+ v9.10 Fixes for CF card detection/reporting
v9.9 Recalculate cyls when kernel returns a truncated value
v9.8 FIX -N for non-LBA48 drives
v9.7 FIX LBA28/48 BUGS, favour ATA_12 over ATA_16 when possible
(helps with USB)
@@ -83,7 +84,7 @@
Maintained-by: mlord@xxxxxxxxx (Mark Lord)
Primary-site: http://sourceforge.net/projects/hdparm/
Alternate-site: http://www.ibiblio.org/pub/Linux/system/hardware
- 96K hdparm-9.9.tar.gz
+ 96K hdparm-9.10.tar.gz
4K hdparm.lsm
Platforms: Linux, kernels 2.2 through 2.6
Copying-policy: BSD License
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/hdparm-9.9/identify.c new/hdparm-9.10/identify.c
--- old/hdparm-9.9/identify.c 2008-11-03 18:46:19.000000000 +0100
+++ new/hdparm-9.10/identify.c 2009-01-27 18:48:41.000000000 +0100
@@ -121,8 +121,6 @@
#define MEDIA_REMOVABLE 0x0080
#define DRIVE_NOT_REMOVABLE 0x0040 /* bit obsoleted in ATA 6 */
#define INCOMPLETE 0x0004
-#define CFA_SUPPORT_VAL1 0x848a /* 848a=CFA feature set support */
-#define CFA_SUPPORT_VAL2 0x844a /* 844a=also means CFA feature set
support */
#define DRQ_RESPONSE_TIME 0x0060
#define DRQ_3MS_VAL 0x0000
#define DRQ_INTR_VAL 0x0020
@@ -592,6 +590,16 @@
return transport;
}
+static int is_cfa_dev (__u16 *id)
+{
+ /*
+ * id[0] == 0x848a means "CFA compliant, not ATA-4 compliant".
+ * id[0] == 0x044a is also allowed, but ISTR that some HDs use it too.
+ * Also, bit 0x0004 of id[83] means "supports CFA feature set".
+ */
+ return id[0] == 0x848a || id[0] == 0x844a || (id[83] & 0xc004) ==
0x4004;
+}
+
/* our main() routine: */
void identify (__u16 *id_supplied)
{
@@ -615,14 +623,15 @@
/* check if we recognise the device type */
printf("\n");
- if(!(val[GEN_CONFIG] & NOT_ATA)) {
- dev = ATA_DEV;
- printf("ATA device, with ");
- } else if(val[GEN_CONFIG]==CFA_SUPPORT_VAL1 ||
val[GEN_CONFIG]==CFA_SUPPORT_VAL2) {
+ //if(val[GEN_CONFIG] == 0x848a || val[GEN_CONFIG] == 0x844a) {
+ if (is_cfa_dev(val)) {
is_cfa = 1;
dev = ATA_DEV;
like_std = 4;
printf("CompactFlash ATA device\n");
+ } else if(!(val[GEN_CONFIG] & NOT_ATA)) {
+ dev = ATA_DEV;
+ printf("ATA device, with ");
} else if(!(val[GEN_CONFIG] & NOT_ATAPI)) {
dev = ATAPI_DEV;
eqpt = (val[GEN_CONFIG] & EQPT_TYPE) >> SHIFT_EQPT;
@@ -1179,7 +1188,7 @@
for (mode = 1; mode <= max; ++mode) {
if (mode == selected)
strcat(modes, "*");
- sprintf(modes + strlen(modes), "mdma%u ", mode
+ 4);
+ sprintf(modes + strlen(modes), "mdma%u ", mode
+ 2);
}
}
if (val[164] & 0x8000)
@@ -1217,6 +1226,7 @@
printf("\t *\tCFA advanced modes: %s\n", modes);
if(val[CFA_PWR_MODE] & VALID_W160) {
+ putchar('\t');
if((val[CFA_PWR_MODE] & PWR_MODE_REQ) == 0)
printf(" *");
printf("\tCFA Power Level 1 ");
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |