From c8e5702127e507e82e6f68a4b8c546803accea9d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 30 Jun 2005 08:19:37 +0000 Subject: import clean BK tree at cset 1.3670 --- packages/hdparm/.mtn2git_empty | 0 packages/hdparm/hdparm-5.4/.mtn2git_empty | 0 packages/hdparm/hdparm-5.4/bswap.patch | 32 ++++++++++++++++++++++++++ packages/hdparm/hdparm-5.4/readahead.patch | 32 ++++++++++++++++++++++++++ packages/hdparm/hdparm-5.8/.mtn2git_empty | 0 packages/hdparm/hdparm-5.8/bswap.patch | 36 ++++++++++++++++++++++++++++++ packages/hdparm/hdparm-5.8/readahead.patch | 32 ++++++++++++++++++++++++++ packages/hdparm/hdparm-5.8/uclibc.patch | 32 ++++++++++++++++++++++++++ 8 files changed, 164 insertions(+) create mode 100644 packages/hdparm/.mtn2git_empty create mode 100644 packages/hdparm/hdparm-5.4/.mtn2git_empty create mode 100644 packages/hdparm/hdparm-5.8/.mtn2git_empty (limited to 'packages/hdparm') diff --git a/packages/hdparm/.mtn2git_empty b/packages/hdparm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/hdparm/hdparm-5.4/.mtn2git_empty b/packages/hdparm/hdparm-5.4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/hdparm/hdparm-5.4/bswap.patch b/packages/hdparm/hdparm-5.4/bswap.patch index e69de29bb2..13670073a4 100644 --- a/packages/hdparm/hdparm-5.4/bswap.patch +++ b/packages/hdparm/hdparm-5.4/bswap.patch @@ -0,0 +1,32 @@ +diff -Naur hdparm-5.4/hdparm.c hdparm-5.4-fix/hdparm.c +--- hdparm-5.4/hdparm.c 2004-07-14 01:29:30.000000000 +0200 ++++ hdparm-5.4-fix/hdparm.c 2004-07-14 01:28:31.000000000 +0200 +@@ -20,7 +20,9 @@ + #include + #include + #include +-#include ++#include ++ ++#define le16_to_cpus(x) bswap_16(htons(x)) + + #include "hdparm.h" + +@@ -1299,7 +1301,7 @@ + } + } + for(i=0; i<(sizeof args)/2; i+=2) { +- __le16_to_cpus((__u16 *)(&args[i])); ++ le16_to_cpus(*(__u16 *)(&args[i])); + } + identify((void *)&args[4], NULL); + identify_abort: ; +@@ -1499,7 +1501,7 @@ + } + for (i = 0; count >= 4; ++i) { + sbuf[i] = (fromhex(b[0]) << 12) | (fromhex(b[1]) << 8) | (fromhex(b[2]) << 4) | fromhex(b[3]); +- __le16_to_cpus((__u16 *)(&sbuf[i])); ++ le16_to_cpus((__u16 *)(&sbuf[i])); + b += 5; + count -= 5; + } diff --git a/packages/hdparm/hdparm-5.4/readahead.patch b/packages/hdparm/hdparm-5.4/readahead.patch index e69de29bb2..2868d940d0 100644 --- a/packages/hdparm/hdparm-5.4/readahead.patch +++ b/packages/hdparm/hdparm-5.4/readahead.patch @@ -0,0 +1,32 @@ +diff -Naur hdparm-5.4/hdparm.c hdparm-5.4-fix/hdparm.c +--- hdparm-5.4/hdparm.c 2004-07-14 00:36:03.000000000 +0200 ++++ hdparm-5.4-fix/hdparm.c 2003-04-18 22:29:38.000000000 +0200 +@@ -52,7 +52,7 @@ + static int flagcount = 0, do_flush = 0, is_scsi_hd = 0, is_xt_hd = 0; + static int do_ctimings, do_timings = 0; + +-static unsigned long set_readahead= 0, get_readahead= 0, readahead= 0; ++static unsigned long set_readahead= 0, get_readahead= 0, readahead_state= 0; + static unsigned long set_readonly = 0, get_readonly = 0, readonly = 0; + static unsigned long set_unmask = 0, get_unmask = 0, unmask = 0; + static unsigned long set_mult = 0, get_mult = 0, mult = 0; +@@ -785,8 +785,8 @@ + + if (set_readahead) { + if (get_readahead) +- printf(" setting fs readahead to %ld\n", readahead); +- if (ioctl(fd, BLKRASET, readahead)) ++ printf(" setting fs readahead to %ld\n", readahead_state); ++ if (ioctl(fd, BLKRASET, readahead_state)) + perror(" BLKRASET failed"); + } + #ifdef HDIO_UNREGISTER_HWIF +@@ -1830,7 +1830,7 @@ + case 'a': + get_readahead = noisy; + noisy = 1; +- GET_NUMBER(set_readahead,readahead); ++ GET_NUMBER(set_readahead,readahead_state); + break; + case 'B': + get_apmmode = noisy; diff --git a/packages/hdparm/hdparm-5.8/.mtn2git_empty b/packages/hdparm/hdparm-5.8/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/hdparm/hdparm-5.8/bswap.patch b/packages/hdparm/hdparm-5.8/bswap.patch index e69de29bb2..37fbcb7b38 100644 --- a/packages/hdparm/hdparm-5.8/bswap.patch +++ b/packages/hdparm/hdparm-5.8/bswap.patch @@ -0,0 +1,36 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- hdparm-5.8/hdparm.c~bswap ++++ hdparm-5.8/hdparm.c +@@ -20,7 +20,9 @@ + #include + #include + #include +-#include ++#include ++ ++#define le16_to_cpus(x) bswap_16(htons(x)) + + #include "hdparm.h" + +@@ -1160,7 +1162,7 @@ + } + } else { + for(i = 0; i < 0x100; ++i) { +- __le16_to_cpus(&id[i]); ++ le16_to_cpus(&id[i]); + } + identify((void *)id, NULL); + } +@@ -1380,7 +1382,7 @@ + } + for (i = 0; count >= 4; ++i) { + sbuf[i] = (fromhex(b[0]) << 12) | (fromhex(b[1]) << 8) | (fromhex(b[2]) << 4) | fromhex(b[3]); +- __le16_to_cpus((__u16 *)(&sbuf[i])); ++ le16_to_cpus((__u16 *)(&sbuf[i])); + b += 5; + count -= 5; + } diff --git a/packages/hdparm/hdparm-5.8/readahead.patch b/packages/hdparm/hdparm-5.8/readahead.patch index e69de29bb2..2868d940d0 100644 --- a/packages/hdparm/hdparm-5.8/readahead.patch +++ b/packages/hdparm/hdparm-5.8/readahead.patch @@ -0,0 +1,32 @@ +diff -Naur hdparm-5.4/hdparm.c hdparm-5.4-fix/hdparm.c +--- hdparm-5.4/hdparm.c 2004-07-14 00:36:03.000000000 +0200 ++++ hdparm-5.4-fix/hdparm.c 2003-04-18 22:29:38.000000000 +0200 +@@ -52,7 +52,7 @@ + static int flagcount = 0, do_flush = 0, is_scsi_hd = 0, is_xt_hd = 0; + static int do_ctimings, do_timings = 0; + +-static unsigned long set_readahead= 0, get_readahead= 0, readahead= 0; ++static unsigned long set_readahead= 0, get_readahead= 0, readahead_state= 0; + static unsigned long set_readonly = 0, get_readonly = 0, readonly = 0; + static unsigned long set_unmask = 0, get_unmask = 0, unmask = 0; + static unsigned long set_mult = 0, get_mult = 0, mult = 0; +@@ -785,8 +785,8 @@ + + if (set_readahead) { + if (get_readahead) +- printf(" setting fs readahead to %ld\n", readahead); +- if (ioctl(fd, BLKRASET, readahead)) ++ printf(" setting fs readahead to %ld\n", readahead_state); ++ if (ioctl(fd, BLKRASET, readahead_state)) + perror(" BLKRASET failed"); + } + #ifdef HDIO_UNREGISTER_HWIF +@@ -1830,7 +1830,7 @@ + case 'a': + get_readahead = noisy; + noisy = 1; +- GET_NUMBER(set_readahead,readahead); ++ GET_NUMBER(set_readahead,readahead_state); + break; + case 'B': + get_apmmode = noisy; diff --git a/packages/hdparm/hdparm-5.8/uclibc.patch b/packages/hdparm/hdparm-5.8/uclibc.patch index e69de29bb2..495d7491bb 100644 --- a/packages/hdparm/hdparm-5.8/uclibc.patch +++ b/packages/hdparm/hdparm-5.8/uclibc.patch @@ -0,0 +1,32 @@ +--- hdparm-5.8/hdparm.c.ark 2005-05-22 19:48:34.000000000 +0000 ++++ hdparm-5.8/hdparm.c 2005-05-22 19:52:18.000000000 +0000 +@@ -17,7 +17,9 @@ + #include + #include + #include ++#ifndef __UCLIBC__ + #include ++#endif + #include + #include + #include +--- hdparm-5.8/hdparm.h.ark 2005-05-22 19:51:49.000000000 +0000 ++++ hdparm-5.8/hdparm.h 2005-05-22 19:54:54.000000000 +0000 +@@ -1,6 +1,6 @@ + /* Some prototypes for extern functions. */ + +-#include /* for __u16 */ ++#include + + #if !defined(__GNUC__) && !defined(__attribute__) + #define __attribute__(x) /* if not using GCC, turn off the __attribute__ +@@ -11,7 +11,7 @@ + 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. */ +-extern void identify (__u16 *id_supplied, const char *devname); ++extern void identify (uint16_t *id_supplied, const char *devname); + + extern void usage_error(int out) __attribute__((noreturn)); + extern int main(int argc, char **argv) __attribute__((noreturn)); + -- cgit v1.2.3