diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2005-08-02 00:51:34 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-02 00:51:34 +0000 |
| commit | e62c3d12f0ab466cdfa01a49fb86674969e7179d (patch) | |
| tree | 85bf98102e86950da1726f9ef04f09476fff9eac /packages/hdparm/hdparm-6.1 | |
| parent | 471d4c7a1a8d509f8bbd71b78fcdd0ab31427547 (diff) | |
| parent | fde83d7aabf6c0f8d56dbe1e1aba0783b004bab3 (diff) | |
propagate from branch 'org.openembedded.dev' (head 47c2f7f436790105a8af32ec352907b8ff53aba1)
to branch 'org.openembedded.nslu2-linux' (head a69b542d88fdbf378cd19a8ef701895615c143f7)
Diffstat (limited to 'packages/hdparm/hdparm-6.1')
| -rw-r--r-- | packages/hdparm/hdparm-6.1/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/hdparm/hdparm-6.1/bswap.patch | 36 | ||||
| -rw-r--r-- | packages/hdparm/hdparm-6.1/uclibc.patch | 32 |
3 files changed, 68 insertions, 0 deletions
diff --git a/packages/hdparm/hdparm-6.1/.mtn2git_empty b/packages/hdparm/hdparm-6.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/hdparm/hdparm-6.1/.mtn2git_empty diff --git a/packages/hdparm/hdparm-6.1/bswap.patch b/packages/hdparm/hdparm-6.1/bswap.patch new file mode 100644 index 0000000000..37fbcb7b38 --- /dev/null +++ b/packages/hdparm/hdparm-6.1/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 <linux/types.h> + #include <linux/hdreg.h> + #include <linux/major.h> +-#include <asm/byteorder.h> ++#include <byteswap.h> ++ ++#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-6.1/uclibc.patch b/packages/hdparm/hdparm-6.1/uclibc.patch new file mode 100644 index 0000000000..495d7491bb --- /dev/null +++ b/packages/hdparm/hdparm-6.1/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 <sys/times.h> + #include <sys/types.h> + #include <sys/mount.h> ++#ifndef __UCLIBC__ + #include <linux/types.h> ++#endif + #include <linux/hdreg.h> + #include <linux/major.h> + #include <byteswap.h> +--- 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 <linux/types.h> /* for __u16 */ ++#include <stdint.h> + + #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)); + |