imported winuaesrc0827.zip

This commit is contained in:
Toni Wilen 2004-06-05 22:01:54 +03:00
parent ddf2b0a424
commit 0c6c323011
4 changed files with 23 additions and 34 deletions

13
debug.c
View File

@ -570,17 +570,24 @@ static void illg_init (void)
}
memset (illgdebug + 0xf80000, 1, 512 * 1024); /* KS ROM */
memset (illgdebug + 0xdc0000, 0, 0x3f); /* clock */
#ifdef CDTV
if (cdtv_enabled) {
memset (illgdebug + 0xf00000, 1, 256 * 1024); /* CDTV ext ROM */
memset (illgdebug + 0xdc8000, 0, 4096); /* CDTV batt RAM */
}
if (cd32_enabled || cloanto_rom) {
#endif
#ifdef CD32
if (cd32_enabled) {
memset (illgdebug + AKIKO_BASE, 0, AKIKO_BASE_END - AKIKO_BASE);
memset (illgdebug + 0xe00000, 1, 512 * 1024); /* CD32 ext ROM */
if (cd32_enabled)
memset (illgdebug + AKIKO_BASE, 0, AKIKO_BASE_END - AKIKO_BASE);
}
#endif
if (cloanto_rom)
memset (illgdebug + 0xe00000, 1, 512 * 1024);
#ifdef FILESYS
if (nr_units (currprefs.mountinfo) > 0) /* filesys "rom" */
memset (illgdebug + RTAREA_BASE, 1, 0x10000);
#endif
}
/* add special custom register check here */

View File

@ -121,6 +121,8 @@ int caps_loadtrack (uae_u16 *mfmbuf, uae_u16 *tracktiming, int drv, int track, i
CAPSLockTrack(&ci, caps_cont[drv], track / 2, track & 1, caps_flags);
mfm = mfmbuf;
*multirev = (ci.type & CTIT_FLAG_FLAKEY) ? 1 : 0;
if (ci.trackcnt > 1)
*multirev = 1;
type = ci.type & CTIT_MASK_TYPE;
len = ci.tracksize[0];
*tracklength = len * 8;

View File

@ -107,7 +107,7 @@ BEGIN
CBS_HASSTRINGS | NOT WS_VISIBLE | WS_VSCROLL |
WS_TABSTOP
CONTROL "",IDC_DA_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS |
TBS_TOP | NOT WS_VISIBLE | WS_TABSTOP,97,159,101,20
TBS_TOP | NOT WS_VISIBLE | WS_TABSTOP,97,161,101,20
PUSHBUTTON "Detect pixel format",IDC_TEST16BIT,221,163,67,14,0,0,
HIDC_TEST16BIT
END
@ -626,7 +626,7 @@ BEGIN
"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,104,113,114,10
CONTROL "Full",IDC_COLLISION3,"Button",BS_AUTORADIOBUTTON |
WS_TABSTOP,104,129,27,10
GROUPBOX "Sound emulation",IDC_STATIC,13,150,268,65
GROUPBOX "Sound emulation",IDC_STATIC,13,151,268,65
CONTROL "Disabled",IDC_CS_SOUND0,"Button",BS_AUTORADIOBUTTON |
WS_GROUP | WS_TABSTOP,39,167,102,10
CONTROL "Emulated",IDC_CS_SOUND1,"Button",BS_AUTORADIOBUTTON |
@ -802,17 +802,17 @@ BEGIN
CONTROL "",IDC_DISKLIST,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT |
LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,4,6,262,211
PUSHBUTTON "Remove disk image",IDC_DISKLISTREMOVE,94,222,93,15
PUSHBUTTON "Remove disk image",IDC_DISKLISTREMOVE,94,223,93,15
PUSHBUTTON "",IDC_UP,270,66,25,15,BS_ICON
PUSHBUTTON "",IDC_DOWN,270,146,25,15,BS_ICON
END
IDD_PANEL DIALOGEX 0, 0, 420, 278
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION |
WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES | WS_EX_CONTROLPARENT
CAPTION "WinUAE Properties"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
CONTROL "",IDC_PANELTREE,"SysTreeView32",TVS_HASLINES |
TVS_SHOWSELALWAYS | TVS_NOSCROLL | WS_BORDER |
@ -887,8 +887,8 @@ IDI_MEMORY ICON "chip.ico"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,8,26,0
PRODUCTVERSION 0,8,26,0
FILEVERSION 0,8,27,0
PRODUCTVERSION 0,8,27,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -904,12 +904,12 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "WinUAE"
VALUE "FileVersion", "0.8.26"
VALUE "FileVersion", "0.8.27"
VALUE "InternalName", "WinUAE"
VALUE "LegalCopyright", "© 1996-2004 under the GNU Public License (GPL)"
VALUE "OriginalFilename", "WinUAE.exe"
VALUE "ProductName", "WinUAE"
VALUE "ProductVersion", "0.8.26"
VALUE "ProductVersion", "0.8.27"
END
END
BLOCK "VarFileInfo"
@ -934,11 +934,6 @@ IDC_MYHAND CURSOR "H_arrow.cur"
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO
BEGIN
IDD_DISPLAY, DIALOG
BEGIN
BOTTOMMARGIN, 175
END
IDD_FLOPPY, DIALOG
BEGIN
BOTTOMMARGIN, 175
@ -954,11 +949,6 @@ BEGIN
BOTTOMMARGIN, 206
END
IDD_PORTS, DIALOG
BEGIN
BOTTOMMARGIN, 175
END
IDD_CONTRIBUTORS, DIALOG
BEGIN
RIGHTMARGIN, 370
@ -970,11 +960,6 @@ BEGIN
BOTTOMMARGIN, 215
END
IDD_CHIPSET, DIALOG
BEGIN
BOTTOMMARGIN, 215
END
IDD_INPUT, DIALOG
BEGIN
BOTTOMMARGIN, 187
@ -985,11 +970,6 @@ BEGIN
BOTTOMMARGIN, 175
END
IDD_DISK, DIALOG
BEGIN
BOTTOMMARGIN, 193
END
IDD_PANEL, DIALOG
BEGIN
LEFTMARGIN, 7

View File

@ -20,8 +20,8 @@ extern int in_sizemove;
extern int manual_painting_needed;
extern int manual_palette_refresh_needed;
extern int mouseactive, focus;
#define WINUAEBETA 1
#define WINUAEBETASTR " Beta 4"
#define WINUAEBETA 0
#define WINUAEBETASTR " "
extern void my_kbd_handler (int, int, int);
extern void clearallkeys(void);