# HG changeset patch # User John Tsiombikas # Date 1501092301 -10800 # Node ID d2d777a5da95a875be9819edb5d5998a80bd7954 # Parent 4b33fa83e3815ca8d94ec56c9ad95f86faadef9f fixed wrong memory size report diff -r 4b33fa83e381 -r d2d777a5da95 src/main.c --- a/src/main.c Sat Dec 05 07:28:47 2015 +0200 +++ b/src/main.c Wed Jul 26 21:05:01 2017 +0300 @@ -21,15 +21,26 @@ struct vbe_mode_info *mode; uint16_t *modes; struct video_mode *vmodes; + char *vendor, *product, *prod_rev; if(!(vbe = vbe_get_info())) { fprintf(stderr, "VBE not found\n"); return 1; } + + if(!(vendor = VBEPTR(vbe->oem_vendor_name_ptr)) || !*vendor) { + vendor = "unknown"; + } + if(!(product = VBEPTR(vbe->oem_product_name_ptr)) || !*product) { + product = "unknown"; + } + if(!(prod_rev = VBEPTR(vbe->oem_product_rev_ptr)) || !*prod_rev) { + prod_rev = "unknown"; + } + printf("VBE version: %x.%x\n", vbe->version >> 8, vbe->version & 0xff); - printf("Graphics adapter: %s, %s (%s)\n", VBEPTR(vbe->oem_vendor_name_ptr), - VBEPTR(vbe->oem_product_name_ptr), VBEPTR(vbe->oem_product_rev_ptr)); - printf("Video memory: %dmb\n", vbe->total_mem << 6); + printf("Graphics adapter: %s, %s (%s)\n", vendor, product, prod_rev); + printf("Video memory: %dkb\n", vbe->total_mem << 6); modes = VBEPTR(vbe->vid_mode_ptr); nmodes = 0;