diff options
Diffstat (limited to 'meta/recipes-extended/hdparm/hdparm-6.3')
-rw-r--r-- | meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch | 37 | ||||
-rw-r--r-- | meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch | 34 |
2 files changed, 0 insertions, 71 deletions
diff --git a/meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch b/meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch deleted file mode 100644 index 715886a9d5..0000000000 --- a/meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | # | ||
4 | # Patch managed by http://www.holgerschurig.de/patcher.html | ||
5 | # | ||
6 | |||
7 | --- hdparm-5.8/hdparm.c~bswap | ||
8 | +++ hdparm-5.8/hdparm.c | ||
9 | @@ -20,7 +20,9 @@ | ||
10 | #include <linux/types.h> | ||
11 | #include <linux/hdreg.h> | ||
12 | #include <linux/major.h> | ||
13 | -#include <asm/byteorder.h> | ||
14 | +#include <byteswap.h> | ||
15 | + | ||
16 | +#define le16_to_cpus(x) bswap_16(htons(x)) | ||
17 | |||
18 | #include "hdparm.h" | ||
19 | |||
20 | @@ -1160,7 +1162,7 @@ | ||
21 | } | ||
22 | } else { | ||
23 | for(i = 0; i < 0x100; ++i) { | ||
24 | - __le16_to_cpus(&id[i]); | ||
25 | + le16_to_cpus(&id[i]); | ||
26 | } | ||
27 | identify((void *)id, NULL); | ||
28 | } | ||
29 | @@ -1380,7 +1382,7 @@ | ||
30 | } | ||
31 | for (i = 0; count >= 4; ++i) { | ||
32 | sbuf[i] = (fromhex(b[0]) << 12) | (fromhex(b[1]) << 8) | (fromhex(b[2]) << 4) | fromhex(b[3]); | ||
33 | - __le16_to_cpus((__u16 *)(&sbuf[i])); | ||
34 | + le16_to_cpus((__u16 *)(&sbuf[i])); | ||
35 | b += 5; | ||
36 | count -= 5; | ||
37 | } | ||
diff --git a/meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch b/meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch deleted file mode 100644 index d5f92989bd..0000000000 --- a/meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | --- hdparm-5.8/hdparm.c.ark 2005-05-22 19:48:34.000000000 +0000 | ||
4 | +++ hdparm-5.8/hdparm.c 2005-05-22 19:52:18.000000000 +0000 | ||
5 | @@ -17,7 +17,9 @@ | ||
6 | #include <sys/times.h> | ||
7 | #include <sys/types.h> | ||
8 | #include <sys/mount.h> | ||
9 | +#ifndef __UCLIBC__ | ||
10 | #include <linux/types.h> | ||
11 | +#endif | ||
12 | #include <linux/hdreg.h> | ||
13 | #include <linux/major.h> | ||
14 | #include <byteswap.h> | ||
15 | --- hdparm-5.8/hdparm.h.ark 2005-05-22 19:51:49.000000000 +0000 | ||
16 | +++ hdparm-5.8/hdparm.h 2005-05-22 19:54:54.000000000 +0000 | ||
17 | @@ -1,6 +1,6 @@ | ||
18 | /* Some prototypes for extern functions. */ | ||
19 | |||
20 | -#include <linux/types.h> /* for __u16 */ | ||
21 | +#include <stdint.h> | ||
22 | |||
23 | #if !defined(__GNUC__) && !defined(__attribute__) | ||
24 | #define __attribute__(x) /* if not using GCC, turn off the __attribute__ | ||
25 | @@ -11,7 +11,7 @@ | ||
26 | others, though, were declared in hdparm.c with global scope; since other | ||
27 | functions in that file have static (file) scope, I assume the difference is | ||
28 | intentional. */ | ||
29 | -extern void identify (__u16 *id_supplied, const char *devname); | ||
30 | +extern void identify (uint16_t *id_supplied, const char *devname); | ||
31 | |||
32 | extern void usage_error(int out) __attribute__((noreturn)); | ||
33 | extern int main(int argc, char **argv) __attribute__((noreturn)); | ||
34 | |||