2 ===================================================================
3 RCS file: /cvs/gpe/base/gpe-conf/sysinfo.c,v
4 retrieving revision 1.19
5 diff -u -r1.19 sysinfo.c
6 --- sysinfo.c 8 Sep 2004 22:14:12 -0000 1.19
7 +++ sysinfo.c 25 Oct 2004 12:01:01 -0000
12 + struct utsname uinfo;
23 /* check mach type and model */
24 if (!access(P_IPAQ,F_OK))
28 result.cpu = g_strdup(_("Intel x86 or compatible"));
29 + result.model = g_strdup_printf("%s, %s", _("IBM type PC"), uinfo.machine);
32 result.cpu = g_strdup(_("Mips"));
34 result.cpu = g_strdup(_("IBM Power or PowerPC"));
37 - result.model = g_strdup(MACHINE);
38 + result.model = g_strdup_printf("%s (%s)", uinfo.machine, MACHINE);
41 /* memory and flash size */
44 - result.ram = meminfo.total / 1024 + 1;
45 + result.ram = meminfo.total;
46 result.flash = get_flash_size();
50 ===================================================================
51 RCS file: /cvs/gpe/base/gpe-conf/storage.c,v
52 retrieving revision 1.17
53 diff -u -r1.17 storage.c
54 --- storage.c 13 Sep 2004 12:00:01 -0000 1.17
55 +++ storage.c 25 Oct 2004 12:01:01 -0000
64 - u_int64_t my_mem_used, my_mem_max;
65 - u_int64_t my_swap_max;
66 + unsigned long mem_free, mem_total;
68 - static int mem_delay = 0;
70 - static u_int64_t aa, ab, ac, ad, ae, af, ag, ah;
71 - /* put this in permanent storage instead of stack */
72 - static char not_needed[2048];
73 - if (mem_delay-- <= 0)
74 + static char line[255];
75 + mem = fopen ("/proc/meminfo", "r");
78 - mem = fopen ("/proc/meminfo", "r");
79 - fgets (not_needed, 2048, mem);
81 - fscanf (mem, "%*s %Ld %Ld %Ld %Ld %Ld %Ld", &aa, &ab, &ac,
83 - fscanf (mem, "%*s %Ld %Ld", &ag, &ah);
84 + while (fgets (line, 255, mem))
86 + if (g_str_has_prefix(line, "MemTotal"))
87 + sscanf(line, "%*s %lu %*s", &mem_total);
88 + else if (g_str_has_prefix(line, "MemFree"))
90 + sscanf(line, "%*s %lu %*s", &mem_free);
98 - my_mem_max = aa; /* memory.total; */
99 - my_swap_max = ag; /* swap.total; */
101 - my_mem_used = ah + ab - af - ae;
103 - meminfo.total = my_mem_max / 1024;
104 - meminfo.used = my_mem_used / 1024;
105 - meminfo.avail = (my_mem_max - my_mem_used) / 1024;
107 + meminfo.total = mem_total / 1024;
108 + meminfo.used = (mem_total - mem_free) / 1024;
109 + meminfo.avail = mem_free / 1024;
116 @@ -183,13 +174,13 @@
117 /* TRANSLATORS: MB == Mega Bytes*/
118 sprintf (cnew2, "%s: <i>%4.1f</i> %s", _("Free memory"),
119 ((float) meminfo.total -
120 - (float) meminfo.used) / 1024.0, _("MB"));
121 + (float) meminfo.used), _("MB"));
122 gtk_label_set_markup (GTK_LABEL (meminfo.label3), cnew2);
124 fstr = g_strdup_printf ("%s%s %4.1f %s %s",
125 "<span foreground=\"black\">",
127 - (float) meminfo.total / 1024.0,
128 + (float) meminfo.total,
130 gtk_label_set_markup (GTK_LABEL (meminfo.label2), fstr);
133 (float) meminfo.total);
134 sprintf (cnew2, "%s: <i>%4.1f</i> %s", _("Free memory"),
135 ((float) meminfo.total -
136 - (float) meminfo.used) / 1024.0, _("MB"));
137 + (float) meminfo.used), _("MB"));
138 label1 = gtk_label_new (NULL);
139 gtk_misc_set_alignment (GTK_MISC (label1), 0.0, 0.5);
140 meminfo.label3 = label1;
142 fstr = g_strdup_printf ("%s%s %4.1f %s %s",
143 "<span foreground=\"black\">",
145 - (float) meminfo.total / 1024.0,
146 + (float) meminfo.total,
148 gtk_label_set_markup (GTK_LABEL (label1), fstr);