LIV2/WinUAE
1
0
Fork 0
mirror of https://github.com/LIV2/WinUAE.git synced 2025-12-06 00:12:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

4010b6

Browse Source
This commit is contained in:
Toni Wilen 2018-07-14 21:52:19 +03:00
parent 7353ed02d9
commit 2fc8e38c90
5 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
a2065.cpp
View File

@ -1020,6 +1020,9 @@ static bool a2065_config (struct autoconfig_info *aci)
{
uae_u8 maco[3];
if (!aci)
return false;
if (aci->postinit) {
configured = expamem_board_pointer >> 16;
return true;

15
od-win32/hardfile_win32.cpp
View File

@ -3681,9 +3681,18 @@ int harddrive_to_hdf (HWND hDlg, struct uae_prefs *p, int idx)
}
}
if (chsmode) {
do_scsi_read10_chs(h, -1, cyl, head, 1, (uae_u8*)cache, secs, &specialaccessmode, false);
get = 512 * secs;
got = 512 * secs;
int readsize = secs;
int seccnt = 0;
uae_u8 *p = (uae_u8*)cache;
while (seccnt < secs) {
if (seccnt + readsize > secs)
readsize = secs - seccnt;
do_scsi_read10_chs(h, -1, cyl, head, seccnt + 1, p, readsize, &specialaccessmode, false);
get = 512 * readsize;
got = 512 * readsize;
p += 512 * readsize;
seccnt += readsize;
}
head++;
if (head >= heads) {
head = 0;

6
od-win32/win32.h
View File

@ -17,15 +17,15 @@
#define WINUAEPUBLICBETA 1
#define LANG_DLL 1
#define LANG_DLL_FULL_VERSION_MATCH 1
#define LANG_DLL_FULL_VERSION_MATCH 0
#if WINUAEPUBLICBETA
#define WINUAEBETA _T("5")
#define WINUAEBETA _T("6")
#else
#define WINUAEBETA _T("")
#endif
#define WINUAEDATE MAKEBD(2018, 7, 12)
#define WINUAEDATE MAKEBD(2018, 7, 14)
//#define WINUAEEXTRA _T("AmiKit Preview")
//#define WINUAEEXTRA _T("Amiga Forever Edition")

6
od-win32/winuaechangelog.txt
View File

@ -1,4 +1,10 @@
Beta 6:
- Statefiles now include full relative and absolute path (disks, harddrives etc), now supports restoring statefile paths correctly even if relative path mode changed between save and restore. Old versions ignore new fields, old statefiles work like previously.
- When tracing ('t' debugger command) STOP instruction in debugger, break first when STOP is executed (like previously), next trace waits until STOP instruction exits. Previously STOP activated debugger immediately again.
- Picasso96 statefile restore didn't restore screen state fully. (4.x bug)
Beta 5:
- input.keyboard_type was always read as Amiga keyboard. If PC layout was set as default, keyboard layout was read incorrectly from config file.

2
qemuvga/ne2000.cpp
View File

@ -1884,7 +1884,7 @@ static addrbank ariadne2_bank = {
ariadne2_lget, ariadne2_wget, ariadne2_bget,
ariadne2_lput, ariadne2_wput, ariadne2_bput,
default_xlate, default_check, NULL, _T("*"), _T("NE2000"),
ariadne2_wget, ariadne2_lget,
ariadne2_lget, ariadne2_wget,
ABFLAG_IO | ABFLAG_PPCIOSPACE, S_READ, S_WRITE
};