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