hdt: Adding PCI & DMI detection Main function must remain simple

diff --git a/sample/Makefile b/sample/Makefile
index d1147e0..e6a1a92 100644 (file)
--- a/sample/Makefile
+++ b/sample/Makefile
@@ -45,9 +45,9 @@ all: syslogo.lss comecho.com hello.c32 hello2.c32 filetest.c32 c32echo.c32 \
        $(LD) -Ttext 0x101000 -e _start -o $@ $^
 
 hdt.o: hdt.c
-       $(CC) $(CFLAGS) -I$(topdir)/menu/libmenu/ -c -o $@ $<
+       $(CC) $(CFLAGS) -std=gnu99  -D__COM32__ -I$(topdir)/menu/libmenu/ -c -o $@ $<
 
-hdt.elf: hdt.o $(com32)/modules/cpuid.o $(topdir)/menu/libmenu/libmenu.a $(LIB) $(C_LIBS)
+hdt.elf: hdt.o $(com32)/modules/cpuid.o $(com32)/modules/dmi.o $(topdir)/menu/libmenu/libmenu.a $(LIB) $(C_LIBS)
        $(LD) $(LDFLAGS) -o $@ $^
 
 %.c32: %.elf

diff --git a/sample/hdt.c b/sample/hdt.c
index 4875c60..2c65431 100644 (file)
--- a/sample/hdt.c
+++ b/sample/hdt.c
@@ -40,8 +40,8 @@
 #include "help.h"
 #include "passwords.h"
 #include "cpuid.h"
-
-unsigned char MAIN_MENU, CPU_MENU;
+#include "dmi/dmi.h"
+#include "sys/pci.h"
 
 #define INFLINE 22
 #define PWDLINE 3
@@ -50,6 +50,9 @@ unsigned char MAIN_MENU, CPU_MENU;
 #define PWDATTR 0x74
 #define EDITPROMPT 21
 
+unsigned char MAIN_MENU, CPU_MENU, MOBO_MENU, CHASSIS_MENU, BIOS_MENU, SYSTEM_MENU, PCI_MENU;
+unsigned char PCIBYPRODUCT_MENU, PCIBYBUS_MENU;
+
 TIMEOUTCODE ontimeout()
 {
          beep();
@@ -77,114 +80,267 @@ void keys_handler(t_menusystem *ms, t_menuitem *mi,unsigned int scancode)
    }
 }
 
-void compute_processor(unsigned char *menu) {
-  s_cpu cpu;
+int detect_dmi(s_dmi *dmi) {
+  if ( ! dmi_iterate() ) {
+             printf("No DMI Structure found\n");
+             return -1;
+  }
+
+  parse_dmitable(dmi);
+ return 0;
+}
+
+void compute_PCI(unsigned char *menu,struct pci_domain **pci_domain) {
+  char buffer[MENULEN];
+  char infobar[MENULEN];
+  *menu = add_menu(" PCI Devices ",-1);
+
+  struct pci_device *pci_device;
+  for_each_pci_func(pci_device, *pci_domain) {
+        snprintf(buffer,MENULEN,"%s : %s\n",
+               pci_device->dev_info->vendor_name,
+               pci_device->dev_info->product_name);
+        snprintf(infobar, MENULEN,"BUS:[%02x:%02x.%01x] PCI-ID:%04x:%04x[%04x:%04x] Kernel Module:%s\n",
+               __pci_bus, __pci_slot, __pci_func,
+               pci_device->vendor, pci_device->product,
+               pci_device->sub_vendor, pci_device->sub_product,pci_device->dev_info->linux_kernel_module);
+       add_item(buffer,infobar,OPT_INACTIVE,NULL,0);
+  }
+}
+
+void compute_motherboard(unsigned char *menu,s_dmi *dmi) {
+  char buffer[MENULEN];
+  *menu = add_menu(" Motherboard ",-1);
+  snprintf(buffer,MENULEN,"Vendor    : %s",dmi->base_board.manufacturer);
+  add_item(buffer,"Vendor",OPT_INACTIVE,NULL,0);
+  snprintf(buffer,MENULEN,"Product   : %s",dmi->base_board.product_name);
+  add_item(buffer,"Product Name",OPT_INACTIVE,NULL,0);
+  snprintf(buffer,MENULEN,"Version   : %s",dmi->base_board.version);
+  add_item(buffer,"Version",OPT_INACTIVE,NULL,0);
+  snprintf(buffer,MENULEN,"Serial    : %s",dmi->base_board.serial);
+  add_item(buffer,"Serial Number",OPT_INACTIVE,NULL,0);
+  snprintf(buffer,MENULEN,"Asset Tag : %s",dmi->base_board.asset_tag);
+  add_item(buffer,"Asset Tag",OPT_INACTIVE,NULL,0);
+  snprintf(buffer,MENULEN,"Location  : %s",dmi->base_board.location);
+  add_item(buffer,"Location",OPT_INACTIVE,NULL,0);
+  snprintf(buffer,MENULEN,"Type      : %s",dmi->base_board.type);
+  add_item(buffer,"Type",OPT_INACTIVE,NULL,0);
+}
+
+void compute_system(unsigned char *menu,s_dmi *dmi) {
+  char buffer[MENULEN];
+  *menu = add_menu(" System ",-1);
+  snprintf(buffer,MENULEN,"Vendor    : %s",dmi->system.manufacturer);
+  add_item(buffer,"Vendor",OPT_INACTIVE,NULL,0);
+  snprintf(buffer,MENULEN,"Product   : %s",dmi->system.product_name);
+  add_item(buffer,"Product Name",OPT_INACTIVE,NULL,0);
+  snprintf(buffer,MENULEN,"Version   : %s",dmi->system.version);
+  add_item(buffer,"Version",OPT_INACTIVE,NULL,0);
+  snprintf(buffer,MENULEN,"Serial    : %s",dmi->system.serial);
+  add_item(buffer,"Serial Number",OPT_INACTIVE,NULL,0);
+  snprintf(buffer,MENULEN,"UUID      : %s",dmi->system.uuid);
+  add_item(buffer,"UUID",OPT_INACTIVE,NULL,0);
+  snprintf(buffer,MENULEN,"Wakeup    : %s",dmi->system.wakeup_type);
+  add_item(buffer,"Wakeup Type",OPT_INACTIVE,NULL,0);
+  snprintf(buffer,MENULEN,"SKU Number: %s",dmi->system.sku_number);
+  add_item(buffer,"SKU Number",OPT_INACTIVE,NULL,0);
+  snprintf(buffer,MENULEN,"Family    : %s",dmi->system.family);
+  add_item(buffer,"Family",OPT_INACTIVE,NULL,0);
+}
+
+void compute_chassis(unsigned char *menu,s_dmi *dmi) {
+  char buffer[MENULEN];
+  *menu = add_menu(" Chassis ",-1);
+  snprintf(buffer,MENULEN,"Vendor    : %s",dmi->chassis.manufacturer);
+  add_item(buffer,"Vendor",OPT_INACTIVE,NULL,0);
+  snprintf(buffer,MENULEN,"Type      : %s",dmi->chassis.type);
+  add_item(buffer,"Type",OPT_INACTIVE,NULL,0);
+  snprintf(buffer,MENULEN,"Version   : %s",dmi->chassis.version);
+  add_item(buffer,"Version",OPT_INACTIVE,NULL,0);
+  snprintf(buffer,MENULEN,"Serial    : %s",dmi->chassis.serial);
+  add_item(buffer,"Serial Number",OPT_INACTIVE,NULL,0);
+  snprintf(buffer,MENULEN,"Asset Tag : %s",dmi->chassis.asset_tag);
+  add_item(buffer,"Asset Tag",OPT_INACTIVE,NULL,0);
+  snprintf(buffer,MENULEN,"Lock      : %s",dmi->chassis.lock);
+  add_item(buffer,"Lock",OPT_INACTIVE,NULL,0);
+}
+
+void compute_bios(unsigned char *menu,s_dmi *dmi) {
+  char buffer[MENULEN];
+  *menu = add_menu(" BIOS ",-1);
+  snprintf(buffer,MENULEN,"Vendor    : %s",dmi->bios.vendor);
+  add_item(buffer,"Vendor",OPT_INACTIVE,NULL,0);
+  snprintf(buffer,MENULEN,"Version   : %s",dmi->bios.version);
+  add_item(buffer,"Version",OPT_INACTIVE,NULL,0);
+  snprintf(buffer,MENULEN,"Release   : %s",dmi->bios.release_date);
+  add_item(buffer,"Release Date",OPT_INACTIVE,NULL,0);
+  snprintf(buffer,MENULEN,"Bios Rev. : %s",dmi->bios.bios_revision);
+  add_item(buffer,"Bios Revision",OPT_INACTIVE,NULL,0);
+  snprintf(buffer,MENULEN,"Fw.  Rev. : %s",dmi->bios.firmware_revision);
+  add_item(buffer,"Firmware Revision",OPT_INACTIVE,NULL,0);
+}
+
+void compute_processor(unsigned char *menu,s_cpu *cpu, s_dmi *dmi) {
   char buffer[MENULEN];
   char buffer1[MENULEN];
-  printf("Detecting CPU\n");
-  detect_cpu(&cpu);
   *menu = add_menu(" Main Processor ",-1);
-  snprintf(buffer,MENULEN,"Vendor    : %s",cpu.vendor);
+  snprintf(buffer,MENULEN,"Vendor    : %s",cpu->vendor);
   add_item(buffer,"Vendor",OPT_INACTIVE,NULL,0);
-  snprintf(buffer,MENULEN,"Model     : %s",cpu.model);
+  snprintf(buffer,MENULEN,"Model     : %s",cpu->model);
   add_item(buffer,"Model",OPT_INACTIVE,NULL,0);
-  snprintf(buffer,MENULEN,"Vendor ID : %d",cpu.vendor_id);
+  snprintf(buffer,MENULEN,"Vendor ID : %d",cpu->vendor_id);
   add_item(buffer,"Vendor ID",OPT_INACTIVE,NULL,0);
-  snprintf(buffer,MENULEN,"Family ID : %d",cpu.family);
+  snprintf(buffer,MENULEN,"Family ID : %d",cpu->family);
   add_item(buffer,"Family ID",OPT_INACTIVE,NULL,0);
-  snprintf(buffer,MENULEN,"Model  ID : %d",cpu.model_id);
+  snprintf(buffer,MENULEN,"Model  ID : %d",cpu->model_id);
   add_item(buffer,"Model ID",OPT_INACTIVE,NULL,0);
-  snprintf(buffer,MENULEN,"Stepping  : %d",cpu.stepping);
+  snprintf(buffer,MENULEN,"Stepping  : %d",cpu->stepping);
   add_item(buffer,"Stepping",OPT_INACTIVE,NULL,0);
+  snprintf(buffer,MENULEN,"FSB       : %d",dmi->processor.external_clock);
+  add_item(buffer,"Front Side Bus (MHz)",OPT_INACTIVE,NULL,0);
+  snprintf(buffer,MENULEN,"Cur. Speed: %d",dmi->processor.current_speed);
+  add_item(buffer,"Current Speed (MHz)",OPT_INACTIVE,NULL,0);
+  snprintf(buffer,MENULEN,"Max Speed : %d",dmi->processor.max_speed);
+  add_item(buffer,"Max Speed (MHz)",OPT_INACTIVE,NULL,0);
+  snprintf(buffer,MENULEN,"Upgrade   : %s",dmi->processor.upgrade);
+  add_item(buffer,"Upgrade",OPT_INACTIVE,NULL,0);
 
-  if (cpu.flags.smp)  snprintf(buffer,MENULEN,"SMP       : Yes");
+  if (cpu->flags.smp)  snprintf(buffer,MENULEN,"SMP       : Yes");
   else snprintf(buffer,MENULEN,"SMP       : No");
   add_item(buffer,"SMP system",OPT_INACTIVE,NULL,0);
 
-  if (cpu.flags.lm)  snprintf(buffer,MENULEN,"x86_64    : Yes");
+  if (cpu->flags.lm)  snprintf(buffer,MENULEN,"x86_64    : Yes");
   else snprintf(buffer,MENULEN,"X86_64     : No");
   add_item(buffer,"x86_64 compatible processor",OPT_INACTIVE,NULL,0);
 
   buffer1[0]='\0';
-  if (cpu.flags.fpu) strcat(buffer1,"fpu ");
-  if (cpu.flags.vme) strcat(buffer1,"vme ");
-  if (cpu.flags.de)  strcat(buffer1,"de ");
-  if (cpu.flags.pse) strcat(buffer1,"pse ");
-  if (cpu.flags.tsc) strcat(buffer1,"tsc ");
-  if (cpu.flags.msr) strcat(buffer1,"msr ");
-  if (cpu.flags.pae) strcat(buffer1,"pae ");
+  if (cpu->flags.fpu) strcat(buffer1,"fpu ");
+  if (cpu->flags.vme) strcat(buffer1,"vme ");
+  if (cpu->flags.de)  strcat(buffer1,"de ");
+  if (cpu->flags.pse) strcat(buffer1,"pse ");
+  if (cpu->flags.tsc) strcat(buffer1,"tsc ");
+  if (cpu->flags.msr) strcat(buffer1,"msr ");
+  if (cpu->flags.pae) strcat(buffer1,"pae ");
   snprintf(buffer,MENULEN,"Flags     : %s",buffer1);
   add_item(buffer,"Flags",OPT_INACTIVE,NULL,0);
 
   buffer1[0]='\0';
-  if (cpu.flags.mce) strcat(buffer1,"mce ");
-  if (cpu.flags.cx8) strcat(buffer1,"cx8 ");
-  if (cpu.flags.apic) strcat(buffer1,"apic ");
-  if (cpu.flags.sep) strcat(buffer1,"sep ");
-  if (cpu.flags.mtrr) strcat(buffer1,"mtrr ");
-  if (cpu.flags.pge) strcat(buffer1,"pge ");
-  if (cpu.flags.mca) strcat(buffer1,"mca ");
+  if (cpu->flags.mce) strcat(buffer1,"mce ");
+  if (cpu->flags.cx8) strcat(buffer1,"cx8 ");
+  if (cpu->flags.apic) strcat(buffer1,"apic ");
+  if (cpu->flags.sep) strcat(buffer1,"sep ");
+  if (cpu->flags.mtrr) strcat(buffer1,"mtrr ");
+  if (cpu->flags.pge) strcat(buffer1,"pge ");
+  if (cpu->flags.mca) strcat(buffer1,"mca ");
   snprintf(buffer,MENULEN,"Flags     : %s",buffer1);
   add_item(buffer,"Flags",OPT_INACTIVE,NULL,0);
 
   buffer1[0]='\0';
-  if (cpu.flags.cmov) strcat(buffer1,"cmov ");
-  if (cpu.flags.pat)  strcat(buffer1,"pat ");
-  if (cpu.flags.pse_36) strcat(buffer1,"pse_36 ");
-  if (cpu.flags.psn)  strcat(buffer1,"psn ");
-  if (cpu.flags.clflsh) strcat(buffer1,"clflsh ");
+  if (cpu->flags.cmov) strcat(buffer1,"cmov ");
+  if (cpu->flags.pat)  strcat(buffer1,"pat ");
+  if (cpu->flags.pse_36) strcat(buffer1,"pse_36 ");
+  if (cpu->flags.psn)  strcat(buffer1,"psn ");
+  if (cpu->flags.clflsh) strcat(buffer1,"clflsh ");
   snprintf(buffer,MENULEN,"Flags     : %s",buffer1);
   add_item(buffer,"Flags",OPT_INACTIVE,NULL,0);
 
   buffer1[0]='\0';
-  if (cpu.flags.dts)  strcat(buffer1,"dts ");
-  if (cpu.flags.acpi) strcat(buffer1,"acpi ");
-  if (cpu.flags.mmx)  strcat(buffer1,"mmx ");
-  if (cpu.flags.sse)  strcat(buffer1,"sse ");
+  if (cpu->flags.dts)  strcat(buffer1,"dts ");
+  if (cpu->flags.acpi) strcat(buffer1,"acpi ");
+  if (cpu->flags.mmx)  strcat(buffer1,"mmx ");
+  if (cpu->flags.sse)  strcat(buffer1,"sse ");
   snprintf(buffer,MENULEN,"Flags     : %s",buffer1);
   add_item(buffer,"Flags",OPT_INACTIVE,NULL,0);
 
   buffer1[0]='\0';
-  if (cpu.flags.sse2) strcat(buffer1,"sse2 ");
-  if (cpu.flags.ss)   strcat(buffer1,"ss ");
-  if (cpu.flags.htt)  strcat(buffer1,"ht ");
-  if (cpu.flags.acc)  strcat(buffer1,"acc ");
-  if (cpu.flags.syscall) strcat(buffer1,"syscall ");
-  if (cpu.flags.mp)   strcat(buffer1,"mp ");
+  if (cpu->flags.sse2) strcat(buffer1,"sse2 ");
+  if (cpu->flags.ss)   strcat(buffer1,"ss ");
+  if (cpu->flags.htt)  strcat(buffer1,"ht ");
+  if (cpu->flags.acc)  strcat(buffer1,"acc ");
+  if (cpu->flags.syscall) strcat(buffer1,"syscall ");
+  if (cpu->flags.mp)   strcat(buffer1,"mp ");
   snprintf(buffer,MENULEN,"Flags     : %s",buffer1);
   add_item(buffer,"Flags",OPT_INACTIVE,NULL,0);
 
   buffer1[0]='\0';
-  if (cpu.flags.nx)    strcat(buffer1,"nx ");
-  if (cpu.flags.mmxext) strcat(buffer1,"mmxext ");
-  if (cpu.flags.lm)     strcat(buffer1,"lm ");
-  if (cpu.flags.nowext) strcat(buffer1,"3dnowext ");
-  if (cpu.flags.now)    strcat(buffer1,"3dnow! ");
+  if (cpu->flags.nx)    strcat(buffer1,"nx ");
+  if (cpu->flags.mmxext) strcat(buffer1,"mmxext ");
+  if (cpu->flags.lm)     strcat(buffer1,"lm ");
+  if (cpu->flags.nowext) strcat(buffer1,"3dnowext ");
+  if (cpu->flags.now)    strcat(buffer1,"3dnow! ");
   snprintf(buffer,MENULEN,"Flags     : %s",buffer1);
   add_item(buffer,"Flags",OPT_INACTIVE,NULL,0);
 
 }
 
-int main(void)
-{
+void setup_env() {
   openconsole(&dev_stdcon_r, &dev_stdcon_w);
-  t_menuitem * *prepopt;
-
   init_menusystem(NULL);
   set_window_size(1,1,23,78); // Leave some space around
 
  // Register the menusystem handler
-//  reg_handler(HDLR_SCREEN,&msys_handler);
+ // reg_handler(HDLR_SCREEN,&msys_handler);
   reg_handler(HDLR_KEYS,&keys_handler);
 
   // Register the ontimeout handler, with a time out of 10 seconds
   reg_ontimeout(ontimeout,1000,0);
+}
+
+void detect_hardware(s_dmi *dmi, s_cpu *cpu, struct pci_domain **pci_domain) {
+  printf("CPU: Detecting\n");
+  detect_cpu(cpu);
+
+  printf("DMI: Detecting Table\n");
+  detect_dmi(dmi);
+
+  printf("PCI: Detecting Devices\n");
+  /* Scanning to detect pci buses and devices */
+  *pci_domain = pci_scan();
+
+  printf("PCI: Resolving names\n");
+  /* Assigning product & vendor name for each device*/
+  get_name_from_pci_ids(*pci_domain);
+
+  printf("PCI: Resolving module names\n");
+  /* Detecting which kernel module should match each device */
+  get_module_name_from_pci_ids(*pci_domain);
+}
 
-  compute_processor(&CPU_MENU);
+void compute_submenus(s_dmi *dmi, s_cpu *cpu, struct pci_domain *pci_domain) {
+  compute_motherboard(&MOBO_MENU,dmi);
+  compute_chassis(&CHASSIS_MENU,dmi);
+  compute_bios(&BIOS_MENU,dmi);
+  compute_processor(&CPU_MENU,cpu,dmi);
+  compute_system(&SYSTEM_MENU,dmi);
+  compute_PCI(&PCI_MENU,pci_domain);
+}
+
+void compute_main_menu() {
   MAIN_MENU = add_menu(" Main Menu ",8);
   set_item_options(-1,24);
   add_item("<P>rocessor","Main Processor",OPT_SUBMENU,NULL,CPU_MENU);
+  add_item("<M>otherboard","Motherboard",OPT_SUBMENU,NULL,MOBO_MENU);
+  add_item("<B>ios","Bios",OPT_SUBMENU,NULL,BIOS_MENU);
+  add_item("<C>hassis","Chassis",OPT_SUBMENU,NULL,CHASSIS_MENU);
+  add_item("<S>ystem","System",OPT_SUBMENU,NULL,SYSTEM_MENU);
+  add_item("PCI <D>evices","PCI Devices",OPT_SUBMENU,NULL,PCI_MENU);
+}
+
+int main(void)
+{
+  s_dmi dmi;
+  s_cpu cpu;
+  struct pci_domain *pci_domain=NULL;
+
+  setup_env();
+
+  detect_hardware(&dmi,&cpu,&pci_domain);
+
+  compute_submenus(&dmi,&cpu,&pci_domain);
+
+  compute_main_menu();
 
+  printf("Starting Menu\n");
   showmenus(MAIN_MENU);
 
   return 0;