Contents of /trunk/hwinfo/patches/hwinfo-13.41-debian-all-1.patch
Parent Directory | Revision Log
Revision 335 -
(show annotations)
(download)
Wed Sep 5 20:09:30 2007 UTC (17 years ago) by niro
File size: 3540 byte(s)
Wed Sep 5 20:09:30 2007 UTC (17 years ago) by niro
File size: 3540 byte(s)
- all patches in one file (13.41-debian-1)
1 | Index: doc/hwinfo.8 |
2 | =================================================================== |
3 | --- doc/hwinfo.8.orig |
4 | +++ doc/hwinfo.8 |
5 | @@ -71,10 +71,6 @@ |
6 | .B zip. |
7 | .\" |
8 | .\" |
9 | -.SH FILES |
10 | -.B /var/lib/hardware/* |
11 | -.\" |
12 | -.\" |
13 | .SH BUGS |
14 | Not all hardware can be detected. |
15 | .\" |
16 | @@ -87,6 +83,6 @@ |
17 | .\" |
18 | .\" |
19 | .SH "SEE ALSO" |
20 | -Documentation in /usr/share/doc/packages/hwinfo. |
21 | +discover(8). |
22 | .\" |
23 | .\" EOF |
24 | Index: src/hd/hd.c |
25 | =================================================================== |
26 | --- src/hd/hd.c.orig |
27 | +++ src/hd/hd.c |
28 | @@ -142,6 +142,14 @@ |
29 | #define HD_ARCH "hppa" |
30 | #endif |
31 | |
32 | +#ifdef __mc68000__ |
33 | +#define HD_ARCH "m68k" |
34 | +#endif |
35 | + |
36 | +#ifdef __powerpc64__ |
37 | +#define HD_ARCH "ppc64" |
38 | +#endif |
39 | + |
40 | typedef struct disk_s { |
41 | struct disk_s *next; |
42 | unsigned crc; |
43 | Index: src/hd/kbd.c |
44 | =================================================================== |
45 | --- src/hd/kbd.c.orig |
46 | +++ src/hd/kbd.c |
47 | @@ -45,7 +45,6 @@ |
48 | typedef unsigned int u_int; |
49 | #endif |
50 | |
51 | -#include <asm/kbio.h> |
52 | #include <asm/openpromio.h> |
53 | #endif |
54 | |
55 | @@ -253,8 +252,6 @@ |
56 | |
57 | if((fd = open(DEV_KBD, O_RDWR | O_NONBLOCK | O_NOCTTY)) >= 0) |
58 | { |
59 | - if(ioctl(fd, KIOCTYPE, &kid)) kid = -1; |
60 | - if(ioctl(fd, KIOCLAYOUT, &klay)) klay = -1; |
61 | close(fd); |
62 | |
63 | if(kid != -1) |
64 | Index: src/hd/kbd.c |
65 | =================================================================== |
66 | --- src/hd/kbd.c.orig |
67 | +++ src/hd/kbd.c |
68 | @@ -21,26 +21,6 @@ |
69 | |
70 | #ifdef __sparc__ |
71 | |
72 | -struct serial_struct { |
73 | - int type; |
74 | - int line; |
75 | - unsigned long port; |
76 | - int irq; |
77 | - int flags; |
78 | - int xmit_fifo_size; |
79 | - int custom_divisor; |
80 | - int baud_base; |
81 | - unsigned short close_delay; |
82 | - char io_type; |
83 | - char reserved_char[1]; |
84 | - int hub6; |
85 | - unsigned short closing_wait; /* time to wait before closing */ |
86 | - unsigned short closing_wait2; /* no longer used... */ |
87 | - unsigned char *iomem_base; |
88 | - unsigned short iomem_reg_shift; |
89 | - int reserved[2]; |
90 | -}; |
91 | - |
92 | #ifdef DIET |
93 | typedef unsigned int u_int; |
94 | #endif |
95 | Index: src/hd/kbd.c |
96 | =================================================================== |
97 | --- src/hd/kbd.c.orig |
98 | +++ src/hd/kbd.c |
99 | @@ -121,11 +121,13 @@ |
100 | } |
101 | |
102 | if(!dev && (fd = open(DEV_CONSOLE, O_RDWR | O_NONBLOCK | O_NOCTTY)) >= 0) { |
103 | + /* Removing since TIOCGDEV isn't supported in the mainline kernel |
104 | if(ioctl(fd, TIOCGDEV, &u) != -1) { |
105 | tty_major = (u >> 8) & 0xfff; |
106 | tty_minor = (u & 0xff) | ((u >> 12) & 0xfff00); |
107 | ADD2LOG(DEV_CONSOLE ": major %u, minor %u\n", tty_major, tty_minor); |
108 | } |
109 | + */ |
110 | |
111 | if(tty_major == 229 /* iseries hvc */) { |
112 | if (tty_minor >= 128) { |
113 | Index: src/hd/cpu.c |
114 | =================================================================== |
115 | --- src/hd/cpu.c.orig |
116 | +++ src/hd/cpu.c |
117 | @@ -104,6 +104,7 @@ |
118 | #ifdef __alpha__ |
119 | char model_id[80], system_id[80], serial_number[80], platform[80]; |
120 | unsigned cpu_variation, cpu_revision, u, hz; |
121 | + double bogo; |
122 | cpu_info_t *ct1; |
123 | #endif |
124 | |
125 | @@ -133,6 +134,7 @@ |
126 | #ifdef __alpha__ |
127 | *model_id = *system_id = *serial_number = *platform = 0; |
128 | cpu_variation = cpu_revision = hz = 0; |
129 | + bogo = 0; |
130 | |
131 | for(sl = hd_data->cpu; sl; sl = sl->next) { |
132 | if(sscanf(sl->str, "cpu model : %79[^\n]", model_id) == 1) continue; |
133 | @@ -143,6 +145,7 @@ |
134 | if(sscanf(sl->str, "cpus detected : %u", &cpus) == 1) continue; |
135 | if(sscanf(sl->str, "cycle frequency [Hz] : %u", &hz) == 1) continue; |
136 | if(sscanf(sl->str, "system variation : %79[^\n]", platform) == 1) continue; |
137 | + if(sscanf(sl->str, "BogoMIPS : %lg", &bogo) == 1) continue; |
138 | } |
139 | |
140 | if(*model_id || *system_id) { /* at least one of those */ |