[oe-commits] org.oe.dreambox busybox-1.2.1: re-add hdparm -M patch

[tmbinc commit]

busybox-1.2.1: re-add hdparm -M patch

Author: tmbinc at openembedded.org
Branch: org.openembedded.dreambox
Revision: 71b18e03207f94fbd8c16e98fbfb7ee7e89e7754
ViewMTN: http://monotone.openembedded.org/revision.psp?id=71b18e03207f94fbd8c16e98fbfb7ee7e89e7754
Files:
1
packages/busybox/busybox-1.2.1/hdparm_M.patch
packages/busybox/busybox_1.2.1.bb
Diffs:

#
# mt diff -r662c23496525675a53ea750673fe14713f0068f7 -r71b18e03207f94fbd8c16e98fbfb7ee7e89e7754
#
# 
# 
# patch "packages/busybox/busybox-1.2.1/hdparm_M.patch"
#  from [86da3e1292cf6a2942517d6d1515ba9cd88832d6]
#    to [320fa8854ce0ca1dbfbdebe5023ac7a88d308f1a]
# 
# patch "packages/busybox/busybox_1.2.1.bb"
#  from [200f56e18bd7f005a2db944962fe5de53e24c267]
#    to [ee5224167e0384ac83de83a489e3ef4402f148ee]
# 
============================================================
--- packages/busybox/busybox-1.2.1/hdparm_M.patch	86da3e1292cf6a2942517d6d1515ba9cd88832d6
+++ packages/busybox/busybox-1.2.1/hdparm_M.patch	320fa8854ce0ca1dbfbdebe5023ac7a88d308f1a
@@ -1,8 +1,7 @@
-Index: busybox-1.1.0/miscutils/hdparm.c
-===================================================================
---- busybox-1.1.0.orig/miscutils/hdparm.c	2006-01-11 06:44:13.000000000 +0100
-+++ busybox-1.1.0/miscutils/hdparm.c	2006-03-14 17:22:22.000000000 +0100
-@@ -1255,6 +1255,7 @@
+diff -Naur busybox-1.2.1/miscutils/hdparm.c busybox-1.2.1-hdparm_M/miscutils/hdparm.c
+--- busybox-1.2.1/miscutils/hdparm.c	2006-07-01 00:42:09.000000000 +0200
++++ busybox-1.2.1-hdparm_M/miscutils/hdparm.c	2006-09-22 05:55:29.000000000 +0200
+@@ -1134,6 +1134,7 @@
  static unsigned long set_sleepnow, get_sleepnow;
  static unsigned long get_powermode;
  static unsigned long set_apmmode, get_apmmode, apmmode;
@@ -10,38 +9,29 @@ Index: busybox-1.1.0/miscutils/hdparm.c
  #endif
  #ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY
  static int get_IDentity;
-@@ -2124,6 +2125,20 @@
- 		}
+@@ -1765,6 +1766,17 @@
  		bb_ioctl(fd, HDIO_DRIVE_CMD, &args,"HDIO_DRIVE_CMD");
+ 		args[1] = 0;
  	}
 +	if (set_acoustic)
 +	{
-+		no_scsi();
-+		acoustic=check_if_min_and_set_val(acoustic,0);
-+		acoustic=check_if_maj_and_set_val(acoustic,254);
-+		if_printf(get_acoustic," setting AAM level to 0x%02lX (%ld)\n", acoustic, acoustic);
++		if (get_acoustic)
++			printf(" setting AAM level to 0x%02lX (%ld)\n", acoustic, acoustic);
 +		bb_ioctl(fd, HDIO_SET_ACOUSTIC, (int*)acoustic,"HDIO_SET_ACOUSTIC");
 +	}
 +	if (get_acoustic)
 +	{
-+		no_scsi();
 +		bb_ioctl(fd, HDIO_GET_ACOUSTIC, (unsigned long*)&parm,"HDIO_GET_ACOUSTIC");
 +		printf(" acoustic     = %2ld (128=quiet ... 254=fast)\n", parm);
 +	}
  	if (set_wcache)
  	{
  #ifdef DO_FLUSHCACHE
+@@ -2134,6 +2146,7 @@
+ 		if (c == 'c') parse_opts(&get_io32bit, &set_io32bit, &io32bit, 0, INT_MAX /*8*/);
+ 		if (c == 'k') parse_opts(&get_keep, &set_keep, &keep, 0, 1);
+ 		if (c == 'a') parse_opts(&get_readahead, &set_readahead, &Xreadahead, 0, INT_MAX);
++		if (c == 'M') parse_opts(&get_acoustic, &set_acoustic, &acoustic, 1, 254);
+ 		if (c == 'B') parse_opts(&get_apmmode, &set_apmmode, &apmmode, 1, 255);
+ 		do_flush |= do_timings |= (c == 't');
+ 		do_flush |= do_ctimings |= (c == 'T');
-@@ -2832,6 +2847,13 @@
- 							p = *argv++, --argc;
- 						p=GET_NUMBER(p,&set_readahead,&Xreadahead);
- 						break;
-+					case 'M':
-+						get_acoustic = noisy; 
-+						noisy = 1;
-+						if (!*p && argc && isalnum(**argv))
-+							p = *argv++, --argc;
-+						p=GET_NUMBER(p,&set_acoustic,&acoustic);
-+						break;
- 					case 'B':
- 						get_apmmode = noisy;
- 						noisy = 1;
============================================================
--- packages/busybox/busybox_1.2.1.bb	200f56e18bd7f005a2db944962fe5de53e24c267
+++ packages/busybox/busybox_1.2.1.bb	ee5224167e0384ac83de83a489e3ef4402f148ee
@@ -27,6 +27,7 @@ SRC_URI = "http://www.busybox.net/downlo
 	   file://syslog.conf \
 	   file://mount.busybox \
 	   file://umount.busybox \
+	   file://hdparm_M.patch;patch=1 \
 	   file://keymap_endianess.patch;patch=1"
 
 export EXTRA_CFLAGS = "${CFLAGS}"