Diff of /trunk/hwinfo/patches/hwinfo-16.10-debian-all-1.patch

Parent Directory | Revision Log | Patch

	revision 914 by niro, Thu Oct 29 00:36:17 2009 UTC	revision 915 by niro, Thu Oct 29 00:43:37 2009 UTC
#	Line 1	Line 1
1	Index: src/hd/hd.c	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	--- src/hd/hd.c.orig	+++ hwinfo-16.10-magellan/src/hd/cpu.c 2009-10-29 01:52:27.000000000 +0100
4	+++ src/hd/hd.c	@@ -104,6 +104,7 @@
5	@@ -142,6 +142,14 @@	#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"	#define HD_ARCH "hppa"
33	#endif	#endif
34
#	Line 14  Index: src/hd/hd.c	Line 40  Index: src/hd/hd.c
40	+#define HD_ARCH "ppc64"	+#define HD_ARCH "ppc64"
41	+#endif	+#endif
42	+	+
43		+#ifdef __sh__
44		+#define HD_ARCH "sh"
45		+#endif
46		+
47	typedef struct disk_s {	typedef struct disk_s {
48	struct disk_s *next;	struct disk_s *next;
49	unsigned crc;	unsigned crc;
50	Index: src/hd/kbd.c	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	--- src/hd/kbd.c.orig	+++ hwinfo-16.10-magellan/src/hd/kbd.c 2009-10-29 01:52:23.000000000 +0100
53	+++ src/hd/kbd.c	@@ -21,31 +21,10 @@
	@@ -45,7 +45,6 @@
	typedef unsigned int u_int;
	#endif
	-#include <asm/kbio.h>
	#include <asm/openpromio.h>
	#endif
	@@ -253,8 +252,6 @@
	if((fd = open(DEV_KBD, O_RDWR | O_NONBLOCK | O_NOCTTY)) >= 0)
	{
	-      if(ioctl(fd, KIOCTYPE, &kid)) kid = -1;
	-      if(ioctl(fd, KIOCLAYOUT, &klay)) klay = -1;
	close(fd);
	if(kid != -1)
	Index: src/hd/kbd.c
	===================================================================
	--- src/hd/kbd.c.orig
	+++ src/hd/kbd.c
	@@ -21,26 +21,6 @@
54
55	#ifdef __sparc__	#ifdef __sparc__
56
#	Line 69  Index: src/hd/kbd.c	Line 77  Index: src/hd/kbd.c
77	#ifdef DIET	#ifdef DIET
78	typedef unsigned int u_int;	typedef unsigned int u_int;
79	#endif	#endif
80	Index: src/hd/kbd.c
81	===================================================================	-#include <asm/kbio.h>
82	--- src/hd/kbd.c.orig	#include <asm/openpromio.h>
83	+++ src/hd/kbd.c	#endif
84	@@ -121,11 +121,13 @@
85		@@ -142,11 +121,13 @@
86	}	}
87
88	if(!dev && (fd = open(DEV_CONSOLE, O_RDWR | O_NONBLOCK | O_NOCTTY)) >= 0) {	if(!dev && (fd = open(DEV_CONSOLE, O_RDWR | O_NONBLOCK | O_NOCTTY)) >= 0) {
#	Line 85  Index: src/hd/kbd.c	Line 94  Index: src/hd/kbd.c
94	}	}
95	+    */	+    */
96
97	if(tty_major == 229 /* iseries hvc */) {	if (0)
98	if (tty_minor >= 128) {	;
99	Index: src/hd/cpu.c	@@ -259,8 +240,6 @@
	===================================================================
	--- src/hd/cpu.c.orig
	+++ src/hd/cpu.c
	@@ -104,6 +104,7 @@
	#ifdef __alpha__
	char model_id[80], system_id[80], serial_number[80], platform[80];
	unsigned cpu_variation, cpu_revision, u, hz;
	+  double bogo;
	cpu_info_t *ct1;
	#endif
100
101	@@ -133,6 +134,7 @@	if((fd = open(DEV_KBD, O_RDWR | O_NONBLOCK | O_NOCTTY)) >= 0)
102	#ifdef __alpha__	{
103	*model_id = *system_id = *serial_number = *platform = 0;	-      if(ioctl(fd, KIOCTYPE, &kid)) kid = -1;
104	cpu_variation = cpu_revision = hz = 0;	-      if(ioctl(fd, KIOCLAYOUT, &klay)) klay = -1;
105	+  bogo = 0;	close(fd);
	for(sl = hd_data->cpu; sl; sl = sl->next) {
	if(sscanf(sl->str, "cpu model : %79[^\n]", model_id) == 1) continue;
	@@ -143,6 +145,7 @@
	if(sscanf(sl->str, "cpus detected : %u", &cpus) == 1) continue;
	if(sscanf(sl->str, "cycle frequency [Hz] : %u", &hz) == 1) continue;
	if(sscanf(sl->str, "system variation : %79[^\n]", platform) == 1) continue;
	+    if(sscanf(sl->str, "BogoMIPS : %lg", &bogo) == 1) continue;
	}
106
107	if(*model_id || *system_id) { /* at least one of those */	if(kid != -1)

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.914   changed lines   Added in v.915