--- np2/generic/np2info.c 2004/03/23 18:34:04 1.5 +++ np2/generic/np2info.c 2004/06/04 16:11:03 1.7 @@ -4,7 +4,6 @@ #include "cpucore.h" #include "pccore.h" #include "iocore.h" -#include "bios.h" #include "sound.h" #include "fmboard.h" #include "np2info.h" @@ -68,6 +67,7 @@ static const char str_memfmt[] = "%3uKB" static const char str_memfmt2[] = "%3uKB + %uKB"; static const char str_memfmt3[] = "%d.%1dMB"; static const char str_width[] = "width-%u"; +static const char str_dispclock[] = "%u.%.2ukHz / %u.%uHz"; static const char str_pcm86a[] = " PCM: %dHz %dbit %s"; static const char str_pcm86b[] = " %d / %d / 32768"; @@ -182,6 +182,17 @@ static void info_gdc(char *str, int maxl (void)ex; } +static void info_gdc2(char *str, int maxlen, NP2INFOEX *ex) { + + char textstr[32]; + + SPRINTF(textstr, str_dispclock, + gdc.hclock / 1000, (gdc.hclock / 10) % 100, + gdc.vclock / 10, gdc.vclock % 10); + milstr_ncpy(str, textstr, maxlen); + (void)ex; +} + static void info_text(char *str, int maxlen, NP2INFOEX *ex) { const char *p; @@ -294,7 +305,7 @@ static void info_extsnd(char *str, int m static void info_bios(char *str, int maxlen, NP2INFOEX *ex) { str[0] = '\0'; - if (biosrom) { + if (pccore.rom & PCROM_BIOS) { milstr_ncat(str, str_biosrom, maxlen); } if (soundrom.name[0]) { @@ -354,6 +365,7 @@ static const INFOPROC infoproc[] = { {"MEM2", info_mem2}, {"MEM3", info_mem3}, {"GDC", info_gdc}, + {"GDC2", info_gdc2}, {"TEXT", info_text}, {"GRPH", info_grph}, {"SND", info_sound},