Added about device window

src/main.c

@@ -15,9 +15,11 @@
 
 #define MAX_KEY_COUNT 10
 
-#define CBUTTON_EXIT        KEY_F(10)
+#define CBUTTON_EXIT            KEY_F(10)
-#define CBUTTON_SELECT_UP   KEY_UP
+#define CBUTTON_SELECT_UP       KEY_UP
-#define CBUTTON_SELECT_DOWN KEY_DOWN
+#define CBUTTON_SELECT_DOWN     KEY_DOWN
+#define CBUTTON_ABOUT_DEVICE    '/'
+#define CBUTTON_ESCAPE          27
 
 #define COLOR_PAIR_TEXT         1
 #define COLOR_PAIR_TEXT_INV     2
@@ -43,6 +45,8 @@ typedef struct device_t {
     uint8_t device;
     uint8_t function;
 
+    uint8_t pci_index;
+
     uint16_t vendor_id;
     uint16_t device_id;
     uint16_t command;
@@ -51,8 +55,19 @@ typedef struct device_t {
     uint8_t interface;
     uint8_t subclass;
     uint8_t class;
+
+    uint16_t ss_vendor_id;
+    uint16_t ss_device_id;
+
+    char *desc_vendor;
+    char *desc_device;
 } Device;
 
+typedef struct {
+    uint8_t wdevices:1;
+    uint8_t waboutd:1;
+} WindowFlags;
+
 
 void init(void);
 void quit(void);
@@ -60,24 +75,34 @@ void quit(void);
 void update(void);
 void draw(void);
 
-void draw_devices(void);
+void draw_wdevices(void);
+void draw_waboutd(void);
 void draw_device(Device *d, int y, int x);
 
 void fill_devices(void);
+uint8_t get_pci_index(const struct pci_dev_info *dev_info);
+char *get_vendor_description(struct pci_dev_info *dev_info);
+char *get_device_description(struct pci_dev_info *dev_info);
 int devices_between(Device *device_1, Device *device_2);
 int devices_before(Device *device);
 int devices_after(Device *device);
 
 void select_up(void);
 void select_down(void);
+void switch_waboutd(void);
+void hide_all_subwindows(void);
 
 
 
-Size main_windows_size = {0, 0};
+Size wdevice_size = {0, 0};
+Size waboutd_size = {0, 0};
 int use_color = 0;
 
 
 WINDOW *wdevices = NULL;
+WINDOW *waboutd = NULL;
+
+WindowFlags visible_windows;
 
 Device *first_device = NULL;
 Device *last_device = NULL;
@@ -91,6 +116,7 @@ int main(int argc, char *argv[])
 
     init();
 
+    refresh();
     while (1) {
         draw();
         update();
@@ -110,7 +136,7 @@ void init(void)
     keypad(stdscr, TRUE);
     noecho();
 
-    getmaxyx(stdscr, main_windows_size.height, main_windows_size.width);
+    hide_all_subwindows();
 
     use_color = has_colors() == TRUE;
 
@@ -120,11 +146,27 @@ void init(void)
         init_pair(COLOR_PAIR_TEXT_INV, COLOR_BLACK, COLOR_WHITE);
     }
 
-    wdevices = newwin(main_windows_size.height, main_windows_size.width, 0, 0);
+    getmaxyx(stdscr, wdevice_size.height, wdevice_size.width);
+    waboutd_size.height = min(wdevice_size.height, 15);
+    waboutd_size.width = min(wdevice_size.width, 60);
+
+    Point waboutd_pos;
+    waboutd_pos.y = (wdevice_size.height-waboutd_size.height)/2;
+    waboutd_pos.x = (wdevice_size.width-waboutd_size.width)/2;
+
+    wdevices = newwin(wdevice_size.height, wdevice_size.width, 0, 0);
+    waboutd = newwin(waboutd_size.height, waboutd_size.width,
+                waboutd_pos.y, waboutd_pos.x);
 }
 
 void update(void)
 {
+    static int is_first = 1;
+    if (is_first) {
+        is_first = 0;
+        return;
+    }
+
     switch (getch()) {
         case CBUTTON_EXIT:
             quit();
@@ -135,15 +177,26 @@ void update(void)
         case CBUTTON_SELECT_DOWN:
             select_down();
             break;
+        case CBUTTON_ABOUT_DEVICE:
+            switch_waboutd();
+            break;
+        case CBUTTON_ESCAPE:
+            hide_all_subwindows();
+            break;
     }
 }
 
 void draw(void)
 {
-    draw_devices();
+    if (visible_windows.wdevices) {
+        draw_wdevices();
+    }
+    if (visible_windows.waboutd) {
+        draw_waboutd();
+    }
 }
 
-void draw_devices(void)
+void draw_wdevices(void)
 {
     wclear(wdevices);
     box(wdevices, ACS_VLINE, ACS_HLINE);
@@ -151,20 +204,19 @@ void draw_devices(void)
     int x = 2;
     int y = 0;
 
-    mvwprintw(wdevices, y++, x, " b  d  f  vid  did comm stat re in sc  c");
+    mvwprintw(wdevices, y++, x, " b  d f  vid  did  cmd stat rv  c sc if  ssv  ssd");
-
 
     Device *first_device_for_printing = first_device;
     while (
         devices_between(first_device_for_printing, selected_device) >
-                                                    main_windows_size.height-6
+                                                    wdevice_size.height-6
     ) {
         first_device_for_printing = first_device_for_printing->next;
     }
 
     if (first_device_for_printing != first_device) {
         int xx;
-        for (xx = x; xx < main_windows_size.width-2; xx+=2) {
+        for (xx = x; xx < wdevice_size.width-2; xx+=2) {
             mvwprintw(wdevices, y, xx, "/\\");
         }
         y++;
@@ -175,10 +227,10 @@ void draw_devices(void)
         draw_device(d, y, x);
         y++;
 
-        if (y == main_windows_size.height-1) {
+        if (y == wdevice_size.height-1) {
             if (d != last_device) {
                 int xx;
-                for (xx = x; xx < main_windows_size.width-2; xx+=2) {
+                for (xx = x; xx < wdevice_size.width-2; xx+=2) {
                     mvwprintw(wdevices, y-1, xx, "\\/");
                 }
             }
@@ -186,12 +238,36 @@ void draw_devices(void)
         }
     }
 
-
+    mvwprintw(wdevices, wdevice_size.height-1, 2, "? - about");
 
     touchwin(wdevices);
     wrefresh(wdevices);
 }
 
+void draw_waboutd(void)
+{
+    wclear(waboutd);
+    box(waboutd, ACS_VLINE, ACS_HLINE);
+
+    int x = 2;
+    int y = 0;
+
+    mvwprintw(waboutd, y++, x, "%04X %04X %d",
+            selected_device->vendor_id,
+            selected_device->device_id,
+            selected_device->pci_index);
+
+    if (selected_device->desc_vendor) {
+        mvwprintw(waboutd, y++, x, "Vendor: %s", selected_device->desc_vendor);
+    }
+    if (selected_device->desc_device) {
+        mvwprintw(waboutd, y++, x, "Device: %s", selected_device->desc_device);
+    }
+
+    touchwin(waboutd);
+    wrefresh(waboutd);
+}
+
 void draw_device(Device *d, int y, int x)
 {
     if (use_color && d == selected_device) {
@@ -199,10 +275,12 @@ void draw_device(Device *d, int y, int x)
     }
 
     mvwprintw(wdevices, y, x,
-        "%2d %2d %2d %04X %04X %04X %04X %02X %02X %02X %02X",
+        "%2d %2d %d %04X %04X %04X %04X %02X %02X %02X %02X %04X %04X",
         d->bus, d->device, d->function, d->vendor_id, d->device_id,
         d->command, d->status, d->revision,
-        d->interface, d->subclass, d->class);
+        d->class, d->subclass, d->interface,
+        d->ss_vendor_id, d->ss_device_id
+    );
 
     if (use_color && d == selected_device) {
         wattroff(wdevices, COLOR_PAIR(COLOR_PAIR_TEXT_INV));
@@ -247,9 +325,7 @@ void fill_devices(void)
                     (*next_device)->device = dev;
                     (*next_device)->function = func;
 
-                    (*next_device)->vendor_id = 0x8086;
+                    (*next_device)->pci_index = get_pci_index(&dev_info);
-                    (*next_device)->device_id = 0xA000;
-
 
                     if (pci_read_config(
                         handleDevice, 0x00, 1, 2,&(*next_device)->vendor_id
@@ -307,8 +383,25 @@ void fill_devices(void)
                         exit(1);
                     }
 
+                    if (pci_read_config(
+                        handleDevice, 0x2C, 1, 2,&(*next_device)->ss_vendor_id
+                    ) != PCI_SUCCESS) {
+                        perror("Unable to get ss_vendor_id");
+                        exit(1);
+                    }
+
+                    if (pci_read_config(
+                        handleDevice, 0x2E, 1, 2, &(*next_device)->ss_device_id
+                    ) != PCI_SUCCESS) {
+                        perror("Unable to get ss_device_id");
+                        exit(1);
+                    }
+
                     pci_detach_device(handleDevice);
 
+                    (*next_device)->desc_vendor = get_vendor_description(&dev_info);
+                    (*next_device)->desc_device = get_device_description(&dev_info);
+
                     previous_device = *next_device;
                     last_device = previous_device;
                     next_device = &(*next_device)->next;
@@ -320,6 +413,49 @@ void fill_devices(void)
     selected_device = first_device;
 }
 
+char *get_vendor_description(struct pci_dev_info *dev_info)
+{
+    int i;
+    for (i = 0; i < PCI_VENTABLE_LEN; i++) {
+        if (PciVenTable[i].VenId == dev_info->VendorId) {
+            return PciVenTable[i].VenFull;
+        }
+    }
+    return NULL;
+}
+
+char *get_device_description(struct pci_dev_info *dev_info)
+{
+    int i;
+    for (i = 0; i < PCI_DEVTABLE_LEN; i++) {
+        if (PciDevTable[i].VenId == dev_info->VendorId &&
+            PciDevTable[i].DevId == dev_info->DeviceId) {
+            return PciDevTable[i].ChipDesc;
+        }
+    }
+    return NULL;
+}
+
+uint8_t get_pci_index(const struct pci_dev_info *dev_info)
+{
+    unsigned int bus;
+    unsigned int dev_func;
+
+    uint8_t i;
+    for (i = 0; i < 0xFF; i++) {
+        if (pci_find_device(
+            dev_info->DeviceId, dev_info->VendorId, i, &bus, &dev_func
+        ) != PCI_SUCCESS) {
+            break;
+        }
+        if (bus == dev_info->BusNumber && dev_func == dev_info->DevFunc) {
+            return i;
+        }
+    }
+
+    return 0xFF;
+}
+
 void select_up(void)
 {
 
@@ -335,6 +471,17 @@ void select_down(void)
     }
 }
 
+void switch_waboutd(void)
+{
+    visible_windows.waboutd = !visible_windows.waboutd;
+}
+
+void hide_all_subwindows(void)
+{
+    memset(&visible_windows, 0, sizeof(visible_windows));
+    visible_windows.wdevices = 1;
+}
+
 int devices_between(Device *device_1, Device *device_2)
 {
     if (device_1 == NULL || device_2 == NULL || device_1 == device_2) {