summaryrefslogtreecommitdiff
path: root/com32/hdt/hdt-menu-processor.c
diff options
context:
space:
mode:
authorPierre-Alexandre Meyer <pierre@mouraf.org>2009-03-14 10:13:59 -0700
committerPierre-Alexandre Meyer <pierre@mouraf.org>2009-03-14 15:27:28 -0700
commita000236c38990c5dd76694d1988d8505354eefec (patch)
treefcadaa75f7298448e2b11e4dc0e5a86ac9b3521f /com32/hdt/hdt-menu-processor.c
parent82600be21cadaa6d4f1330c9b50134fc9dd6df9d (diff)
downloadsyslinux-a000236c38990c5dd76694d1988d8505354eefec.tar.gz
hdt: Fix indentation in source files
Impact: Cleanups. Fix indentation in all *.c files by sticking to the Linux style (indent -linux), using 2 spaces for indentation. Misc.: Corrected typos in comments, wrapped to 80 characters. Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
Diffstat (limited to 'com32/hdt/hdt-menu-processor.c')
-rw-r--r--com32/hdt/hdt-menu-processor.c294
1 files changed, 174 insertions, 120 deletions
diff --git a/com32/hdt/hdt-menu-processor.c b/com32/hdt/hdt-menu-processor.c
index d0d7dd7b..d71fbe1f 100644
--- a/com32/hdt/hdt-menu-processor.c
+++ b/com32/hdt/hdt-menu-processor.c
@@ -24,163 +24,217 @@
* OTHER DEALINGS IN THE SOFTWARE.
*
* -----------------------------------------------------------------------
-*/
+ */
#include "hdt-menu.h"
/* Compute Processor menu */
-void compute_processor(struct s_my_menu *menu,struct s_hardware *hardware) {
- char buffer[SUBMENULEN+1];
- char buffer1[SUBMENULEN+1];
- char statbuffer[STATLEN+1];
-
- menu->menu = add_menu(" Main Processor ",-1);
- menu->items_count=0;
- set_menu_pos(SUBMENU_Y,SUBMENU_X);
-
- snprintf(buffer,sizeof buffer,"Vendor : %s",hardware->cpu.vendor);
- snprintf(statbuffer,sizeof statbuffer,"Vendor: %s",hardware->cpu.vendor);
- add_item(buffer,statbuffer,OPT_INACTIVE,NULL,0);
+void compute_processor(struct s_my_menu *menu, struct s_hardware *hardware)
+{
+ char buffer[SUBMENULEN + 1];
+ char buffer1[SUBMENULEN + 1];
+ char statbuffer[STATLEN + 1];
+
+ menu->menu = add_menu(" Main Processor ", -1);
+ menu->items_count = 0;
+ set_menu_pos(SUBMENU_Y, SUBMENU_X);
+
+ snprintf(buffer, sizeof buffer, "Vendor : %s", hardware->cpu.vendor);
+ snprintf(statbuffer, sizeof statbuffer, "Vendor: %s",
+ hardware->cpu.vendor);
+ add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
menu->items_count++;
- snprintf(buffer,sizeof buffer,"Model : %s",hardware->cpu.model);
- snprintf(statbuffer,sizeof statbuffer,"Model: %s",hardware->cpu.model);
- add_item(buffer,statbuffer,OPT_INACTIVE,NULL,0);
+ snprintf(buffer, sizeof buffer, "Model : %s", hardware->cpu.model);
+ snprintf(statbuffer, sizeof statbuffer, "Model: %s",
+ hardware->cpu.model);
+ add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
menu->items_count++;
- snprintf(buffer,sizeof buffer,"Vendor ID : %d",hardware->cpu.vendor_id);
- snprintf(statbuffer,sizeof statbuffer,"Vendor ID: %d",hardware->cpu.vendor_id);
- add_item(buffer,statbuffer,OPT_INACTIVE,NULL,0);
+ snprintf(buffer, sizeof buffer, "Vendor ID : %d",
+ hardware->cpu.vendor_id);
+ snprintf(statbuffer, sizeof statbuffer, "Vendor ID: %d",
+ hardware->cpu.vendor_id);
+ add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
menu->items_count++;
- snprintf(buffer,sizeof buffer,"Family ID : %d",hardware->cpu.family);
- snprintf(statbuffer,sizeof statbuffer,"Family ID: %d",hardware->cpu.family);
- add_item(buffer,statbuffer,OPT_INACTIVE,NULL,0);
+ snprintf(buffer, sizeof buffer, "Family ID : %d", hardware->cpu.family);
+ snprintf(statbuffer, sizeof statbuffer, "Family ID: %d",
+ hardware->cpu.family);
+ add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
menu->items_count++;
- snprintf(buffer,sizeof buffer,"Model ID : %d",hardware->cpu.model_id);
- snprintf(statbuffer,sizeof statbuffer,"Model ID: %d",hardware->cpu.model_id);
- add_item(buffer,statbuffer,OPT_INACTIVE,NULL,0);
+ snprintf(buffer, sizeof buffer, "Model ID : %d",
+ hardware->cpu.model_id);
+ snprintf(statbuffer, sizeof statbuffer, "Model ID: %d",
+ hardware->cpu.model_id);
+ add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
menu->items_count++;
- snprintf(buffer,sizeof buffer,"Stepping : %d",hardware->cpu.stepping);
- snprintf(statbuffer,sizeof statbuffer,"Stepping: %d",hardware->cpu.stepping);
- add_item(buffer,statbuffer,OPT_INACTIVE,NULL,0);
+ snprintf(buffer, sizeof buffer, "Stepping : %d",
+ hardware->cpu.stepping);
+ snprintf(statbuffer, sizeof statbuffer, "Stepping: %d",
+ hardware->cpu.stepping);
+ add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
menu->items_count++;
if (hardware->is_dmi_valid) {
- snprintf(buffer,sizeof buffer,"FSB : %d",hardware->dmi.processor.external_clock);
- snprintf(statbuffer,sizeof statbuffer,"Front Side Bus (MHz): %d",hardware->dmi.processor.external_clock);
- add_item(buffer,statbuffer,OPT_INACTIVE,NULL,0);
- menu->items_count++;
-
- snprintf(buffer,sizeof buffer,"Cur. Speed: %d",hardware->dmi.processor.current_speed);
- snprintf(statbuffer,sizeof statbuffer,"Current Speed (MHz): %d",hardware->dmi.processor.current_speed);
- add_item(buffer,statbuffer,OPT_INACTIVE,NULL,0);
- menu->items_count++;
-
- snprintf(buffer,sizeof buffer,"Max Speed : %d",hardware->dmi.processor.max_speed);
- snprintf(statbuffer,sizeof statbuffer,"Max Speed (MHz): %d",hardware->dmi.processor.max_speed);
- add_item(buffer,statbuffer,OPT_INACTIVE,NULL,0);
- menu->items_count++;
-
- snprintf(buffer,sizeof buffer,"Upgrade : %s", hardware->dmi.processor.upgrade);
- snprintf(statbuffer,sizeof statbuffer,"Upgrade: %s",hardware->dmi.processor.upgrade);
- add_item(buffer,statbuffer,OPT_INACTIVE,NULL,0);
- menu->items_count++;
+ snprintf(buffer, sizeof buffer, "FSB : %d",
+ hardware->dmi.processor.external_clock);
+ snprintf(statbuffer, sizeof statbuffer,
+ "Front Side Bus (MHz): %d",
+ hardware->dmi.processor.external_clock);
+ add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
+ menu->items_count++;
+
+ snprintf(buffer, sizeof buffer, "Cur. Speed: %d",
+ hardware->dmi.processor.current_speed);
+ snprintf(statbuffer, sizeof statbuffer,
+ "Current Speed (MHz): %d",
+ hardware->dmi.processor.current_speed);
+ add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
+ menu->items_count++;
+
+ snprintf(buffer, sizeof buffer, "Max Speed : %d",
+ hardware->dmi.processor.max_speed);
+ snprintf(statbuffer, sizeof statbuffer, "Max Speed (MHz): %d",
+ hardware->dmi.processor.max_speed);
+ add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
+ menu->items_count++;
+
+ snprintf(buffer, sizeof buffer, "Upgrade : %s",
+ hardware->dmi.processor.upgrade);
+ snprintf(statbuffer, sizeof statbuffer, "Upgrade: %s",
+ hardware->dmi.processor.upgrade);
+ add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
+ menu->items_count++;
}
if (hardware->cpu.flags.smp) {
- snprintf(buffer,sizeof buffer,"SMP : Yes");
- snprintf(statbuffer,sizeof statbuffer,"SMP: Yes");
+ snprintf(buffer, sizeof buffer, "SMP : Yes");
+ snprintf(statbuffer, sizeof statbuffer, "SMP: Yes");
+ } else {
+ snprintf(buffer, sizeof buffer, "SMP : No");
+ snprintf(statbuffer, sizeof statbuffer, "SMP: No");
}
- else {
- snprintf(buffer,sizeof buffer,"SMP : No");
- snprintf(statbuffer,sizeof statbuffer,"SMP: No");
- }
- add_item(buffer,statbuffer,OPT_INACTIVE,NULL,0);
+ add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
menu->items_count++;
if (hardware->cpu.flags.lm) {
- snprintf(buffer,sizeof buffer,"x86_64 : Yes");
- snprintf(statbuffer,sizeof statbuffer,"x86_64 compatible processor: Yes");
- }
- else {
- snprintf(buffer,sizeof buffer,"X86_64 : No");
- snprintf(statbuffer,sizeof statbuffer,"X86_64 compatible processor: No");
+ snprintf(buffer, sizeof buffer, "x86_64 : Yes");
+ snprintf(statbuffer, sizeof statbuffer,
+ "x86_64 compatible processor: Yes");
+ } else {
+ snprintf(buffer, sizeof buffer, "X86_64 : No");
+ snprintf(statbuffer, sizeof statbuffer,
+ "X86_64 compatible processor: No");
}
- add_item(buffer,statbuffer,OPT_INACTIVE,NULL,0);
+ add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
menu->items_count++;
- buffer1[0]='\0';
- if (hardware->cpu.flags.fpu) strcat(buffer1,"fpu ");
- if (hardware->cpu.flags.vme) strcat(buffer1,"vme ");
- if (hardware->cpu.flags.de) strcat(buffer1,"de ");
- if (hardware->cpu.flags.pse) strcat(buffer1,"pse ");
- if (hardware->cpu.flags.tsc) strcat(buffer1,"tsc ");
- if (hardware->cpu.flags.msr) strcat(buffer1,"msr ");
- if (hardware->cpu.flags.pae) strcat(buffer1,"pae ");
- snprintf(buffer,sizeof buffer,"Flags : %s",buffer1);
- snprintf(statbuffer,sizeof statbuffer,"Flags: %s",buffer1);
- add_item(buffer,statbuffer,OPT_INACTIVE,NULL,0);
+ buffer1[0] = '\0';
+ if (hardware->cpu.flags.fpu)
+ strcat(buffer1, "fpu ");
+ if (hardware->cpu.flags.vme)
+ strcat(buffer1, "vme ");
+ if (hardware->cpu.flags.de)
+ strcat(buffer1, "de ");
+ if (hardware->cpu.flags.pse)
+ strcat(buffer1, "pse ");
+ if (hardware->cpu.flags.tsc)
+ strcat(buffer1, "tsc ");
+ if (hardware->cpu.flags.msr)
+ strcat(buffer1, "msr ");
+ if (hardware->cpu.flags.pae)
+ strcat(buffer1, "pae ");
+ snprintf(buffer, sizeof buffer, "Flags : %s", buffer1);
+ snprintf(statbuffer, sizeof statbuffer, "Flags: %s", buffer1);
+ add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
menu->items_count++;
- buffer1[0]='\0';
- if (hardware->cpu.flags.mce) strcat(buffer1,"mce ");
- if (hardware->cpu.flags.cx8) strcat(buffer1,"cx8 ");
- if (hardware->cpu.flags.apic) strcat(buffer1,"apic ");
- if (hardware->cpu.flags.sep) strcat(buffer1,"sep ");
- if (hardware->cpu.flags.mtrr) strcat(buffer1,"mtrr ");
- if (hardware->cpu.flags.pge) strcat(buffer1,"pge ");
- if (hardware->cpu.flags.mca) strcat(buffer1,"mca ");
- snprintf(buffer,sizeof buffer,"Flags : %s",buffer1);
- snprintf(statbuffer,sizeof statbuffer,"Flags: %s",buffer1);
- add_item(buffer,statbuffer,OPT_INACTIVE,NULL,0);
+ buffer1[0] = '\0';
+ if (hardware->cpu.flags.mce)
+ strcat(buffer1, "mce ");
+ if (hardware->cpu.flags.cx8)
+ strcat(buffer1, "cx8 ");
+ if (hardware->cpu.flags.apic)
+ strcat(buffer1, "apic ");
+ if (hardware->cpu.flags.sep)
+ strcat(buffer1, "sep ");
+ if (hardware->cpu.flags.mtrr)
+ strcat(buffer1, "mtrr ");
+ if (hardware->cpu.flags.pge)
+ strcat(buffer1, "pge ");
+ if (hardware->cpu.flags.mca)
+ strcat(buffer1, "mca ");
+ snprintf(buffer, sizeof buffer, "Flags : %s", buffer1);
+ snprintf(statbuffer, sizeof statbuffer, "Flags: %s", buffer1);
+ add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
menu->items_count++;
- buffer1[0]='\0';
- if (hardware->cpu.flags.cmov) strcat(buffer1,"cmov ");
- if (hardware->cpu.flags.pat) strcat(buffer1,"pat ");
- if (hardware->cpu.flags.pse_36) strcat(buffer1,"pse_36 ");
- if (hardware->cpu.flags.psn) strcat(buffer1,"psn ");
- if (hardware->cpu.flags.clflsh) strcat(buffer1,"clflsh ");
- snprintf(buffer,sizeof buffer,"Flags : %s",buffer1);
- snprintf(statbuffer,sizeof statbuffer,"Flags: %s",buffer1);
- add_item(buffer,statbuffer,OPT_INACTIVE,NULL,0);
+ buffer1[0] = '\0';
+ if (hardware->cpu.flags.cmov)
+ strcat(buffer1, "cmov ");
+ if (hardware->cpu.flags.pat)
+ strcat(buffer1, "pat ");
+ if (hardware->cpu.flags.pse_36)
+ strcat(buffer1, "pse_36 ");
+ if (hardware->cpu.flags.psn)
+ strcat(buffer1, "psn ");
+ if (hardware->cpu.flags.clflsh)
+ strcat(buffer1, "clflsh ");
+ snprintf(buffer, sizeof buffer, "Flags : %s", buffer1);
+ snprintf(statbuffer, sizeof statbuffer, "Flags: %s", buffer1);
+ add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
menu->items_count++;
- buffer1[0]='\0';
- if (hardware->cpu.flags.dts) strcat(buffer1,"dts ");
- if (hardware->cpu.flags.acpi) strcat(buffer1,"acpi ");
- if (hardware->cpu.flags.mmx) strcat(buffer1,"mmx ");
- if (hardware->cpu.flags.sse) strcat(buffer1,"sse ");
- snprintf(buffer,sizeof buffer,"Flags : %s",buffer1);
- snprintf(statbuffer,sizeof statbuffer,"Flags: %s",buffer1);
- add_item(buffer,statbuffer,OPT_INACTIVE,NULL,0);
+ buffer1[0] = '\0';
+ if (hardware->cpu.flags.dts)
+ strcat(buffer1, "dts ");
+ if (hardware->cpu.flags.acpi)
+ strcat(buffer1, "acpi ");
+ if (hardware->cpu.flags.mmx)
+ strcat(buffer1, "mmx ");
+ if (hardware->cpu.flags.sse)
+ strcat(buffer1, "sse ");
+ snprintf(buffer, sizeof buffer, "Flags : %s", buffer1);
+ snprintf(statbuffer, sizeof statbuffer, "Flags: %s", buffer1);
+ add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
menu->items_count++;
- buffer1[0]='\0';
- if (hardware->cpu.flags.sse2) strcat(buffer1,"sse2 ");
- if (hardware->cpu.flags.ss) strcat(buffer1,"ss ");
- if (hardware->cpu.flags.htt) strcat(buffer1,"ht ");
- if (hardware->cpu.flags.acc) strcat(buffer1,"acc ");
- if (hardware->cpu.flags.syscall) strcat(buffer1,"syscall ");
- if (hardware->cpu.flags.mp) strcat(buffer1,"mp ");
- snprintf(buffer,sizeof buffer,"Flags : %s",buffer1);
- snprintf(statbuffer,sizeof statbuffer,"Flags: %s",buffer1);
- add_item(buffer,statbuffer,OPT_INACTIVE,NULL,0);
+ buffer1[0] = '\0';
+ if (hardware->cpu.flags.sse2)
+ strcat(buffer1, "sse2 ");
+ if (hardware->cpu.flags.ss)
+ strcat(buffer1, "ss ");
+ if (hardware->cpu.flags.htt)
+ strcat(buffer1, "ht ");
+ if (hardware->cpu.flags.acc)
+ strcat(buffer1, "acc ");
+ if (hardware->cpu.flags.syscall)
+ strcat(buffer1, "syscall ");
+ if (hardware->cpu.flags.mp)
+ strcat(buffer1, "mp ");
+ snprintf(buffer, sizeof buffer, "Flags : %s", buffer1);
+ snprintf(statbuffer, sizeof statbuffer, "Flags: %s", buffer1);
+ add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
menu->items_count++;
- buffer1[0]='\0';
- if (hardware->cpu.flags.nx) strcat(buffer1,"nx ");
- if (hardware->cpu.flags.mmxext) strcat(buffer1,"mmxext ");
- if (hardware->cpu.flags.lm) strcat(buffer1,"lm ");
- if (hardware->cpu.flags.nowext) strcat(buffer1,"3dnowext ");
- if (hardware->cpu.flags.now) strcat(buffer1,"3dnow! ");
- snprintf(buffer,sizeof buffer,"Flags : %s",buffer1);
- snprintf(statbuffer,sizeof statbuffer,"Flags: %s",buffer1);
- add_item(buffer,statbuffer,OPT_INACTIVE,NULL,0);
+ buffer1[0] = '\0';
+ if (hardware->cpu.flags.nx)
+ strcat(buffer1, "nx ");
+ if (hardware->cpu.flags.mmxext)
+ strcat(buffer1, "mmxext ");
+ if (hardware->cpu.flags.lm)
+ strcat(buffer1, "lm ");
+ if (hardware->cpu.flags.nowext)
+ strcat(buffer1, "3dnowext ");
+ if (hardware->cpu.flags.now)
+ strcat(buffer1, "3dnow! ");
+ snprintf(buffer, sizeof buffer, "Flags : %s", buffer1);
+ snprintf(statbuffer, sizeof statbuffer, "Flags: %s", buffer1);
+ add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
menu->items_count++;
- printf("MENU: Processor menu done (%d items)\n",menu->items_count);
+ printf("MENU: Processor menu done (%d items)\n", menu->items_count);
}