From 4ebcdff0073c038739d4ea33ef2d9ed1c9679eca Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Wed, 10 Apr 2019 17:22:36 +0300 Subject: [PATCH] 4200 --- od-win32/makeexe.cmd | 6 +- od-win32/resources/winuae_minimal.rc | 100 +++++++++++++++------------ od-win32/win32.h | 6 +- od-win32/winuaechangelog.txt | 1 + od-win32/wix/Product.wxs | 4 +- scsi.cpp | 2 +- 6 files changed, 65 insertions(+), 54 deletions(-) diff --git a/od-win32/makeexe.cmd b/od-win32/makeexe.cmd index 20985cd0..18e4fc3a 100644 --- a/od-win32/makeexe.cmd +++ b/od-win32/makeexe.cmd @@ -1,15 +1,15 @@ del *.zip cd ..\..\distribution copy d:\amiga\winuae.exe /y -zip -9 -r c:\projects\winuae\src\od-win32\winuae.zip * +c:\utils\cygwin\bin\zip -9 -r c:\projects\winuae\src\od-win32\winuae.zip * cd c:\projects\winuae\src\od-win32 copy winuae.zip d:\amiga\WinUAE%1.zip copy resourcedll\release\resourcedll.dll bin\WinUAE_default.dll cd bin copy d:\amiga\winuae.exe /y copy d:\amiga\winuae64.exe /y -zip -9 WinUAE%1_x64.zip winuae64.exe -zip -9 WinUAE%1_translation WinUAE_default.dll +c:\utils\cygwin\bin\zip -9 WinUAE%1_x64.zip winuae64.exe +c:\utils\cygwin\bin\zip -9 WinUAE%1_translation WinUAE_default.dll copy WinUAE%1_x64.zip d:\amiga copy WinUAE%1_translation.zip d:\amiga del translation.txt diff --git a/od-win32/resources/winuae_minimal.rc b/od-win32/resources/winuae_minimal.rc index 39255c92..ce3cc65f 100644 --- a/od-win32/resources/winuae_minimal.rc +++ b/od-win32/resources/winuae_minimal.rc @@ -3,10 +3,10 @@ #include "winres.h" #include "resource.h" ///////////////////////////////////////////////////////////////////////////// -// English resources +// English (United Kingdom) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK #pragma code_page(1252) ///////////////////////////////////////////////////////////////////////////// @@ -113,12 +113,12 @@ BEGIN PUSHBUTTON "Move down",IDC_BOARDS_DOWN,203,241,78,14 END -IDD_KICKSTART DIALOGEX 0, 0, 396, 259 +IDD_KICKSTART DIALOGEX 0, 0, 396, 305 STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD EXSTYLE WS_EX_CONTEXTHELP FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - GROUPBOX "System ROM Settings",IDC_STATIC,1,0,394,91 + GROUPBOX "System ROM Settings",IDC_STATIC,1,0,394,89 LTEXT "Main ROM file:",IDC_ROMTEXT,14,13,263,10 COMBOBOX IDC_ROMFILE,12,25,361,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "...",IDC_KICKCHOOSER,376,25,10,15 @@ -126,22 +126,29 @@ BEGIN COMBOBOX IDC_ROMFILE2,12,54,361,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "...",IDC_ROMCHOOSER2,376,55,10,15 CONTROL "MapROM emulation [] Creates a BlizKick-compatible memory area.",IDC_MAPROM, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,87,73,104,12 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,87,72,104,12 CONTROL "ShapeShifter support [] Patches the system ROM for ShapeShifter compatibility.",IDC_KICKSHIFTER, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,195,73,106,13 - GROUPBOX "Miscellaneous",IDC_STATIC,0,96,395,109 - LTEXT "Cartridge ROM file:",IDC_FLASHTEXT2,12,111,265,10 - COMBOBOX IDC_CARTFILE,12,124,361,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "...",IDC_CARTCHOOSER,376,123,10,15 - LTEXT "Flash RAM or A2286/A2386SX BIOS CMOS RAM file:",IDC_FLASHTEXT,12,141,265,10 - EDITTEXT IDC_FLASHFILE,12,153,361,12,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_FLASHCHOOSER,376,151,10,15 - LTEXT "Real Time Clock file",IDC_STATIC,12,167,313,15,SS_CENTERIMAGE - EDITTEXT IDC_RTCFILE,12,183,361,12,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_RTCCHOOSER,376,181,10,15 - GROUPBOX "Advanced UAE expansion board/Boot ROM Settings",IDC_STATIC,0,209,395,48 - COMBOBOX IDC_UAEBOARD_TYPE,96,228,155,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - RTEXT "Board type:",IDC_STATIC,20,227,67,15,SS_CENTERIMAGE + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,195,72,106,13 + GROUPBOX "Miscellaneous",IDC_STATIC,0,157,395,109 + LTEXT "Cartridge ROM file:",IDC_FLASHTEXT2,12,172,265,10 + COMBOBOX IDC_CARTFILE,12,185,361,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "...",IDC_CARTCHOOSER,376,185,10,15 + LTEXT "Flash RAM or A2286/A2386SX BIOS CMOS RAM file:",IDC_FLASHTEXT,12,202,265,10 + EDITTEXT IDC_FLASHFILE,12,214,361,12,ES_AUTOHSCROLL + PUSHBUTTON "...",IDC_FLASHCHOOSER,376,213,10,15 + LTEXT "Real Time Clock file",IDC_STATIC,12,228,313,15,SS_CENTERIMAGE + EDITTEXT IDC_RTCFILE,12,244,361,12,ES_AUTOHSCROLL + PUSHBUTTON "...",IDC_RTCCHOOSER,376,243,10,15 + GROUPBOX "Advanced UAE expansion board/Boot ROM Settings",IDC_STATIC,0,269,395,36 + COMBOBOX IDC_UAEBOARD_TYPE,96,284,155,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + RTEXT "Board type:",IDC_STATIC,20,282,67,15,SS_CENTERIMAGE + RTEXT "Address range",IDC_STATIC,158,110,54,15,SS_CENTERIMAGE + EDITTEXT IDC_ROM_ADDRESS,219,110,79,13,ES_AUTOHSCROLL + EDITTEXT IDC_ROM_ADDRESS2,306,110,79,13,ES_AUTOHSCROLL + COMBOBOX IDC_CUSTOMROMSELECT,12,110,135,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Advanced Custom ROM Settings",IDC_STATIC,0,93,394,59 + EDITTEXT IDC_CUSTOMROMFILE,12,130,361,12,ES_AUTOHSCROLL + PUSHBUTTON "...",IDC_CUSTOMROMCHOOSER,376,127,10,15 END IDD_DISPLAY DIALOGEX 0, 0, 396, 311 @@ -418,10 +425,10 @@ BEGIN COMBOBOX IDC_SOUNDCARDLIST,1,1,393,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Sound Emulation",IDC_SOUNDSETTINGS,1,19,132,112 CONTROL "Disabled",IDC_SOUND0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,13,35,108,10 - CONTROL "Disabled, but emulated",IDC_SOUND1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,53,107,10 - CONTROL "Enabled",IDC_SOUND2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,71,108,10 - CONTROL "Automatic switching",IDC_SOUND_AUTO,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,92,108,10 - CONTROL "Include CD and FMV audio",IDC_SOUND_CDPAULAMIX,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,108,108,10 + CONTROL "Disabled, but emulated",IDC_SOUND1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,49,107,10 + CONTROL "Enabled",IDC_SOUND2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,63,108,10 + CONTROL "Automatic switching",IDC_SOUND_AUTO,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,81,108,10 + CONTROL "Include CD and FMV audio",IDC_SOUND_CDPAULAMIX,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,94,108,10 GROUPBOX "Volume",IDC_STATIC,139,19,255,69 RTEXT "Master",IDC_STATIC,160,38,51,10,SS_CENTERIMAGE CONTROL "",IDC_SOUNDVOLUME,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,215,32,105,20 @@ -461,6 +468,7 @@ BEGIN CONTROL "WASAPI",IDC_SOUND_WASAPI,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,292,248,98,10 CONTROL "OpenAL",IDC_SOUND_OPENAL,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,292,262,98,10 CONTROL "PortAudio",IDC_SOUND_PORTAUDIO,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,292,276,98,10 + CONTROL "Volume Counter mode",IDC_SOUND_VOLCNT,"Button",BS_AUTOCHECKBOX | BS_LEFT | NOT WS_VISIBLE | WS_GROUP | WS_TABSTOP,13,114,108,10 END IDD_LOADSAVE DIALOGEX 0, 0, 396, 318 @@ -599,23 +607,22 @@ STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN CONTROL "",IDC_MISCLIST,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,3,5,258,232 - GROUPBOX "Miscellaneous Options",IDC_STATIC,266,2,128,138 + GROUPBOX "Miscellaneous Options",IDC_STATIC,266,2,128,123 CTEXT "SCSI and CD/DVD access:",IDC_STATIC,272,14,117,10,SS_CENTERIMAGE COMBOBOX IDC_SCSIMODE,287,28,87,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CTEXT "Windowed style:",IDC_STATIC,272,45,117,10,SS_CENTERIMAGE COMBOBOX IDC_WINDOWEDMODE,287,59,87,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP CTEXT "Graphics API:",IDC_STATIC,272,76,117,10,SS_CENTERIMAGE COMBOBOX IDC_DXMODE,287,89,87,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - CTEXT "Graphics API Options:",IDC_STATIC,272,106,117,10,SS_CENTERIMAGE - COMBOBOX IDC_DXMODE_OPTIONS,287,119,87,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - GROUPBOX "GUI",IDC_STATIC,266,144,128,93 - COMBOBOX IDC_LANGUAGE,273,157,114,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "GUI Font...",IDC_GUI_FONT,272,174,54,14 - PUSHBUTTON "List Font...",IDC_GUI_LISTFONT,333,174,54,14 - PUSHBUTTON "Set default",IDC_GUI_DEFAULT,272,193,54,14 - COMBOBOX IDC_GUI_SIZE,333,194,54,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Resizeable GUI",IDC_GUI_RESIZE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,211,114,11 - CONTROL "Fullscreen GUI",IDC_GUI_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,224,114,11 + COMBOBOX IDC_DXMODE_OPTIONS,287,107,87,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + GROUPBOX "GUI",IDC_STATIC,266,125,128,112 + COMBOBOX IDC_LANGUAGE,273,138,114,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "GUI Font...",IDC_GUI_FONT,272,155,54,14 + PUSHBUTTON "List Font...",IDC_GUI_LISTFONT,333,155,54,14 + PUSHBUTTON "Set default",IDC_GUI_DEFAULT,272,174,54,14 + COMBOBOX IDC_GUI_SIZE,333,175,54,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Resizeable GUI",IDC_GUI_RESIZE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,209,114,11 + CONTROL "Fullscreen GUI",IDC_GUI_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,222,114,11 GROUPBOX "State Files",IDC_STATIC,1,242,393,38 CONTROL "",IDC_STATECLEAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,244,261,9,10 PUSHBUTTON "Load state...",IDC_DOLOADSTATE,257,257,65,14 @@ -626,6 +633,7 @@ BEGIN COMBOBOX IDC_KBLED3,184,295,64,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "USB mode",IDC_KBLED_USB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,296,64,11 COMBOBOX IDC_STATENAME,5,258,232,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Reset list customizations",IDC_GUI_LVDEFAULT,272,192,115,14 END IDD_HARDFILE DIALOGEX 0, 0, 397, 290 @@ -885,7 +893,7 @@ BEGIN COMBOBOX IDC_INPUTDEVICE,116,4,192,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP RTEXT "Device enabled",-1,313,6,66,11,SS_CENTERIMAGE CONTROL "",IDC_INPUTDEVICEDISABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,384,7,9,10 - CONTROL "List1",IDC_INPUTLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,5,22,390,220 + CONTROL "List1",IDC_INPUTLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,5,22,390,220 COMBOBOX IDC_INPUTAMIGACNT,5,248,24,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_INPUTAMIGA,33,248,286,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Test [] Test input mappings.",IDC_INPUTTEST,324,248,34,14 @@ -910,7 +918,7 @@ BEGIN GROUPBOX "Filter Settings",-1,1,1,393,160 COMBOBOX IDC_FILTERMODE,9,31,153,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_FILTERSTACK,167,31,27,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_FILTERFILTER,199,31,63,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FILTERFILTERH,199,31,29,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_FILTEROVERLAYTYPE,9,52,119,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_FILTEROVERLAY,134,52,129,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_FILTER_NATIVERTG,268,12,120,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP @@ -947,6 +955,7 @@ BEGIN PUSHBUTTON "Load",IDC_FILTERPRESETLOAD,205,272,55,14 PUSHBUTTON "Save",IDC_FILTERPRESETSAVE,265,272,55,14 PUSHBUTTON "Delete",IDC_FILTERPRESETDELETE,325,272,55,14 + COMBOBOX IDC_FILTERFILTERV,233,31,29,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP END IDD_HARDDRIVE DIALOGEX 0, 0, 397, 219 @@ -1292,7 +1301,7 @@ BEGIN COMBOBOX IDC_HDF_CONTROLLER_UNIT,239,89,71,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "Add CD Drive",IDOK,121,108,73,14 PUSHBUTTON "Cancel",IDCANCEL,201,108,73,14 - CONTROL "",IDC_CDLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,4,4,387,77 + CONTROL "",IDC_CDLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,4,4,387,77 END IDD_TAPEDRIVE DIALOGEX 0, 0, 395, 97 @@ -1386,8 +1395,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,1,0,0 - PRODUCTVERSION 4,1,0,0 + FILEVERSION 4,2,0,0 + PRODUCTVERSION 4,2,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -1403,12 +1412,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "WinUAE" - VALUE "FileVersion", "4.1.0.0" + VALUE "FileVersion", "4.2.0.0" VALUE "InternalName", "WinUAE" - VALUE "LegalCopyright", "© 1996-2018 under the GNU Public License (GPL)" + VALUE "LegalCopyright", "© 1996-2019 under the GNU Public License (GPL)" VALUE "OriginalFilename", "WinUAE.exe" VALUE "ProductName", "WinUAE" - VALUE "ProductVersion", "4.1.0.0" + VALUE "ProductVersion", "4.2.0.0" END END BLOCK "VarFileInfo" @@ -1505,6 +1514,7 @@ BEGIN END END + ///////////////////////////////////////////////////////////////////////////// // // DESIGNINFO @@ -1519,7 +1529,7 @@ BEGIN IDD_KICKSTART, DIALOG BEGIN - BOTTOMMARGIN, 258 + BOTTOMMARGIN, 304 END IDD_DISPLAY, DIALOG @@ -2141,7 +2151,7 @@ BEGIN IDS_TABLET_MODE "-\nTablet emulation\n" END -#endif // English resources +#endif // English (United Kingdom) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/od-win32/win32.h b/od-win32/win32.h index adeb276e..cb39d479 100644 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -15,17 +15,17 @@ #define GETBDM(x) (((x) - ((x / 10000) * 10000)) / 100) #define GETBDD(x) ((x) % 100) -#define WINUAEPUBLICBETA 1 +#define WINUAEPUBLICBETA 0 #define LANG_DLL 1 #define LANG_DLL_FULL_VERSION_MATCH 1 #if WINUAEPUBLICBETA -#define WINUAEBETA _T("8") +#define WINUAEBETA _T("0") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2019, 4, 6) +#define WINUAEDATE MAKEBD(2019, 4, 8) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index 416ddd22..7f6b8549 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,4 +1,5 @@ +4.2.0 Beta 8: diff --git a/od-win32/wix/Product.wxs b/od-win32/wix/Product.wxs index 383dfbe5..3c5a4cc1 100644 --- a/od-win32/wix/Product.wxs +++ b/od-win32/wix/Product.wxs @@ -2,8 +2,8 @@ - - + + diff --git a/scsi.cpp b/scsi.cpp index 6a75d1f6..97b63d27 100644 --- a/scsi.cpp +++ b/scsi.cpp @@ -4449,7 +4449,7 @@ bool trumpcard_init(struct autoconfig_info *aci) void trumpcard_add_scsi_unit(int ch, struct uaedev_config_info *ci, struct romconfig *rc) { - generic_soft_scsi_add(ch, ci, rc, NCR5380_TRUMPCARD, 65536, 32768, NCR5380_TRUMPCARD); + generic_soft_scsi_add(ch, ci, rc, NCR5380_TRUMPCARD, 65536, 32768, ROMTYPE_IVSTC); } bool rochard_scsi_init(struct romconfig *rc, uaecptr baseaddress) -- 2.47.3