]>
Commit | Line | Data |
---|---|---|
4669ee58 JK |
1 | diff -durN -x '*~' -x '*.o' -x '.*' -x '*.[0-9]' -x '*.links' -x '*.html' -x '*.txt' -x '*.pod' -x 'config*' busybox-1.00-pre4.orig/libbb/loop.h busybox-1.00-pre4/libbb/loop.h |
2 | --- busybox-1.00-pre4.orig/libbb/loop.h 1970-01-01 01:00:00.000000000 +0100 | |
3 | +++ busybox-1.00-pre4/libbb/loop.h 2004-12-21 17:45:14.000000000 +0100 | |
4 | @@ -0,0 +1,5 @@ | |
5 | +#include <linux/posix_types.h> | |
6 | +#undef dev_t | |
7 | +#define dev_t __kernel_dev_t | |
8 | +#include <linux/loop.h> | |
9 | +#undef dev_t | |
10 | diff -durN -x '*~' -x '*.o' -x '.*' -x '*.[0-9]' -x '*.links' -x '*.html' -x '*.txt' -x '*.pod' -x 'config*' busybox-1.00-pre4.orig/miscutils/hdparm.c busybox-1.00-pre4/miscutils/hdparm.c | |
11 | --- busybox-1.00-pre4.orig/miscutils/hdparm.c 2004-12-21 17:58:28.111674208 +0100 | |
12 | +++ busybox-1.00-pre4/miscutils/hdparm.c 2004-12-21 17:53:25.000000000 +0100 | |
e9d0874e | 13 | @@ -45,7 +45,8 @@ |
4669ee58 JK |
14 | #include <linux/types.h> |
15 | #include <linux/hdreg.h> | |
16 | #include <linux/major.h> | |
17 | -#include <asm/byteorder.h> | |
18 | +#include <endian.h> | |
e9d0874e | 19 | +#include <byteswap.h> |
4669ee58 JK |
20 | |
21 | ||
22 | #if (__BYTE_ORDER == __BIG_ENDIAN) && !defined(__USE_XOPEN) | |
23 | @@ -2425,7 +2425,8 @@ | |
24 | } | |
25 | } | |
26 | for(i=0; i<(sizeof args)/2; i+=2) | |
27 | - __le16_to_cpus((uint16_t *)(&args[i])); | |
28 | + if (__BYTE_ORDER != __LITTLE_ENDIAN) | |
29 | + args[i]=bswap_16(args[i]); | |
30 | ||
31 | identify((void *)&args[4], NULL); | |
32 | identify_abort: | |
33 | @@ -2491,7 +2492,8 @@ | |
34 | for (i = 0; count >= 4; ++i) | |
35 | { | |
36 | sbuf[i] = (fromhex(b[0]) << 12) | (fromhex(b[1]) << 8) | (fromhex(b[2]) << 4) | fromhex(b[3]); | |
37 | - __le16_to_cpus((uint16_t *)(&sbuf[i])); | |
38 | + if (__BYTE_ORDER != __LITTLE_ENDIAN) | |
39 | + sbuf[i]=bswap_16(sbuf[i]); | |
40 | b += 5; | |
41 | count -= 5; | |
42 | } |