pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated Pandora References to Amiberry

Browse source
This commit is contained in:
Dimitris Panokostas 2017-02-27 14:29:54 +01:00
parent 783ab8c1db
commit 391c00dfcd
33 changed files with 2618 additions and 1996 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Makefile
View file

@ -35,7 +35,7 @@ PANDORA=1
SDL_CFLAGS = `sdl2-config --cflags --libs`
DEFS += `xml2-config --cflags`
DEFS += -DCPU_arm -DARMV6_ASSEMBLY -DPANDORA -DPICASSO96
DEFS += -DCPU_arm -DARMV6_ASSEMBLY -DAMIBERRY -DPICASSO96
DEFS += -DWITH_INGAME_WARNING -DRASPBERRY -DCAPSLOCK_DEBIAN_WORKAROUND
DEFS += -DROM_PATH_PREFIX=\"./\" -DDATA_PREFIX=\"./data/\" -DSAVE_PREFIX=\"./saves/\"
DEFS += -DUSE_SDL
@ -155,17 +155,17 @@ OBJS = \
src/osdep/cda_play.o \
src/osdep/charset.o \
src/osdep/fsdb_host.o \
src/osdep/hardfile_pandora.o \
src/osdep/hardfile_amiberry.o \
src/osdep/keyboard.o \
src/osdep/mp3decoder.o \
src/osdep/writelog.o \
src/osdep/pandora.o \
src/osdep/pandora_filesys.o \
src/osdep/pandora_input.o \
src/osdep/pandora_gfx.o \
src/osdep/pandora_gui.o \
src/osdep/pandora_rp9.o \
src/osdep/pandora_mem.o \
src/osdep/amiberry.o \
src/osdep/amiberry_filesys.o \
src/osdep/amiberry_input.o \
src/osdep/amiberry_gfx.o \
src/osdep/amiberry_gui.o \
src/osdep/amiberry_rp9.o \
src/osdep/amiberry_mem.o \
src/osdep/sigsegv_handler.o \
src/osdep/menu/menu_config.o \
src/sounddep/sound_sdl_new.o \

4
VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings
View file

@ -34,6 +34,7 @@
</FileMasks>
<TransferNewFilesOnly>true</TransferNewFilesOnly>
<IncludeSubdirectories>true</IncludeSubdirectories>
<SelectedDirectories />
<DeleteDisappearedFiles>false</DeleteDisappearedFiles>
</MainSourceTransferCommand>
<AllowChangingHostForMainCommands>false</AllowChangingHostForMainCommands>
@ -68,7 +69,6 @@
<ProjectFile>Amiberry.vcxproj</ProjectFile>
<RemoteBuildEnvironment>
<Records />
<EnvironmentSetupFiles />
</RemoteBuildEnvironment>
<ParallelJobCount>1</ParallelJobCount>
</Build>
@ -138,7 +138,7 @@
<UserDefinedVariables />
<ImportedPropertySheets />
<CodeSense>
<Enabled>True</Enabled>
<Enabled>False</Enabled>
<CFLAGS />
<CXXFLAGS />
<ExternalSourceFileList />

1
VisualGDB/Amiberry/Amiberry-Release-rpi1.vgdbsettings
View file

@ -89,6 +89,7 @@
<Value>C:\SysGCC\raspberry\bin;%PATH%</Value>
</Record>
</Records>
<EnvironmentSetupFiles />
</GDBEnvironment>
<DebuggedProgram>$(TargetPath)</DebuggedProgram>
<GDBServerPort>2000</GDBServerPort>

1
VisualGDB/Amiberry/Amiberry-Release-rpi2.vgdbsettings
View file

@ -89,6 +89,7 @@
<Value>C:\SysGCC\raspberry\bin;%PATH%</Value>
</Record>
</Records>
<EnvironmentSetupFiles />
</GDBEnvironment>
<DebuggedProgram>$(TargetPath)</DebuggedProgram>
<GDBServerPort>2000</GDBServerPort>

3
VisualGDB/Amiberry/Amiberry-Release.vgdbsettings
View file

@ -10,7 +10,7 @@
<Transport>None</Transport>
</BuildHost>
<DeploymentHost>
<HostName>192.168.1.152</HostName>
<HostName>192.168.1.155</HostName>
<Transport>SSH</Transport>
<UserName>pi</UserName>
</DeploymentHost>
@ -115,6 +115,7 @@
<Value>C:\SysGCC\raspberry\bin;%PATH%</Value>
</Record>
</Records>
<EnvironmentSetupFiles />
</GDBEnvironment>
<DebuggedProgram>$(TargetPath)</DebuggedProgram>
<GDBServerPort>2000</GDBServerPort>

36
VisualGDB/Amiberry/Amiberry.vcxproj
View file

@ -48,8 +48,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
<ClCompile>
<CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
<AdditionalIncludeDirectories>C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\4.9\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\4.9;C:\SysGCC\raspberry\arm-linux-gnueabihf\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vmcs_host\linux;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vcos\pthreads;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include\;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;../../src;../../src/include;../../src/osdep;../../src/threaddep;../../src/guisan/include;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/local/include;=/usr/local/include/SDL2;=/usr/include/libxml2;%(ClCompile.AdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>DEBUG=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6T2;PICASSO96;USE_ARMNEON;CPU_arm;ARMV6_ASSEMBLY;PANDORA;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\4.9\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\4.9;C:\SysGCC\raspberry\arm-linux-gnueabihf\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vmcs_host\linux;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vcos\pthreads;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;../../src;../../src/include;../../src/osdep;../../src/threaddep;../../src/guisan/include;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/local/include;=/usr/local/include/SDL2;=/usr/include/libxml2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>DEBUG=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6T2;PICASSO96;USE_ARMNEON;CPU_arm;ARMV6_ASSEMBLY;AMIBERRY;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard -pipe %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
@ -63,8 +63,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
<ClCompile>
<CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
<AdditionalIncludeDirectories>C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\4.9\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\4.9;C:\SysGCC\raspberry\arm-linux-gnueabihf\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vmcs_host\linux;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vcos\pthreads;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include\;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;../../src;../../src/include;../../src/osdep;../../src/threaddep;../../src/guisan/include;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/local/include;=/usr/local/include/SDL2;=/usr/include/libxml2;%(ClCompile.AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6T2;PICASSO96;USE_ARMNEON;CPU_arm;ARMV6_ASSEMBLY;PANDORA;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\4.9\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\4.9;C:\SysGCC\raspberry\arm-linux-gnueabihf\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vmcs_host\linux;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vcos\pthreads;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;../../src;../../src/include;../../src/osdep;../../src/threaddep;../../src/guisan/include;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/local/include;=/usr/local/include/SDL2;=/usr/include/libxml2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6T2;PICASSO96;USE_ARMNEON;CPU_arm;ARMV6_ASSEMBLY;AMIBERRY;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard -pipe -fweb %(AdditionalOptions)</AdditionalOptions>
<OmitFramePointer>true</OmitFramePointer>
<InlineFunctions>true</InlineFunctions>
@ -80,8 +80,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi2|VisualGDB'">
<ClCompile>
<CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
<AdditionalIncludeDirectories>C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\4.9\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\4.9;C:\SysGCC\raspberry\arm-linux-gnueabihf\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vmcs_host\linux;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vcos\pthreads;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include\;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;../../src;../../src/include;../../src/osdep;../../src/threaddep;../../src/guisan/include;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/local/include;=/usr/local/include/SDL2;=/usr/include/libxml2;%(ClCompile.AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6T2;PICASSO96;USE_ARMNEON;CPU_arm;ARMV6_ASSEMBLY;PANDORA;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\4.9\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\4.9;C:\SysGCC\raspberry\arm-linux-gnueabihf\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vmcs_host\linux;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vcos\pthreads;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;../../src;../../src/include;../../src/osdep;../../src/threaddep;../../src/guisan/include;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/local/include;=/usr/local/include/SDL2;=/usr/include/libxml2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6T2;PICASSO96;USE_ARMNEON;CPU_arm;ARMV6_ASSEMBLY;AMIBERRY;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>-march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard -pipe -fweb %(AdditionalOptions)</AdditionalOptions>
<OmitFramePointer>true</OmitFramePointer>
<InlineFunctions>true</InlineFunctions>
@ -98,8 +98,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi1|VisualGDB'">
<ClCompile>
<CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
<AdditionalIncludeDirectories>C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\4.9\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\4.9;C:\SysGCC\raspberry\arm-linux-gnueabihf\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vmcs_host\linux;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vcos\pthreads;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include\;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;../../src;../../src/include;../../src/osdep;../../src/threaddep;../../src/guisan/include;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/local/include;=/usr/local/include/SDL2;=/usr/include/libxml2;%(ClCompile.AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;PICASSO96;CPU_arm;ARMV6_ASSEMBLY;PANDORA;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\4.9\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\4.9;C:\SysGCC\raspberry\arm-linux-gnueabihf\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vmcs_host\linux;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vcos\pthreads;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;../../src;../../src/include;../../src/osdep;../../src/threaddep;../../src/guisan/include;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/local/include;=/usr/local/include/SDL2;=/usr/include/libxml2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;PICASSO96;CPU_arm;ARMV6_ASSEMBLY;AMIBERRY;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>-march=armv6zk -mfpu=vfp -mfloat-abi=hard -pipe -fweb %(AdditionalOptions)</AdditionalOptions>
<OmitFramePointer>true</OmitFramePointer>
<InlineFunctions>true</InlineFunctions>
@ -234,18 +234,18 @@
<ClCompile Include="..\..\src\osdep\gui\UaeDropDown.cpp" />
<ClCompile Include="..\..\src\osdep\gui\UaeListBox.cpp" />
<ClCompile Include="..\..\src\osdep\gui\UaeRadioButton.cpp" />
<ClCompile Include="..\..\src\osdep\hardfile_pandora.cpp" />
<ClCompile Include="..\..\src\osdep\hardfile_amiberry.cpp" />
<ClCompile Include="..\..\src\osdep\keyboard.cpp" />
<ClCompile Include="..\..\src\osdep\menu\menu_config.cpp" />
<ClCompile Include="..\..\src\osdep\mp3decoder.cpp" />
<ClCompile Include="..\..\src\osdep\neon_helper.s" />
<ClCompile Include="..\..\src\osdep\pandora.cpp" />
<ClCompile Include="..\..\src\osdep\pandora_filesys.cpp" />
<ClCompile Include="..\..\src\osdep\pandora_gfx.cpp" />
<ClCompile Include="..\..\src\osdep\pandora_gui.cpp" />
<ClCompile Include="..\..\src\osdep\pandora_input.cpp" />
<ClCompile Include="..\..\src\osdep\pandora_mem.cpp" />
<ClCompile Include="..\..\src\osdep\pandora_rp9.cpp" />
<ClCompile Include="..\..\src\osdep\amiberry.cpp" />
<ClCompile Include="..\..\src\osdep\amiberry_filesys.cpp" />
<ClCompile Include="..\..\src\osdep\amiberry_gfx.cpp" />
<ClCompile Include="..\..\src\osdep\amiberry_gui.cpp" />
<ClCompile Include="..\..\src\osdep\amiberry_input.cpp" />
<ClCompile Include="..\..\src\osdep\amiberry_mem.cpp" />
<ClCompile Include="..\..\src\osdep\amiberry_rp9.cpp" />
<ClCompile Include="..\..\src\osdep\picasso96.cpp" />
<ClCompile Include="..\..\src\osdep\sigsegv_handler.cpp" />
<ClCompile Include="..\..\src\osdep\writelog.cpp" />
@ -487,8 +487,8 @@
<ClInclude Include="..\..\src\osdep\gui\UaeListBox.hpp" />
<ClInclude Include="..\..\src\osdep\gui\UaeRadioButton.hpp" />
<ClInclude Include="..\..\src\osdep\mp3decoder.h" />
<ClInclude Include="..\..\src\osdep\pandora_gfx.h" />
<ClInclude Include="..\..\src\osdep\pandora_rp9.h" />
<ClInclude Include="..\..\src\osdep\amiberry_gfx.h" />
<ClInclude Include="..\..\src\osdep\amiberry_rp9.h" />
<ClInclude Include="..\..\src\osdep\sysconfig.h" />
<ClInclude Include="..\..\src\osdep\target.h" />
<ClInclude Include="..\..\src\sounddep\sound.h" />

60
VisualGDB/Amiberry/Amiberry.vcxproj.filters
View file

@ -429,36 +429,12 @@
<ClCompile Include="..\..\src\osdep\fsdb_host.cpp">
<Filter>Source files\osdep</Filter>
</ClCompile>
<ClCompile Include="..\..\src\osdep\hardfile_pandora.cpp">
<Filter>Source files\osdep</Filter>
</ClCompile>
<ClCompile Include="..\..\src\osdep\keyboard.cpp">
<Filter>Source files\osdep</Filter>
</ClCompile>
<ClCompile Include="..\..\src\osdep\mp3decoder.cpp">
<Filter>Source files\osdep</Filter>
</ClCompile>
<ClCompile Include="..\..\src\osdep\pandora.cpp">
<Filter>Source files\osdep</Filter>
</ClCompile>
<ClCompile Include="..\..\src\osdep\pandora_filesys.cpp">
<Filter>Source files\osdep</Filter>
</ClCompile>
<ClCompile Include="..\..\src\osdep\pandora_gfx.cpp">
<Filter>Source files\osdep</Filter>
</ClCompile>
<ClCompile Include="..\..\src\osdep\pandora_gui.cpp">
<Filter>Source files\osdep</Filter>
</ClCompile>
<ClCompile Include="..\..\src\osdep\pandora_input.cpp">
<Filter>Source files\osdep</Filter>
</ClCompile>
<ClCompile Include="..\..\src\osdep\pandora_mem.cpp">
<Filter>Source files\osdep</Filter>
</ClCompile>
<ClCompile Include="..\..\src\osdep\pandora_rp9.cpp">
<Filter>Source files\osdep</Filter>
</ClCompile>
<ClCompile Include="..\..\src\osdep\picasso96.cpp">
<Filter>Source files\osdep</Filter>
</ClCompile>
@ -561,6 +537,30 @@
<ClCompile Include="..\..\src\sounddep\sound_sdl_new.cpp">
<Filter>Source files\sounddep</Filter>
</ClCompile>
<ClCompile Include="..\..\src\osdep\amiberry_gfx.cpp">
<Filter>Source files\osdep</Filter>
</ClCompile>
<ClCompile Include="..\..\src\osdep\amiberry_gui.cpp">
<Filter>Source files\osdep</Filter>
</ClCompile>
<ClCompile Include="..\..\src\osdep\amiberry_input.cpp">
<Filter>Source files\osdep</Filter>
</ClCompile>
<ClCompile Include="..\..\src\osdep\amiberry_mem.cpp">
<Filter>Source files\osdep</Filter>
</ClCompile>
<ClCompile Include="..\..\src\osdep\amiberry_rp9.cpp">
<Filter>Source files\osdep</Filter>
</ClCompile>
<ClCompile Include="..\..\src\osdep\amiberry_filesys.cpp">
<Filter>Source files\osdep</Filter>
</ClCompile>
<ClCompile Include="..\..\src\osdep\amiberry.cpp">
<Filter>Source files\osdep</Filter>
</ClCompile>
<ClCompile Include="..\..\src\osdep\hardfile_amiberry.cpp">
<Filter>Source files\osdep</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Image Include="..\..\data\35floppy.ico">
@ -927,12 +927,6 @@
<ClInclude Include="..\..\src\osdep\mp3decoder.h">
<Filter>Header files\osdep</Filter>
</ClInclude>
<ClInclude Include="..\..\src\osdep\pandora_gfx.h">
<Filter>Header files\osdep</Filter>
</ClInclude>
<ClInclude Include="..\..\src\osdep\pandora_rp9.h">
<Filter>Header files\osdep</Filter>
</ClInclude>
<ClInclude Include="..\..\src\osdep\sysconfig.h">
<Filter>Header files\osdep</Filter>
</ClInclude>
@ -1149,5 +1143,11 @@
<ClInclude Include="..\..\src\guisan\include\guisan\widgets\window.hpp">
<Filter>Header files\guisan\include\guisan\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\src\osdep\amiberry_gfx.h">
<Filter>Header files\osdep</Filter>
</ClInclude>
<ClInclude Include="..\..\src\osdep\amiberry_rp9.h">
<Filter>Header files\osdep</Filter>
</ClInclude>
</ItemGroup>
</Project>

2
src/include/memory.h
View file

@ -21,7 +21,7 @@ extern void cache_free (uae_u8*, int);
#define S_READ 1
#define S_WRITE 2
#ifdef PANDORA
#ifdef AMIBERRY
extern uae_u8* natmem_offset;
#endif

323
src/include/options.h
View file

@ -1,4 +1,4 @@
/*
/*
* UAE - The Un*x Amiga Emulator
*
* Stuff
@ -16,10 +16,11 @@
extern long int version;
struct strlist {
struct strlist *next;
TCHAR *option, *value;
int unknown;
struct strlist
{
struct strlist* next;
TCHAR *option, *value;
int unknown;
};
#define DEFAULT_JIT_CACHE_SIZE 8192
@ -38,11 +39,12 @@ struct strlist {
#define MAX_INPUT_SUB_EVENT_ALL 9
#define SPARE_SUB_EVENT 8
struct uae_input_device {
TCHAR *name;
TCHAR *configname;
struct uae_input_device
{
TCHAR* name;
TCHAR* configname;
uae_s16 eventid[MAX_INPUT_DEVICE_EVENTS][MAX_INPUT_SUB_EVENT_ALL];
TCHAR *custom[MAX_INPUT_DEVICE_EVENTS][MAX_INPUT_SUB_EVENT_ALL];
TCHAR* custom[MAX_INPUT_DEVICE_EVENTS][MAX_INPUT_SUB_EVENT_ALL];
uae_u64 flags[MAX_INPUT_DEVICE_EVENTS][MAX_INPUT_SUB_EVENT_ALL];
uae_s8 port[MAX_INPUT_DEVICE_EVENTS][MAX_INPUT_SUB_EVENT_ALL];
uae_s16 extra[MAX_INPUT_DEVICE_EVENTS];
@ -52,7 +54,9 @@ struct uae_input_device {
#define MAX_JPORTS 4
#define NORMAL_JPORTS 2
#define MAX_JPORTNAME 128
struct jport {
struct jport
{
int id;
int mode; // 0=def,1=mouse,2=joy,3=anajoy,4=lightpen
int autofire;
@ -60,6 +64,7 @@ struct jport {
TCHAR configname[MAX_JPORTNAME];
bool nokeyboardoverride;
};
#define JPORT_NONE -1
#define JPORT_CUSTOM -2
#define JPORT_AF_NORMAL 1
@ -81,6 +86,7 @@ struct cdslot
bool delayed;
int type;
};
struct floppyslot
{
TCHAR df[MAX_DPATH];
@ -88,9 +94,10 @@ struct floppyslot
bool forcedwriteprotect;
};
struct wh {
int x, y;
int width, height;
struct wh
{
int x, y;
int width, height;
};
#define MOUNT_CONFIG_SIZE 30
@ -103,22 +110,24 @@ struct wh {
#define BOOTPRI_NOAUTOMOUNT -129
#define ISAUTOBOOT(ci) ((ci)->bootpri > BOOTPRI_NOAUTOBOOT)
#define ISAUTOMOUNT(ci) ((ci)->bootpri > BOOTPRI_NOAUTOMOUNT)
struct uaedev_config_info {
struct uaedev_config_info
{
int type;
TCHAR devname[MAX_DPATH];
TCHAR volname[MAX_DPATH];
TCHAR rootdir[MAX_DPATH];
bool readonly;
int bootpri;
TCHAR filesys[MAX_DPATH];
TCHAR devname[MAX_DPATH];
TCHAR volname[MAX_DPATH];
TCHAR rootdir[MAX_DPATH];
bool readonly;
int bootpri;
TCHAR filesys[MAX_DPATH];
int lowcyl;
int highcyl; // zero if detected from size
int cyls; // calculated/corrected highcyl
int surfaces;
int sectors;
int reserved;
int blocksize;
int controller;
int surfaces;
int sectors;
int reserved;
int blocksize;
int controller;
// zero if default
int pcyls, pheads, psecs;
int flags;
@ -143,56 +152,57 @@ struct uaedev_config_data
int unitnum; // scsi unit number (if tape currently)
};
struct uae_prefs {
struct strlist *all_lines;
struct uae_prefs
{
struct strlist* all_lines;
TCHAR description[256];
TCHAR info[256];
int config_version;
TCHAR description[256];
TCHAR info[256];
int config_version;
bool socket_emu;
bool start_gui;
bool start_gui;
int produce_sound;
int sound_stereo;
int sound_stereo_separation;
int sound_mixed_stereo_delay;
int sound_freq;
int sound_interpol;
int sound_filter;
int sound_filter_type;
int produce_sound;
int sound_stereo;
int sound_stereo_separation;
int sound_mixed_stereo_delay;
int sound_freq;
int sound_interpol;
int sound_filter;
int sound_filter_type;
int sound_volume_cd;
int cachesize;
int optcount[10];
int cachesize;
int optcount[10];
int gfx_framerate;
struct wh gfx_size_win;
struct wh gfx_size_fs;
struct wh gfx_size;
int gfx_resolution;
int gfx_framerate;
struct wh gfx_size_win;
struct wh gfx_size_fs;
struct wh gfx_size;
int gfx_resolution;
#ifdef RASPBERRY
int gfx_correct_aspect;
int gfx_fullscreen_ratio;
int kbd_led_num;
int kbd_led_scr;
int kbd_led_cap;
int scaling_method;
#endif
int gfx_correct_aspect;
int gfx_fullscreen_ratio;
int kbd_led_num;
int kbd_led_scr;
int kbd_led_cap;
int scaling_method;
#endif
bool immediate_blits;
bool immediate_blits;
int waiting_blits;
unsigned int chipset_mask;
bool ntscmode;
double chipset_refreshrate;
int collision_level;
int leds_on_screen;
int fast_copper;
int floppy_speed;
int floppy_write_length;
bool tod_hack;
unsigned int chipset_mask;
bool ntscmode;
double chipset_refreshrate;
int collision_level;
int leds_on_screen;
int fast_copper;
int floppy_speed;
int floppy_write_length;
bool tod_hack;
int filesys_limit;
int filesys_max_name;
@ -200,56 +210,50 @@ struct uae_prefs {
bool cs_cd32c2p;
bool cs_cd32nvram;
TCHAR romfile[MAX_DPATH];
TCHAR romextfile[MAX_DPATH];
TCHAR romfile[MAX_DPATH];
TCHAR romextfile[MAX_DPATH];
TCHAR flashfile[MAX_DPATH];
struct cdslot cdslots[MAX_TOTAL_SCSI_DEVICES];
TCHAR path_floppy[256];
TCHAR path_hardfile[256];
TCHAR path_rom[256];
TCHAR path_cd[256];
TCHAR path_floppy[256];
TCHAR path_hardfile[256];
TCHAR path_rom[256];
TCHAR path_cd[256];
int m68k_speed;
int cpu_model;
int fpu_model;
bool cpu_compatible;
bool address_space_24;
int picasso96_modeflags;
int m68k_speed;
int cpu_model;
int fpu_model;
bool cpu_compatible;
bool address_space_24;
int picasso96_modeflags;
uae_u32 z3fastmem_size;
uae_u32 z3fastmem_start;
uae_u32 fastmem_size;
uae_u32 chipmem_size;
uae_u32 bogomem_size;
uae_u32 rtgmem_size;
int rtgmem_type;
uae_u32 z3fastmem_size;
uae_u32 z3fastmem_start;
uae_u32 fastmem_size;
uae_u32 chipmem_size;
uae_u32 bogomem_size;
uae_u32 rtgmem_size;
int rtgmem_type;
int mountitems;
struct uaedev_config_data mountconfig[MOUNT_CONFIG_SIZE];
int mountitems;
struct uaedev_config_data mountconfig[MOUNT_CONFIG_SIZE];
int nr_floppies;
struct floppyslot floppyslots[4];
int nr_floppies;
struct floppyslot floppyslots[4];
/* Target specific options */
int pandora_horizontal_offset;
int pandora_vertical_offset;
int pandora_cpu_speed;
int pandora_hide_idle_led;
int pandora_tapDelay;
int pandora_customControls;
/* Target specific options */
int amiberry_customControls;
int key_for_menu;
int key_for_quit;
int button_for_menu;
int button_for_quit;
int key_for_menu;
int key_for_quit;
int button_for_menu;
int button_for_quit;
/* input */
/* input */
struct jport jports[MAX_JPORTS];
int input_selected_setting;
int input_joymouse_multiplier;
int input_joymouse_multiplier;
int input_joymouse_deadzone;
int input_joystick_deadzone;
int input_joymouse_speed;
@ -257,13 +261,12 @@ struct uae_prefs {
int input_analog_joystick_offset;
int input_autofire_linecnt;
int input_mouse_speed;
int input_tablet;
int input_tablet;
int input_keyboard_type;
struct uae_input_device joystick_settings[MAX_INPUT_SETTINGS][MAX_INPUT_DEVICES];
struct uae_input_device mouse_settings[MAX_INPUT_SETTINGS][MAX_INPUT_DEVICES];
struct uae_input_device keyboard_settings[MAX_INPUT_SETTINGS][MAX_INPUT_DEVICES];
TCHAR input_config_name[GAMEPORT_INPUT_SETTINGS][256];
};
extern int config_changed;
@ -271,77 +274,77 @@ extern void config_check_vsync(void);
extern void set_config_changed(void);
/* Contains the filename of .uaerc */
extern void cfgfile_write (struct zfile *, const TCHAR *option, const TCHAR *format,...);
extern void cfgfile_dwrite (struct zfile *, const TCHAR *option, const TCHAR *format,...);
extern void cfgfile_target_write (struct zfile *, const TCHAR *option, const TCHAR *format,...);
extern void cfgfile_target_dwrite (struct zfile *, const TCHAR *option, const TCHAR *format,...);
extern void cfgfile_write(struct zfile*, const TCHAR* option, const TCHAR* format,...);
extern void cfgfile_dwrite(struct zfile*, const TCHAR* option, const TCHAR* format,...);
extern void cfgfile_target_write(struct zfile*, const TCHAR* option, const TCHAR* format,...);
extern void cfgfile_target_dwrite(struct zfile*, const TCHAR* option, const TCHAR* format,...);
extern void cfgfile_write_bool (struct zfile *f, const TCHAR *option, bool b);
extern void cfgfile_dwrite_bool (struct zfile *f,const TCHAR *option, bool b);
extern void cfgfile_target_write_bool (struct zfile *f, const TCHAR *option, bool b);
extern void cfgfile_target_dwrite_bool (struct zfile *f, const TCHAR *option, bool b);
extern void cfgfile_write_bool(struct zfile* f, const TCHAR* option, bool b);
extern void cfgfile_dwrite_bool(struct zfile* f, const TCHAR* option, bool b);
extern void cfgfile_target_write_bool(struct zfile* f, const TCHAR* option, bool b);
extern void cfgfile_target_dwrite_bool(struct zfile* f, const TCHAR* option, bool b);
extern void cfgfile_write_str (struct zfile *f, const TCHAR *option, const TCHAR *value);
extern void cfgfile_dwrite_str (struct zfile *f, const TCHAR *option, const TCHAR *value);
extern void cfgfile_target_write_str (struct zfile *f, const TCHAR *option, const TCHAR *value);
extern void cfgfile_target_dwrite_str (struct zfile *f, const TCHAR *option, const TCHAR *value);
extern void cfgfile_write_str(struct zfile* f, const TCHAR* option, const TCHAR* value);
extern void cfgfile_dwrite_str(struct zfile* f, const TCHAR* option, const TCHAR* value);
extern void cfgfile_target_write_str(struct zfile* f, const TCHAR* option, const TCHAR* value);
extern void cfgfile_target_dwrite_str(struct zfile* f, const TCHAR* option, const TCHAR* value);
extern struct uaedev_config_data *add_filesys_config (struct uae_prefs *p, int index, struct uaedev_config_info*);
extern bool get_hd_geometry (struct uaedev_config_info *);
extern void uci_set_defaults (struct uaedev_config_info *uci, bool rdb);
extern struct uaedev_config_data* add_filesys_config(struct uae_prefs* p, int index, struct uaedev_config_info*);
extern bool get_hd_geometry(struct uaedev_config_info*);
extern void uci_set_defaults(struct uaedev_config_info* uci, bool rdb);
extern void error_log (const TCHAR*, ...);
extern TCHAR *get_error_log (void);
extern bool is_error_log (void);
extern void error_log(const TCHAR*, ...);
extern TCHAR* get_error_log(void);
extern bool is_error_log(void);
extern void default_prefs (struct uae_prefs *, int);
extern void discard_prefs (struct uae_prefs *, int);
extern int bip_a500 (struct uae_prefs *p, int rom);
extern int bip_a500plus (struct uae_prefs *p, int rom);
extern int bip_a1200 (struct uae_prefs *p, int rom);
extern int bip_a2000 (struct uae_prefs *p, int rom);
extern int bip_a4000 (struct uae_prefs *p, int rom);
extern int bip_cd32 (struct uae_prefs *p, int rom);
extern void default_prefs(struct uae_prefs*, int);
extern void discard_prefs(struct uae_prefs*, int);
extern int bip_a500(struct uae_prefs* p, int rom);
extern int bip_a500plus(struct uae_prefs* p, int rom);
extern int bip_a1200(struct uae_prefs* p, int rom);
extern int bip_a2000(struct uae_prefs* p, int rom);
extern int bip_a4000(struct uae_prefs* p, int rom);
extern int bip_cd32(struct uae_prefs* p, int rom);
int parse_cmdline_option (struct uae_prefs *, TCHAR, const TCHAR *);
int parse_cmdline_option(struct uae_prefs*, TCHAR, const TCHAR*);
extern int cfgfile_yesno (const TCHAR *option, const TCHAR *value, const TCHAR *name, bool *location);
extern int cfgfile_intval (const TCHAR *option, const TCHAR *value, const TCHAR *name, int *location, int scale);
extern int cfgfile_strval (const TCHAR *option, const TCHAR *value, const TCHAR *name, int *location, const TCHAR *table[], int more);
extern int cfgfile_string (const TCHAR *option, const TCHAR *value, const TCHAR *name, TCHAR *location, int maxsz);
extern TCHAR *cfgfile_subst_path (const TCHAR *path, const TCHAR *subst, const TCHAR *file);
extern int cfgfile_yesno(const TCHAR* option, const TCHAR* value, const TCHAR* name, bool* location);
extern int cfgfile_intval(const TCHAR* option, const TCHAR* value, const TCHAR* name, int* location, int scale);
extern int cfgfile_strval(const TCHAR* option, const TCHAR* value, const TCHAR* name, int* location, const TCHAR* table[], int more);
extern int cfgfile_string(const TCHAR* option, const TCHAR* value, const TCHAR* name, TCHAR* location, int maxsz);
extern TCHAR* cfgfile_subst_path(const TCHAR* path, const TCHAR* subst, const TCHAR* file);
extern TCHAR *target_expand_environment (const TCHAR *path);
extern int target_parse_option (struct uae_prefs *, const TCHAR *option, const TCHAR *value);
extern void target_save_options (struct zfile*, struct uae_prefs *);
extern void target_default_options (struct uae_prefs *, int type);
extern void target_fixup_options (struct uae_prefs *);
extern int target_cfgfile_load (struct uae_prefs *, const TCHAR *filename, int type, int isdefault);
extern void cfgfile_save_options (struct zfile *f, struct uae_prefs *p, int type);
extern TCHAR* target_expand_environment(const TCHAR* path);
extern int target_parse_option(struct uae_prefs*, const TCHAR* option, const TCHAR* value);
extern void target_save_options(struct zfile*, struct uae_prefs*);
extern void target_default_options(struct uae_prefs*, int type);
extern void target_fixup_options(struct uae_prefs*);
extern int target_cfgfile_load(struct uae_prefs*, const TCHAR* filename, int type, int isdefault);
extern void cfgfile_save_options(struct zfile* f, struct uae_prefs* p, int type);
extern int cfgfile_load (struct uae_prefs *p, const TCHAR *filename, int *type, int ignorelink, int userconfig);
extern int cfgfile_save (struct uae_prefs *p, const TCHAR *filename, int);
extern void cfgfile_parse_line (struct uae_prefs *p, TCHAR *, int);
extern int cfgfile_parse_option (struct uae_prefs *p, TCHAR *option, TCHAR *value, int);
extern int cfgfile_get_description (const TCHAR *filename, TCHAR *description);
extern uae_u32 cfgfile_uaelib (int mode, uae_u32 name, uae_u32 dst, uae_u32 maxlen);
extern uae_u32 cfgfile_uaelib_modify (uae_u32 mode, uae_u32 parms, uae_u32 size, uae_u32 out, uae_u32 outsize);
extern uae_u32 cfgfile_modify (uae_u32 index, TCHAR *parms, uae_u32 size, TCHAR *out, uae_u32 outsize);
extern void cfgfile_addcfgparam (TCHAR *);
extern int cfgfile_load(struct uae_prefs* p, const TCHAR* filename, int* type, int ignorelink, int userconfig);
extern int cfgfile_save(struct uae_prefs* p, const TCHAR* filename, int);
extern void cfgfile_parse_line(struct uae_prefs* p, TCHAR*, int);
extern int cfgfile_parse_option(struct uae_prefs* p, TCHAR* option, TCHAR* value, int);
extern int cfgfile_get_description(const TCHAR* filename, TCHAR* description);
extern uae_u32 cfgfile_uaelib(int mode, uae_u32 name, uae_u32 dst, uae_u32 maxlen);
extern uae_u32 cfgfile_uaelib_modify(uae_u32 mode, uae_u32 parms, uae_u32 size, uae_u32 out, uae_u32 outsize);
extern uae_u32 cfgfile_modify(uae_u32 index, TCHAR* parms, uae_u32 size, TCHAR* out, uae_u32 outsize);
extern void cfgfile_addcfgparam(TCHAR*);
extern int cfgfile_configuration_change(int);
extern void fixup_prefs_dimensions (struct uae_prefs *prefs);
extern void fixup_prefs (struct uae_prefs *prefs);
extern void fixup_cpu (struct uae_prefs *prefs);
extern void fixup_prefs_dimensions(struct uae_prefs* prefs);
extern void fixup_prefs(struct uae_prefs* prefs);
extern void fixup_cpu(struct uae_prefs* prefs);
extern void check_prefs_changed_custom (void);
extern void check_prefs_changed_cpu (void);
extern void check_prefs_changed_audio (void);
extern void check_prefs_changed_cd (void);
extern int check_prefs_changed_gfx (void);
extern void check_prefs_changed_custom(void);
extern void check_prefs_changed_cpu(void);
extern void check_prefs_changed_audio(void);
extern void check_prefs_changed_cd(void);
extern int check_prefs_changed_gfx(void);
extern struct uae_prefs currprefs, changed_prefs;
extern int machdep_init (void);
extern void machdep_free (void);
extern int machdep_init(void);
extern void machdep_free(void);
#endif /* OPTIONS_H */

2
src/include/sysdeps.h
View file

@ -267,7 +267,7 @@ extern void to_lower(TCHAR *s, int len);
#undef DONT_HAVE_STDIO
#undef DONT_HAVE_MALLOC
#if defined PANDORA
#if defined AMIBERRY
#include <ctype.h>

3988
src/inputdevice.cpp
View file

File diff suppressed because it is too large Load diff

4
src/jit/compemu_support.cpp
View file

@ -170,7 +170,7 @@ static blockinfo* hold_bi[MAX_HOLD_BI];
static blockinfo* active;
static blockinfo* dormant;
#ifdef PANDORA
#ifdef AMIBERRY
void cache_free (uae_u8 *cache, int size)
{
@ -187,7 +187,7 @@ uae_u8 *cache_alloc (int size)
}
else
memset(cache, 0, size);
return (uae_u8 *) cache;
return static_cast<uae_u8 *>(cache);
}
#endif

2
src/main.cpp
View file

@ -41,7 +41,7 @@
#ifdef USE_SDL
#include "SDL.h"
#include <iostream>
#include "pandora_gfx.h"
#include "amiberry_gfx.h"
SDL_Window* sdlWindow;
SDL_Renderer* renderer;
SDL_Texture* texture;

72
src/osdep/pandora.cpp → src/osdep/amiberry.cpp
View file

@ -1,7 +1,7 @@
/*
* UAE - The Un*x Amiga Emulator
*
* Pandora interface
* Amiberry interface
*
*/
@ -39,7 +39,7 @@
#include "rommgr.h"
#include "akiko.h"
#include "SDL.h"
#include "pandora_rp9.h"
#include "amiberry_rp9.h"
extern void signal_segv(int signum, siginfo_t* info, void* ptr);
extern void gui_force_rtarea_hdchange();
@ -239,36 +239,24 @@ void target_fixup_options(struct uae_prefs* p)
void target_default_options(struct uae_prefs* p, int type)
{
p->pandora_horizontal_offset = 0;
p->pandora_vertical_offset = 0;
p->pandora_hide_idle_led = 0;
p->pandora_tapDelay = 10;
p->pandora_customControls = 0;
p->amiberry_customControls = 0;
p->picasso96_modeflags = RGBFF_CLUT | RGBFF_R5G6B5 | RGBFF_R8G8B8A8;
// memset(customControlMap, 0, sizeof(customControlMap));
}
void target_save_options(struct zfile* f, struct uae_prefs* p)
{
cfgfile_write(f, "pandora.cpu_speed", "%d", p->pandora_cpu_speed);
cfgfile_write(f, "pandora.hide_idle_led", "%d", p->pandora_hide_idle_led);
cfgfile_write(f, "pandora.tap_delay", "%d", p->pandora_tapDelay);
cfgfile_write(f, "pandora.custom_controls", "%d", p->pandora_customControls);
// cfgfile_write(f, "pandora.custom_up", "%d", customControlMap[VK_UP]);
// cfgfile_write(f, "pandora.custom_down", "%d", customControlMap[VK_DOWN]);
// cfgfile_write(f, "pandora.custom_left", "%d", customControlMap[VK_LEFT]);
// cfgfile_write(f, "pandora.custom_right", "%d", customControlMap[VK_RIGHT]);
// cfgfile_write(f, "pandora.custom_a", "%d", customControlMap[VK_A]);
// cfgfile_write(f, "pandora.custom_b", "%d", customControlMap[VK_B]);
// cfgfile_write(f, "pandora.custom_x", "%d", customControlMap[VK_X]);
// cfgfile_write(f, "pandora.custom_y", "%d", customControlMap[VK_Y]);
// cfgfile_write(f, "pandora.custom_l", "%d", customControlMap[VK_L]);
// cfgfile_write(f, "pandora.custom_r", "%d", customControlMap[VK_R]);
cfgfile_write(f, "pandora.move_x", "%d", p->pandora_horizontal_offset);
cfgfile_write(f, "pandora.move_y", "%d", p->pandora_vertical_offset);
cfgfile_write(f, "amiberry.custom_controls", "%d", p->amiberry_customControls);
// cfgfile_write(f, "amiberry.custom_up", "%d", customControlMap[VK_UP]);
// cfgfile_write(f, "amiberry.custom_down", "%d", customControlMap[VK_DOWN]);
// cfgfile_write(f, "amiberry.custom_left", "%d", customControlMap[VK_LEFT]);
// cfgfile_write(f, "amiberry.custom_right", "%d", customControlMap[VK_RIGHT]);
// cfgfile_write(f, "amiberry.custom_a", "%d", customControlMap[VK_A]);
// cfgfile_write(f, "amiberry.custom_b", "%d", customControlMap[VK_B]);
// cfgfile_write(f, "amiberry.custom_x", "%d", customControlMap[VK_X]);
// cfgfile_write(f, "amiberry.custom_y", "%d", customControlMap[VK_Y]);
// cfgfile_write(f, "amiberry.custom_l", "%d", customControlMap[VK_L]);
// cfgfile_write(f, "amiberry.custom_r", "%d", customControlMap[VK_R]);
}
void target_restart()
@ -282,10 +270,7 @@ TCHAR* target_expand_environment(const TCHAR* path)
int target_parse_option(struct uae_prefs* p, const char* option, const char* value)
{
int result = (cfgfile_intval(option, value, "cpu_speed", &p->pandora_cpu_speed, 1)
|| cfgfile_intval(option, value, "hide_idle_led", &p->pandora_hide_idle_led, 1)
|| cfgfile_intval(option, value, "tap_delay", &p->pandora_tapDelay, 1)
|| cfgfile_intval(option, value, "custom_controls", &p->pandora_customControls, 1)
int result = (cfgfile_intval(option, value, "custom_controls", &p->amiberry_customControls, 1)
// || cfgfile_intval(option, value, "custom_up", &customControlMap[VK_UP], 1)
// || cfgfile_intval(option, value, "custom_down", &customControlMap[VK_DOWN], 1)
// || cfgfile_intval(option, value, "custom_left", &customControlMap[VK_LEFT], 1)
@ -296,8 +281,6 @@ int target_parse_option(struct uae_prefs* p, const char* option, const char* val
// || cfgfile_intval(option, value, "custom_y", &customControlMap[VK_Y], 1)
// || cfgfile_intval(option, value, "custom_l", &customControlMap[VK_L], 1)
// || cfgfile_intval(option, value, "custom_r", &customControlMap[VK_R], 1)
|| cfgfile_intval(option, value, "move_x", &p->pandora_horizontal_offset, 1)
|| cfgfile_intval(option, value, "move_y", &p->pandora_vertical_offset, 1)
);
return result;
}
@ -633,21 +616,6 @@ void loadAdfDir()
}
}
//int currVSyncRate = 0;
//bool SetVSyncRate(int hz)
//{
// char cmd[64];
//
// if(currVSyncRate != hz)
// {
// snprintf((char*)cmd, 64, "sudo /usr/pandora/scripts/op_lcdrate.sh %d", hz);
// system(cmd);
// currVSyncRate = hz;
// return true;
// }
// return false;
//}
void target_reset()
{
}
@ -849,7 +817,7 @@ int handle_msgpump()
break;
default:
// if (currprefs.pandora_customControls)
// if (currprefs.amiberry_customControls)
// {
//// keycode = customControlMap[rEvent.key.keysym.sym];
// if (keycode < 0)
@ -868,7 +836,7 @@ int handle_msgpump()
// else
modifier = rEvent.key.keysym.mod;
// keycode = translate_pandora_keys(rEvent.key.keysym.sym, &modifier);
// keycode = translate_amiberry_keys(rEvent.key.keysym.sym, &modifier);
// if(keycode)
// {
// if(modifier == KMOD_SHIFT)
@ -917,7 +885,7 @@ int handle_msgpump()
break;
default:
// if (currprefs.pandora_customControls)
// if (currprefs.amiberry_customControls)
// {
//// keycode = customControlMap[rEvent.key.keysym.sym];
// if (keycode < 0)
@ -935,7 +903,7 @@ int handle_msgpump()
// }
modifier = rEvent.key.keysym.mod;
// keycode = translate_pandora_keys(rEvent.key.keysym.sym, &modifier);
// keycode = translate_amiberry_keys(rEvent.key.keysym.sym, &modifier);
// if(keycode)
// {
// inputdevice_do_keyboard(keycode, 0);
@ -958,7 +926,7 @@ int handle_msgpump()
if (currprefs.input_tablet > TABLET_OFF && !doStylusRightClick)
{
// Delay mousebutton, we need new position first...
delayed_mousebutton = currprefs.pandora_tapDelay << 1;
//delayed_mousebutton = currprefs.amiberry_tapDelay << 1;
}
else
{

0
src/osdep/pandora_filesys.cpp → src/osdep/amiberry_filesys.cpp
View file

8
src/osdep/pandora_gfx.cpp → src/osdep/amiberry_gfx.cpp
View file

@ -12,7 +12,7 @@
#include "inputdevice.h"
#include "savestate.h"
#include "picasso96.h"
#include "pandora_gfx.h"
#include "amiberry_gfx.h"
#include <png.h>
#include "SDL.h"
@ -176,13 +176,9 @@ int check_prefs_changed_gfx()
update_display(&currprefs);
changed = 1;
}
if (currprefs.leds_on_screen != changed_prefs.leds_on_screen ||
currprefs.pandora_hide_idle_led != changed_prefs.pandora_hide_idle_led ||
currprefs.pandora_vertical_offset != changed_prefs.pandora_vertical_offset)
if (currprefs.leds_on_screen != changed_prefs.leds_on_screen)
{
currprefs.leds_on_screen = changed_prefs.leds_on_screen;
currprefs.pandora_hide_idle_led = changed_prefs.pandora_hide_idle_led;
currprefs.pandora_vertical_offset = changed_prefs.pandora_vertical_offset;
changed = 1;
}
if (currprefs.chipset_refreshrate != changed_prefs.chipset_refreshrate)

7
src/osdep/pandora_gfx.h → src/osdep/amiberry_gfx.h
View file

@ -1,6 +1,4 @@
#ifndef PANDORA_GFX_H
#define PANDORA_GFX_H
#pragma once
extern SDL_Window* sdlWindow;
extern SDL_Renderer* renderer;
extern SDL_Texture* texture;
@ -12,5 +10,4 @@ extern SDL_Texture* gui_texture;
extern SDL_DisplayMode sdlMode;
extern void check_error_sdl(bool check, const char* message);
extern void updateScreen();
#endif
extern void updateScreen();

2
src/osdep/pandora_gui.cpp → src/osdep/amiberry_gui.cpp
View file

@ -484,7 +484,7 @@ int gui_init()
void gui_exit()
{
sync();
pandora_stop_sound();
amiberry_stop_sound();
saveAdfDir();
ClearConfigFileList();
ClearAvailableROMList();

0
src/osdep/pandora_input.cpp → src/osdep/amiberry_input.cpp
View file

0
src/osdep/pandora_mem.cpp → src/osdep/amiberry_mem.cpp
View file

1
src/osdep/pandora_rp9.cpp → src/osdep/amiberry_rp9.cpp
View file

@ -184,7 +184,6 @@ static void parse_clip(struct uae_prefs *p, xmlNode *node)
if(attr != NULL)
{
top = atoi((const char *)attr) / 2;
p->pandora_vertical_offset = top - 41; // VBLANK_ENDLINE_PAL + OFFSET_Y_ADJUST
xmlFree(attr);
}
attr = xmlGetProp(curr_node, (const xmlChar *) _T("width"));

0
src/osdep/pandora_rp9.h → src/osdep/amiberry_rp9.h
View file

2
src/osdep/gui/InGameMessage.cpp
View file

@ -8,7 +8,7 @@
#include "sysdeps.h"
#include "config.h"
#include "gui_handling.h"
#include "pandora_gfx.h"
#include "amiberry_gfx.h"
extern SDL_Surface *screen;
extern void flush_screen();

28
src/osdep/gui/PanelInput.cpp
View file

@ -238,24 +238,9 @@ public:
changed_prefs.input_joymouse_multiplier = mousespeed_values[int(sldMouseSpeed->getValue())];
RefreshPanelInput();
}
#ifndef RASPBERRY
else if (actionEvent.getSource() == cboTapDelay)
{
if(cboTapDelay->getSelected() == 0)
changed_prefs.pandora_tapDelay = 10;
else if (cboTapDelay->getSelected() == 1)
changed_prefs.pandora_tapDelay = 5;
else
changed_prefs.pandora_tapDelay = 2;
}
else if (actionEvent.getSource() == chkMouseHack)
{
changed_prefs.input_tablet = chkMouseHack->isSelected() ? TABLET_MOUSEHACK : TABLET_OFF;
}
#endif
else if (actionEvent.getSource() == chkCustomCtrl)
changed_prefs.pandora_customControls = chkCustomCtrl->isSelected() ? 1 : 0;
changed_prefs.amiberry_customControls = chkCustomCtrl->isSelected() ? 1 : 0;
//TODO: Implement this in SDL2
// else if (actionEvent.getSource() == cboA)
@ -618,17 +603,8 @@ void RefreshPanelInput()
break;
}
}
#ifndef RASPBERRY
if (changed_prefs.pandora_tapDelay == 10)
cboTapDelay->setSelected(0);
else if (changed_prefs.pandora_tapDelay == 5)
cboTapDelay->setSelected(1);
else
cboTapDelay->setSelected(2);
chkMouseHack->setSelected(changed_prefs.input_tablet == TABLET_MOUSEHACK);
#endif
chkCustomCtrl->setSelected(changed_prefs.pandora_customControls);
chkCustomCtrl->setSelected(changed_prefs.amiberry_customControls);
//TODO: Implement this in SDL2
// cboA->setSelected(GetAmigaKeyIndex(customControlMap[VK_A]));
// cboB->setSelected(GetAmigaKeyIndex(customControlMap[VK_B]));

4
src/osdep/gui/PanelMisc.cpp
View file

@ -101,9 +101,6 @@ public:
if (actionEvent.getSource() == chkStatusLine)
changed_prefs.leds_on_screen = chkStatusLine->isSelected();
else if (actionEvent.getSource() == chkHideIdleLed)
changed_prefs.pandora_hide_idle_led = chkHideIdleLed->isSelected();
else if (actionEvent.getSource() == chkShowGUI)
changed_prefs.start_gui = chkShowGUI->isSelected();
@ -274,7 +271,6 @@ void RefreshPanelMisc()
char tmp[20];
chkStatusLine->setSelected(changed_prefs.leds_on_screen);
chkHideIdleLed->setSelected(changed_prefs.pandora_hide_idle_led);
chkShowGUI->setSelected(changed_prefs.start_gui);
chkBSDSocket->setSelected(changed_prefs.socket_emu);

2
src/osdep/gui/main_window.cpp
View file

@ -13,7 +13,7 @@
#include "gui.h"
#include "gui_handling.h"
#include "memory.h"
#include "pandora_gfx.h"
#include "amiberry_gfx.h"
bool gui_running = false;
static int last_active_panel = 1;

0
src/osdep/hardfile_pandora.cpp → src/osdep/hardfile_amiberry.cpp
View file

2
src/osdep/keyboard.cpp
View file

@ -149,7 +149,7 @@ void keyboard_settrans ()
inputdevice_setkeytranslation (keytrans, kbmaps);
}
int translate_pandora_keys(int symbol, int *modifier)
int translate_amiberry_keys(int symbol, int *modifier)
{
switch(symbol)
{

8
src/osdep/menu/menu_config.cpp
View file

@ -458,9 +458,8 @@ int loadconfig_old(struct uae_prefs* p, const char* orgpath)
p->input_autofire_linecnt = p->input_autofire_linecnt * 312;
fscanf(f, "autofire=%d\n", &dummy);
fscanf(f, "stylusOffset=%d\n", &dummy);
fscanf(f, "tapDelay=%d\n", &p->pandora_tapDelay);
fscanf(f, "scanlines=%d\n", &dummy);
#if defined(PANDORA) || defined(ANDROIDSDL)
#if defined(AMIBERRY) || defined(ANDROIDSDL)
fscanf(f, "ham=%d\n", &dummy);
#else
fscanf(f, "ham=%d\n", &mainMenu_ham);
@ -473,15 +472,12 @@ int loadconfig_old(struct uae_prefs* p, const char* orgpath)
p->chipset_refreshrate = 60;
else
p->chipset_refreshrate = 50;
fscanf(f, "mainMenu_cpuSpeed=%d\n", &p->pandora_cpu_speed);
fscanf(f, "presetModeId=%d\n", &presetModeId);
fscanf(f, "moveX=%d\n", &p->pandora_horizontal_offset);
fscanf(f, "moveY=%d\n", &p->pandora_vertical_offset);
fscanf(f, "displayedLines=%d\n", &p->gfx_size.height);
fscanf(f, "screenWidth=%d\n", &p->gfx_size_fs.width);
fscanf(f, "cutLeft=%d\n", &dummy);
fscanf(f, "cutRight=%d\n", &dummy);
fscanf(f, "customControls=%d\n", &p->pandora_customControls);
fscanf(f, "customControls=%d\n", &p->amiberry_customControls);
fscanf(f, "custom_dpad=%d\n", &dummy);
// fscanf(f, "custom_up=%d\n", &customControlMap[VK_UP]);
// fscanf(f, "custom_down=%d\n", &customControlMap[VK_DOWN]);

9
src/osdep/target.h
View file

@ -1,14 +1,15 @@
/*
* UAE - The Un*x Amiga Emulator
*
* Target specific stuff, Pandora version
* Target specific stuff, Amiberry version
*
* Copyright 1997 Bernd Schmidt
*/
#pragma once
#include "SDL.h"
#define TARGET_NAME "pandora"
#define TARGET_NAME "Amiberry"
#define NO_MAIN_IN_MAIN_C
@ -28,10 +29,10 @@ void update_display(struct uae_prefs *);
void graphics_subshutdown(void);
void moveVertical(int value);
void pandora_stop_sound(void);
void amiberry_stop_sound(void);
void keyboard_settrans(void);
int translate_pandora_keys(int symbol, int *modifier);
int translate_amiberry_keys(int symbol, int *modifier);
void SimulateMouseOrJoy(int code, int keypressed);
#define REMAP_MOUSEBUTTON_LEFT -1

5
src/sounddep/sound.h
View file

@ -6,11 +6,8 @@
* Copyright 1997 Bernd Schmidt
*/
#if defined(PANDORA) || defined(ANDROIDSDL)
#pragma once
#define DEFAULT_SOUND_CHANNELS 2
#else
#define DEFAULT_SOUND_CHANNELS 1
#endif
#define SOUND_BUFFERS_COUNT 4
#define SNDBUFFER_LEN 2048

16
src/sounddep/sound_sdl_new.cpp
View file

@ -63,7 +63,7 @@ int setup_sound(void) { sound_available = 0; return 0; }
void close_sound(void) {}
void pandora_stop_sound(void) {}
void amiberry_stop_sound(void) {}
int init_sound(void) { return 0; }
@ -186,7 +186,7 @@ static void init_soundbuffer_usage(void)
}
static int pandora_start_sound(int rate, int bits, int stereo)
static int amiberry_start_sound(int rate, int bits, int stereo)
{
int frag = 0, buffers, ret;
unsigned int bsize;
@ -198,7 +198,7 @@ static int pandora_start_sound(int rate, int bits, int stereo)
return 0;
if (audioOpened)
pandora_stop_sound();
amiberry_stop_sound();
// init sem, start sound thread
@ -235,12 +235,12 @@ static int pandora_start_sound(int rate, int bits, int stereo)
// this is meant to be called only once on exit
void pandora_stop_sound(void)
void amiberry_stop_sound(void)
{
int valuesem;
if (sound_thread_exit)
printf("don't call pandora_stop_sound more than once!\n");
printf("don't call amiberry_stop_sound more than once!\n");
SDL_PauseAudio(1);
if (sound_thread_active)
{
@ -337,7 +337,7 @@ int setup_sound(void)
#endif
// Android does not like opening sound device several times
if (pandora_start_sound(currprefs.sound_freq, 16, currprefs.sound_stereo) != 0)
if (amiberry_start_sound(currprefs.sound_freq, 16, currprefs.sound_stereo) != 0)
return 0;
sound_available = 1;
@ -355,7 +355,7 @@ static int open_sound(void)
#endif
// Android does not like opening sound device several times
if (pandora_start_sound(currprefs.sound_freq, 16, currprefs.sound_stereo) != 0)
if (amiberry_start_sound(currprefs.sound_freq, 16, currprefs.sound_stereo) != 0)
return 0;
@ -385,7 +385,7 @@ void close_sound(void)
// testing shows that reopenning sound device is not a good idea (causes random sound driver crashes)
// we will close it on real exit instead
#ifdef RASPBERRY
//pandora_stop_sound();
//amiberry_stop_sound();
#endif
have_sound = 0;

4
src/statusline.cpp
View file

@ -63,15 +63,13 @@ void draw_status_line_single (uae_u8 *buf, int y, int totalwidth)
x += 100 - (TD_WIDTH * (currprefs.nr_floppies - 1)) - TD_WIDTH;
if(nr_units() < 1)
x += TD_WIDTH;
if(currprefs.pandora_hide_idle_led)
x += TD_WIDTH;
if(picasso_on)
memset (buf + (x - 4) * 2, 0, (screen->w - x + 4) * 2);
else
memset (buf + (x - 4) * gfxvidinfo.pixbytes, 0, (gfxvidinfo.outwidth - x + 4) * gfxvidinfo.pixbytes);
for (led = (currprefs.pandora_hide_idle_led == 0) ? -2 : -1; led < (currprefs.nr_floppies+1); led++) {
for (led = -1; led < (currprefs.nr_floppies+1); led++) {
int num1 = -1, num2 = -1, num3 = -1;
if(led == 0 && nr_units() < 1)