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