--- np2/generic/np2info.c	2004/02/18 02:03:36	1.1
+++ np2/generic/np2info.c	2004/03/19 00:30:01	1.4
@@ -10,8 +10,6 @@
 #include	"np2info.h"
 
 
-extern	RHYTHMCFG	rhythmcfg;
-
 static const char str_comma[] = ", ";
 static const char str_2halfMHz[] = "2.5MHz";
 #define str_5MHz	(str_2halfMHz + 2)
@@ -20,21 +18,37 @@ static const char str_notexist[] = "not 
 static const char str_disable[] = "disable";
 
 static const char str_winclr[] =
-						"256-colors\065536-colors\0full color\0true color";
+						"256-colors\0"				\
+						"65536-colors\0"			\
+						"full color\0"				\
+						"true color";
 static const char str_winmode[] =
-						" (window)\0 (fullscreen)";
+						" (window)\0"				\
+						" (fullscreen)";
 static const char str_grcgchip[] =
-						"\0GRCG \0GRCG CG-Window \0EGC CG-Window ";
+						"\0"						\
+						"GRCG \0"					\
+						"GRCG CG-Window \0"			\
+						"EGC CG-Window ";
 static const char str_clrmode[] =
-						"(Digital)\0(Analog)";
+						"(Digital)\0"				\
+						"(Analog)";
 static const char str_chpan[] =
-						"none\0Mono-R\0Mono-L\0Stereo";
-
+						"none\0"					\
+						"Mono-R\0"					\
+						"Mono-L\0"					\
+						"Stereo";
 static const char str_fmboard[] =
-						"none\0PC-9801-14\0PC-9801-26\0PC-9801-86\0"	\
-						"PC-9801-26 + 86\0PC-9801-118\0"				\
-						"PC-9801-86 + Chibi-oto\0"						\
-						"Speak board\0Spark board\0AMD-98";
+						"none\0"					\
+						"PC-9801-14\0"				\
+						"PC-9801-26\0"				\
+						"PC-9801-86\0"				\
+						"PC-9801-26 + 86\0"			\
+						"PC-9801-118\0"				\
+						"PC-9801-86 + Chibi-oto\0"	\
+						"Speak board\0"				\
+						"Spark board\0"				\
+						"AMD-98";
 
 
 static const char str_V30[] = "V30";
@@ -79,8 +93,8 @@ static void info_clock(char *str, int ma
 
 static void info_base(char *str, int maxlen, NP2INFOEX *ex) {
 
-	milstr_ncpy(str, (pccore.baseclock == PCBASECLOCK25)?str_5MHz:str_8MHz,
-																	maxlen);
+	milstr_ncpy(str,
+				(pccore.cpumode & CPUMODE_8MHZ)?str_8MHz:str_5MHz, maxlen);
 	(void)ex;
 }
 
@@ -271,11 +285,13 @@ static void info_bios(char *str, int max
 static void info_rhythm(char *str, int maxlen, NP2INFOEX *ex) {
 
 	char	rhythmstr[8];
+	UINT	exist;
 	UINT	i;
 
+	exist = rhythm_getcaps();
 	milstr_ncpy(rhythmstr, str_rhythm, sizeof(rhythmstr));
 	for (i=0; i<6; i++) {
-		if (rhythmcfg.pcm[i].data == NULL) {
+		if (!(exist & (1 << i))) {
 			rhythmstr[i] = '_';
 		}
 	}