--- np2/wince/sysmenu.cpp	2003/11/21 12:59:18	1.2
+++ np2/wince/sysmenu.cpp	2005/03/24 04:40:33	1.9
@@ -13,6 +13,7 @@
 #include	"sound.h"
 #include	"beep.h"
 #include	"diskdrv.h"
+#include	"keystat.h"
 #include	"vramhdl.h"
 #include	"menubase.h"
 #include	"menustr.h"
@@ -37,8 +38,7 @@ static void sys_cmd(MENUID id) {
 			break;
 
 		case MID_CONFIG:
-			menudlg_create(DLGCFG_WIDTH, DLGCFG_HEIGHT,
-											(char *)mstr_cfg, dlgcfg_cmd);
+			menudlg_create(DLGCFG_WIDTH, DLGCFG_HEIGHT, mstr_cfg, dlgcfg_cmd);
 			break;
 
 		case MID_FDD1OPEN:
@@ -58,21 +58,53 @@ static void sys_cmd(MENUID id) {
 			break;
 
 		case MID_SASI1OPEN:
-			filesel_sasi(0);
+			filesel_hdd(0x00);
 			break;
 
 		case MID_SASI1EJECT:
-			diskdrv_sethdd(0, NULL);
+			diskdrv_sethdd(0x00, NULL);
 			break;
 
 		case MID_SASI2OPEN:
-			filesel_sasi(1);
+			filesel_hdd(0x01);
 			break;
 
 		case MID_SASI2EJECT:
-			diskdrv_sethdd(1, NULL);
+			diskdrv_sethdd(0x01, NULL);
+			break;
+#if defined(SUPPORT_SCSI)
+		case MID_SCSI0OPEN:
+			filesel_hdd(0x20);
+			break;
+
+		case MID_SCSI0EJECT:
+			diskdrv_sethdd(0x20, NULL);
+			break;
+
+		case MID_SCSI1OPEN:
+			filesel_hdd(0x21);
+			break;
+
+		case MID_SCSI1EJECT:
+			diskdrv_sethdd(0x21, NULL);
+			break;
+
+		case MID_SCSI2OPEN:
+			filesel_hdd(0x22);
+			break;
+
+		case MID_SCSI2EJECT:
+			diskdrv_sethdd(0x22, NULL);
+			break;
+
+		case MID_SCSI3OPEN:
+			filesel_hdd(0x23);
 			break;
 
+		case MID_SCSI3EJECT:
+			diskdrv_sethdd(0x23, NULL);
+			break;
+#endif
 		case MID_DISPSYNC:
 			np2cfg.DISPSYNC ^= 1;
 			update |= SYS_UPDATECFG;
@@ -115,9 +147,47 @@ static void sys_cmd(MENUID id) {
 
 		case MID_SCREENOPT:
 			menudlg_create(DLGSCR_WIDTH, DLGSCR_HEIGHT,
-											(char *)mstr_scropt, dlgscr_cmd);
+													mstr_scropt, dlgscr_cmd);
+			break;
+
+#if defined(WIN32_PLATFORM_PSPC)
+		case MID_CURDEF:
+			winkbd_bindcur(0);
+			np2oscfg.bindcur = 0;
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case MID_CUR1:
+			winkbd_bindcur(1);
+			np2oscfg.bindcur = 1;
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case MID_CUR2:
+			winkbd_bindcur(2);
+			np2oscfg.bindcur = 2;
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case MID_BTNDEF:
+			winkbd_bindbtn(0);
+			np2oscfg.bindbtn = 0;
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case MID_BTN1:
+			winkbd_bindbtn(1);
+			np2oscfg.bindbtn = 1;
+			update |= SYS_UPDATEOSCFG;
 			break;
 
+		case MID_BTN2:
+			winkbd_bindbtn(2);
+			np2oscfg.bindbtn = 2;
+			update |= SYS_UPDATEOSCFG;
+			break;
+#endif
+
 		case MID_KEY:
 			np2cfg.KEY_MODE = 0;
 			keystat_resetjoykey();
@@ -136,6 +206,12 @@ static void sys_cmd(MENUID id) {
 			update |= SYS_UPDATECFG;
 			break;
 
+		case MID_MOUSEKEY:
+			np2cfg.KEY_MODE = 3;
+			keystat_resetjoykey();
+			update |= SYS_UPDATECFG;
+			break;
+
 		case MID_XSHIFT:
 			np2cfg.XSHIFT ^= 1;
 			keystat_forcerelease(0x70);
@@ -258,6 +334,15 @@ static void sys_cmd(MENUID id) {
 			update |= SYS_UPDATECFG;
 			break;
 
+		case MID_JASTSND:
+			np2oscfg.jastsnd ^= 1;
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case MID_SEEKSND:
+			np2cfg.MOTOR ^= 1;
+			update |= SYS_UPDATECFG;
+			break;
 #if 0
 		case IDM_SNDOPT:
 			winuienter();
@@ -265,11 +350,6 @@ static void sys_cmd(MENUID id) {
 			winuileave();
 			break;
 #endif
-		case MID_SEEKSND:
-			np2cfg.MOTOR ^= 1;
-			update |= SYS_UPDATECFG;
-			break;
-
 		case MID_MEM640:
 			np2cfg.EXTMEM = 0;
 			update |= SYS_UPDATECFG;
@@ -371,7 +451,7 @@ static void sys_cmd(MENUID id) {
 
 		case MID_ABOUT:
 			menudlg_create(DLGABOUT_WIDTH, DLGABOUT_HEIGHT,
-											(char *)mstr_about, dlgabout_cmd);
+													mstr_about, dlgabout_cmd);
 			break;
 
 #if defined(MENU_TASKMINIMIZE)
@@ -399,7 +479,7 @@ BOOL sysmenu_create(void) {
 	if (menusys_create(s_main, sys_cmd, MICON_NP2, str_np2)) {
 		goto smcre_err;
 	}
-#if defined(SIZE_QVGA)
+#if defined(SUPPORT_SOFTKBD)
 	menusys_setstyle(MENUSTYLE_BOTTOM);
 #endif
 	return(SUCCESS);
@@ -428,10 +508,22 @@ BOOL sysmenu_menuopen(UINT menutype, int
 	menusys_setcheck(MID_30FPS, (b == 2));
 	menusys_setcheck(MID_20FPS, (b == 3));
 	menusys_setcheck(MID_15FPS, (b == 4));
+#if defined(WIN32_PLATFORM_PSPC)
+	b = np2oscfg.bindcur;
+	menusys_setcheck(MID_CURDEF, (b == 0));
+	menusys_setcheck(MID_CUR1, (b == 1));
+	menusys_setcheck(MID_CUR2, (b == 2));
+	b = np2oscfg.bindbtn;
+	menusys_setcheck(MID_BTNDEF, (b == 0));
+	menusys_setcheck(MID_BTN1, (b == 1));
+	menusys_setcheck(MID_BTN2, (b == 2));
+#endif
+
 	b = np2cfg.KEY_MODE;
 	menusys_setcheck(MID_KEY, (b == 0));
 	menusys_setcheck(MID_JOY1, (b == 1));
 	menusys_setcheck(MID_JOY2, (b == 2));
+	menusys_setcheck(MID_MOUSEKEY, (b == 3));
 	b = np2cfg.XSHIFT;
 	menusys_setcheck(MID_XSHIFT, (b & 1));
 	menusys_setcheck(MID_XCTRL, (b & 2));
@@ -458,6 +550,7 @@ BOOL sysmenu_menuopen(UINT menutype, int
 	menusys_setcheck(MID_SPEAKBOARD, (b == 0x20));
 	menusys_setcheck(MID_SPARKBOARD, (b == 0x40));
 	menusys_setcheck(MID_AMD98, (b == 0x80));
+	menusys_setcheck(MID_JASTSND, (np2oscfg.jastsnd & 1));
 	menusys_setcheck(MID_SEEKSND, (np2cfg.MOTOR & 1));
 	b = np2cfg.EXTMEM;
 	menusys_setcheck(MID_MEM640, (b == 0));