--- np2/generic/np2info.c	2004/02/18 02:03:36	1.1
+++ np2/generic/np2info.c	2004/02/19 11:32:12	1.3
@@ -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)
@@ -79,8 +77,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 +269,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] = '_';
 		}
 	}