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

Cleanup: removed unneeded defines, cleaned up solutions

Browse source
This commit is contained in:
Dimitris Panokostas 2017-03-31 18:58:54 +02:00
parent d37c72ecc0
commit 4f8dc4b87f
19 changed files with 56 additions and 356 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -44,3 +44,5 @@ VisualGDB/VisualGDB/Release/gencpu
VisualGDB/VisualGDB/Release/gencomp
*.tlog
VSLinux/obj/ARM/Debug/amiberry-sdl2-dev
VisualGDB/VisualGDB/Debug/Amiberry-sdl2-dev
VSLinux/obj/ARM/Debug/

7
Makefile
View file

@ -26,13 +26,12 @@ guisan:
cd src/guisan && make all && cd ../..
#DEBUG=1
PANDORA=1
SDL_CFLAGS = `sdl2-config --cflags --libs`
DEFS += `xml2-config --cflags`
DEFS += -DCPU_arm -DARMV6_ASSEMBLY -DAMIBERRY -DPICASSO96
DEFS += -DWITH_INGAME_WARNING -DRASPBERRY -DCAPSLOCK_DEBIAN_WORKAROUND
DEFS += `xml2-config --cflags`
DEFS += -DARMV6_ASSEMBLY -DAMIBERRY -DCPU_arm
DEFS += -DCAPSLOCK_DEBIAN_WORKAROUND
DEFS += -DROM_PATH_PREFIX=\"./\" -DDATA_PREFIX=\"./data/\" -DSAVE_PREFIX=\"./saves/\"
DEFS += -DUSE_SDL

18
VSLinux/Amiberry.vcxproj
View file

@ -395,7 +395,6 @@
<ClCompile Include="..\src\sinctable.cpp">
<DeploymentContent>false</DeploymentContent>
</ClCompile>
<ClCompile Include="..\src\sounddep\sound.cpp" />
<ClCompile Include="..\src\sounddep\sound_sdl_new.cpp" />
<ClCompile Include="..\src\statusline.cpp">
<DeploymentContent>false</DeploymentContent>
@ -531,7 +530,22 @@
<ClInclude Include="..\src\sounddep\sound.h" />
<ClInclude Include="..\src\threaddep\thread.h" />
</ItemGroup>
<ItemDefinitionGroup />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<RemotePostBuildEvent>
<Command>cp ~/projects/Amiberry/amiberry-sdl2 ~/projects/amiberry</Command>
</RemotePostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<RemotePostBuildEvent>
<Message>Copy binary to launch location</Message>
</RemotePostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<RemotePostBuildEvent>
<Command>cp ~/projects/Amiberry-sdl2/amiberry-sdl2 ~/projects/amiberry</Command>
<Message>Copy binary to launch location</Message>
</RemotePostBuildEvent>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
</Project>

3
VSLinux/Amiberry.vcxproj.filters
View file

@ -600,9 +600,6 @@
<ClCompile Include="..\src\osdep\menu\menu_config.cpp">
<Filter>src\osdep\menu</Filter>
</ClCompile>
<ClCompile Include="..\src\sounddep\sound.cpp">
<Filter>src\sounddep</Filter>
</ClCompile>
<ClCompile Include="..\src\sounddep\sound_sdl_new.cpp">
<Filter>src\sounddep</Filter>
</ClCompile>

15
VSLinux/Amiberry.vcxproj.user
View file

@ -1,4 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<RemoteDebuggerCommand>~/projects/amiberry/amiberry-sdl2</RemoteDebuggerCommand>
<RemoteDebuggerWorkingDirectory>~/projects/amiberry</RemoteDebuggerWorkingDirectory>
<DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
<PreLaunchCommand>export DISPLAY=:0.0</PreLaunchCommand>
<RemoteDebuggingMode>gdb</RemoteDebuggingMode>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<RemoteDebuggerCommand>~/projects/amiberry/amiberry-sdl2</RemoteDebuggerCommand>
<RemoteDebuggerWorkingDirectory>~/projects/amiberry</RemoteDebuggerWorkingDirectory>
<DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
<PreLaunchCommand>export DISPLAY=:0.0</PreLaunchCommand>
<RemoteDebuggingMode>gdb</RemoteDebuggingMode>
</PropertyGroup>
</Project>

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

@ -69,7 +69,6 @@
<ProjectFile>Amiberry.vcxproj</ProjectFile>
<RemoteBuildEnvironment>
<Records />
<EnvironmentSetupFiles />
</RemoteBuildEnvironment>
<ParallelJobCount>1</ParallelJobCount>
</Build>

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

@ -69,7 +69,6 @@
<ProjectFile>Amiberry.vcxproj</ProjectFile>
<RemoteBuildEnvironment>
<Records />
<EnvironmentSetupFiles />
</RemoteBuildEnvironment>
<ParallelJobCount>1</ParallelJobCount>
</Build>

12
VisualGDB/Amiberry/Amiberry.vcxproj
View file

@ -49,7 +49,7 @@
<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>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>
<PreprocessorDefinitions>DEBUG=1;_REENTRANT;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;USE_SDL;CPU_arm;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>
@ -64,7 +64,7 @@
<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;AMIBERRY;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;USE_SDL;CPU_arm;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>
@ -81,7 +81,7 @@
<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;AMIBERRY;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;USE_SDL;CPU_arm;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>
@ -89,7 +89,7 @@
<Link>
<AdditionalLinkerInputs>-Wl,-gc-sections,-rpath,/usr/local/lib;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
<LibrarySearchDirectories>../../src/guisan/lib;=/opt/vc/lib;=/usr/local/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
<AdditionalLibraryNames>SDL2;pthread;m;z;SDL2_image;png;rt;xml2;FLAC;mpg123;dl;SDL2_ttf;guisan;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
<AdditionalLibraryNames>SDL2;SDL2_image;SDL2_ttf;pthread;m;z;png;rt;xml2;FLAC;mpg123;dl;guisan;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
<LinkerScript>
</LinkerScript>
<ExtraRPATH>=/usr/local/lib;%(ExtraRPATH)</ExtraRPATH>
@ -99,7 +99,7 @@
<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;AMIBERRY;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6_ASSEMBLY;AMIBERRY;USE_SDL;CPU_arm;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>
@ -107,7 +107,7 @@
<Link>
<AdditionalLinkerInputs>-Wl,-gc-sections,-rpath,/usr/local/lib;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
<LibrarySearchDirectories>../../src/guisan/lib;=/opt/vc/lib;=/usr/local/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
<AdditionalLibraryNames>SDL2;pthread;m;z;SDL2_image;png;rt;xml2;FLAC;mpg123;dl;SDL2_ttf;guisan;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
<AdditionalLibraryNames>SDL2;SDL2_image;SDL2_ttf;pthread;m;z;png;rt;xml2;FLAC;mpg123;dl;guisan;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
<LinkerScript>
</LinkerScript>
<ExtraRPATH>=/usr/local/lib;%(ExtraRPATH)</ExtraRPATH>

2
src/fsdb_unix.cpp
View file

@ -83,7 +83,7 @@ int fsdb_fill_file_attrs (a_inode *base, a_inode *aino)
| (S_IWUSR & statbuf.st_mode ? 0 : A_FIBF_WRITE)
| (S_IRUSR & statbuf.st_mode ? 0 : A_FIBF_READ));
#if defined(WIN32) || defined(ANDROIDSDL) || defined(RASPBERRY)
#if defined(WIN32) || defined(ANDROIDSDL) || defined(AMIBERRY)
// Always give execute & read permission
// Temporary do this for raspberry...
aino->amigaos_mode &= ~A_FIBF_EXECUTE;

2
src/include/sysdeps.h
View file

@ -392,7 +392,7 @@ extern void gui_message(const TCHAR *, ...);
#ifndef STATIC_INLINE
#if __GNUC__ - 1 > 1 && __GNUC_MINOR__ - 1 >= 0
#ifdef RASPBERRY
#ifdef AMIBERRY
#define STATIC_INLINE static __inline__
#else
#define STATIC_INLINE static __inline__ __attribute__ ((always_inline))

1
src/machdep/m68k.h
View file

@ -31,6 +31,7 @@
* Copyright 2004-2005 Richard Drummond
*/
#pragma once
#if (defined(CPU_i386) && defined(X86_ASSEMBLY)) || (defined(CPU_x86_64) && defined(X86_64_ASSEMBLY))
/*

2
src/osdep/amiberry_gui.cpp
View file

@ -22,7 +22,7 @@
#include "blkdev.h"
#include <SDL.h>
#ifdef RASPBERRY
#ifdef AMIBERRY
#include <linux/kd.h>
#include <sys/ioctl.h>
#endif

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

@ -27,7 +27,6 @@ static gcn::UaeDropDown* KeyForQuit;
static gcn::Label* lblButtonForQuit;
static gcn::UaeDropDown* ButtonForQuit;
#ifdef RASPBERRY
class StringListModel : public gcn::ListModel
{
vector<string> values;
@ -59,7 +58,6 @@ static gcn::UaeDropDown* cboKBDLed_scr;
const char* listValues[] = {"none", "POWER", "DF0", "DF1", "DF2", "DF3", "DF*", "HD", "CD"};
StringListModel KBDLedList(listValues, 9);
#endif
static const int ControlKey_SDLKeyValues[] = {0, SDL_SCANCODE_F11, SDL_SCANCODE_F12};
@ -119,13 +117,11 @@ public:
else if (actionEvent.getSource() == ButtonForQuit)
changed_prefs.button_for_quit = ControlButton_SDLButtonValues[ButtonForQuit->getSelected()];
#ifdef RASPBERRY
else if (actionEvent.getSource() == cboKBDLed_num)
changed_prefs.kbd_led_num = cboKBDLed_num->getSelected();
else if (actionEvent.getSource() == cboKBDLed_scr)
changed_prefs.kbd_led_scr = cboKBDLed_scr->getSelected();
#endif
}
};
@ -249,12 +245,11 @@ void ExitPanelMisc()
delete chkShowGUI;
delete chkBSDSocket;
#ifdef RASPBERRY
delete lblScrLock;
delete lblNumLock;
delete cboKBDLed_num;
delete cboKBDLed_scr;
#endif
delete miscActionListener;
delete lblKeyForMenu;
delete KeyForMenu;
@ -272,12 +267,10 @@ void RefreshPanelMisc()
chkStatusLine->setSelected(changed_prefs.leds_on_screen);
chkShowGUI->setSelected(changed_prefs.start_gui);
chkBSDSocket->setSelected(changed_prefs.socket_emu);
#ifdef RASPBERRY
cboKBDLed_num->setSelected(changed_prefs.kbd_led_num);
cboKBDLed_scr->setSelected(changed_prefs.kbd_led_scr);
#endif
KeyForMenu->setSelected(GetControlKeyIndex(changed_prefs.key_for_menu));
KeyForQuit->setSelected(GetControlKeyIndex(changed_prefs.key_for_quit));
ButtonForMenu->setSelected(GetControlButtonIndex(changed_prefs.button_for_menu));

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

@ -18,7 +18,7 @@
#define DIALOG_WIDTH 520
#define DIALOG_HEIGHT 400
#if defined(RASPBERRY) || defined(ANDROID)
#if defined(AMIBERRY) || defined(ANDROID)
#define FILE_SELECT_KEEP_POSITION
#endif

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

@ -423,7 +423,7 @@ int loadconfig_old(struct uae_prefs* p, const char* orgpath)
int dummy;
fscanf(f, "kickstart=%d\n", &kickstart);
#if defined(RASPBERRY) || defined(ANDROIDSDL)
#if defined(AMIBERRY) || defined(ANDROIDSDL)
fscanf(f, "scaling=%d\n", &dummy);
#else
fscanf(f, "scaling=%d\n", &mainMenu_enableHWscaling);
@ -431,7 +431,7 @@ int loadconfig_old(struct uae_prefs* p, const char* orgpath)
fscanf(f, "showstatus=%d\n", &p->leds_on_screen);
fscanf(f, "mousemultiplier=%d\n", &p->input_joymouse_multiplier);
p->input_joymouse_multiplier *= 10;
#if defined(RASPBERRY) || defined(ANDROIDSDL)
#if defined(AMIBERRY) || defined(ANDROIDSDL)
fscanf(f, "systemclock=%d\n", &dummy); // mainMenu_throttle never changes -> removed
fscanf(f, "syncthreshold=%d\n", &dummy); // timeslice_mode never changes -> removed
#else

8
src/osdep/picasso96.cpp
View file

@ -800,7 +800,7 @@ void picasso_refresh()
#define BLT_FUNC(s,d) *d = (*s) | (*d)
#include "p96_blit.cpp"
#define BLT_NAME BLIT_TRUE_32
#ifdef RASPBERRY
#ifdef AMIBERRY
#define BLT_FUNC(s,d) memset(d, 0xff, sizeof (*d))
#else
#define BLT_FUNC(s,d) *d = 0xffffffff
@ -855,7 +855,7 @@ void picasso_refresh()
#define BLT_FUNC(s,d) *d = (*s) | (*d)
#include "p96_blit.cpp"
#define BLT_NAME BLIT_TRUE_24
#ifdef RASPBERRY
#ifdef AMIBERRY
#define BLT_FUNC(s,d) memset(d, 0xff, sizeof (*d))
#else
#define BLT_FUNC(s,d) *d = 0xffffffff
@ -910,7 +910,7 @@ void picasso_refresh()
#define BLT_FUNC(s,d) *d = (*s) | (*d)
#include "p96_blit.cpp"
#define BLT_NAME BLIT_TRUE_16
#ifdef RASPBERRY
#ifdef AMIBERRY
#define BLT_FUNC(s,d) memset(d, 0xff, sizeof (*d))
#else
#define BLT_FUNC(s,d) *d = 0xffffffff
@ -965,7 +965,7 @@ void picasso_refresh()
#define BLT_FUNC(s,d) *d = (*s) | (*d)
#include "p96_blit.cpp"
#define BLT_NAME BLIT_TRUE_8
#ifdef RASPBERRY
#ifdef AMIBERRY
#define BLT_FUNC(s,d) memset(d, 0xff, sizeof (*d))
#else
#define BLT_FUNC(s,d) *d = 0xffffffff

2
src/osdep/sysconfig.h
View file

@ -31,7 +31,7 @@
#define CPUEMU_11 /* 68000+prefetch emulation */
/* #define CPUEMU_12 */ /* cycle-exact cpu&blitter */
/* #define ACTION_REPLAY */ /* Action Replay 1/2/3 support */
/* #define PICASSO96 */ /* Picasso96 display card emulation */
#define PICASSO96 /* Picasso96 display card emulation */
/* #define UAEGFX_INTERNAL */ /* built-in libs:picasso96/uaegfx.card */
#define BSDSOCKET /* bsdsocket.library emulation */
/* #define CAPS */ /* CAPS-image support */

317
src/sounddep/sound.cpp
View file

@ -1,317 +0,0 @@
/*
* Minimalistic sound.c implementation for gp2x
* (c) notaz, 2007
*/
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/ioctl.h>
#include <sys/soundcard.h>
#include <semaphore.h>
#include <pthread.h>
#include <errno.h>
#include <sched.h>
#include "sysconfig.h"
#include "sysdeps.h"
#include "uae.h"
#include "options.h"
#include "memory.h"
#include "newcpu.h"
#include "custom.h"
#include "audio.h"
#include "gensound.h"
#include "sd-pandora/sound.h"
#include "savestate.h"
uae_u16 sndbuffer[4][(SNDBUFFER_LEN+32)*DEFAULT_SOUND_CHANNELS];
uae_u16 *sndbufpt = sndbuffer[0];
uae_u16 *render_sndbuff = sndbuffer[0];
uae_u16 *finish_sndbuff = sndbuffer[0] + SNDBUFFER_LEN*2;
uae_u16 cdaudio_buffer[CDAUDIO_BUFFERS][(CDAUDIO_BUFFER_LEN + 32) * 2];
uae_u16 *cdbufpt = cdaudio_buffer[0];
uae_u16 *render_cdbuff = cdaudio_buffer[0];
uae_u16 *finish_cdbuff = cdaudio_buffer[0] + CDAUDIO_BUFFER_LEN * 2;
bool cdaudio_active = false;
static int cdwrcnt = 0;
static int cdrdcnt = 0;
static int have_sound = 0;
static int lastfreq;
void update_sound (float clk)
{
float evtime;
evtime = clk * CYCLE_UNIT / (float)currprefs.sound_freq;
scaled_sample_evtime = (int)evtime;
}
static int sounddev = -1, s_oldrate = 0, s_oldbits = 0, s_oldstereo = 0;
static int sound_thread_active = 0, sound_thread_exit = 0;
static sem_t sound_sem;
static sem_t sound_out_sem;
static int output_cnt = 0;
static int wrcnt = 0;
static void *sound_thread(void *unused)
{
int cnt = 0, sem_val = 0;
sound_thread_active = 1;
for (;;)
{
sem_getvalue(&sound_sem, &sem_val);
while (sem_val > 1)
{
sem_wait(&sound_sem);
sem_getvalue(&sound_sem, &sem_val);
}
sem_wait(&sound_sem);
if (sound_thread_exit)
break;
cnt = output_cnt;
sem_post(&sound_out_sem);
if(currprefs.sound_stereo) {
if(cdaudio_active && currprefs.sound_freq == 44100 && cdrdcnt < cdwrcnt) {
for(int i=0; i<SNDBUFFER_LEN * 2; ++i)
sndbuffer[cnt&3][i] += cdaudio_buffer[cdrdcnt & (CDAUDIO_BUFFERS - 1)][i];
cdrdcnt++;
}
write(sounddev, sndbuffer[cnt&3], SNDBUFFER_LEN * 2);
}
else
write(sounddev, sndbuffer[cnt&3], SNDBUFFER_LEN);
}
cdrdcnt = cdwrcnt;
sound_thread_active = 0;
sem_post(&sound_out_sem);
return NULL;
}
static void init_soundbuffer_usage(void)
{
sndbufpt = sndbuffer[0];
render_sndbuff = sndbuffer[0];
finish_sndbuff = sndbuffer[0] + SNDBUFFER_LEN * 2;
output_cnt = 0;
wrcnt = 0;
cdbufpt = cdaudio_buffer[0];
render_cdbuff = cdaudio_buffer[0];
finish_cdbuff = cdaudio_buffer[0] + CDAUDIO_BUFFER_LEN * 2;
cdrdcnt = 0;
cdwrcnt = 0;
}
static int pandora_start_sound(int rate, int bits, int stereo)
{
int frag = 0, buffers, ret;
unsigned int bsize;
if (!sound_thread_active)
{
// init sem, start sound thread
pthread_t thr;
init_soundbuffer_usage();
s_oldrate = 0;
s_oldbits = 0;
s_oldstereo = 0;
sound_thread_exit = 0;
ret = sem_init(&sound_sem, 0, 0);
if (ret != 0)
write_log("sem_init() failed: %i, errno=%i\n", ret, errno);
sem_init(&sound_out_sem, 0, 0);
ret = pthread_create(&thr, NULL, sound_thread, NULL);
if (ret != 0)
write_log("pthread_create() failed: %i\n", ret);
pthread_detach(thr);
}
if (sounddev <= 0)
{
sounddev = open("/dev/dsp", O_WRONLY);
if (sounddev == -1)
{
write_log("open(\"/dev/dsp\") failed with %i\n", errno);
return -1;
}
}
// if no settings change, we don't need to do anything
if (rate == s_oldrate && s_oldbits == bits && s_oldstereo == stereo)
return 0;
ioctl(sounddev, SNDCTL_DSP_SPEED, &rate);
ioctl(sounddev, SNDCTL_DSP_SETFMT, &bits);
ioctl(sounddev, SNDCTL_DSP_STEREO, &stereo);
// calculate buffer size
buffers = 16;
bsize = rate / 32;
if (rate > 22050) { bsize*=4; buffers*=2; } // 44k mode seems to be very demanding
while ((bsize>>=1)) frag++;
frag |= buffers<<16; // 16 buffers
ioctl(sounddev, SNDCTL_DSP_SETFRAGMENT, &frag);
s_oldrate = rate;
s_oldbits = bits;
s_oldstereo = stereo;
usleep(100000);
return 0;
}
// this is meant to be called only once on exit
void pandora_stop_sound(void)
{
if (sound_thread_exit)
printf("don't call pandora_stop_sound more than once!\n");
if (sound_thread_active)
{
sound_thread_exit = 1;
sem_post(&sound_sem);
sem_wait(&sound_out_sem);
sem_destroy(&sound_sem);
sem_destroy(&sound_out_sem);
}
if (sounddev > 0)
close(sounddev);
sounddev = -1;
}
void finish_sound_buffer (void)
{
output_cnt = wrcnt;
sem_post(&sound_sem);
sem_wait(&sound_out_sem);
wrcnt++;
sndbufpt = render_sndbuff = sndbuffer[wrcnt&3];
if(currprefs.sound_stereo)
finish_sndbuff = sndbufpt + SNDBUFFER_LEN;
else
finish_sndbuff = sndbufpt + SNDBUFFER_LEN/2;
}
void pause_sound_buffer (void)
{
reset_sound ();
}
void restart_sound_buffer(void)
{
sndbufpt = render_sndbuff = sndbuffer[wrcnt&3];
if(currprefs.sound_stereo)
finish_sndbuff = sndbufpt + SNDBUFFER_LEN;
else
finish_sndbuff = sndbufpt + SNDBUFFER_LEN/2;
cdbufpt = render_cdbuff = cdaudio_buffer[cdwrcnt & (CDAUDIO_BUFFERS - 1)];
finish_cdbuff = cdbufpt + CDAUDIO_BUFFER_LEN * 2;
}
void finish_cdaudio_buffer (void)
{
cdwrcnt++;
cdbufpt = render_cdbuff = cdaudio_buffer[cdwrcnt & (CDAUDIO_BUFFERS - 1)];
finish_cdbuff = cdbufpt + CDAUDIO_BUFFER_LEN;
audio_activate();
}
bool cdaudio_catchup(void)
{
while((cdwrcnt > cdrdcnt + CDAUDIO_BUFFERS - 10) && (sound_thread_active != 0) && (quit_program == 0)) {
sleep_millis(10);
}
return (sound_thread_active != 0);
}
/* Try to determine whether sound is available. This is only for GUI purposes. */
int setup_sound (void)
{
if (pandora_start_sound(currprefs.sound_freq, 16, currprefs.sound_stereo) != 0)
return 0;
sound_available = 1;
return 1;
}
static int open_sound (void)
{
if (pandora_start_sound(currprefs.sound_freq, 16, currprefs.sound_stereo) != 0)
return 0;
have_sound = 1;
sound_available = 1;
if(currprefs.sound_stereo)
sample_handler = sample16s_handler;
else
sample_handler = sample16_handler;
return 1;
}
void close_sound (void)
{
if (!have_sound)
return;
// testing shows that reopenning sound device is not a good idea on pandora (causes random sound driver crashes)
// we will close it on real exit instead
//pandora_stop_sound();
have_sound = 0;
}
int init_sound (void)
{
have_sound=open_sound();
return have_sound;
}
void pause_sound (void)
{
/* nothing to do */
}
void resume_sound (void)
{
/* nothing to do */
}
void reset_sound (void)
{
if (!have_sound)
return;
init_soundbuffer_usage();
clear_sound_buffers();
clear_cdaudio_buffers();
}
void sound_volume (int dir)
{
}

2
src/sounddep/sound_sdl_new.cpp
View file

@ -384,7 +384,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
#ifdef AMIBERRY
//amiberry_stop_sound();
#endif
have_sound = 0;