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

Fixes after merge

Browse source
This commit is contained in:
Dimitris Panokostas 2017-09-27 22:37:23 +02:00
parent 6cfac026cd
commit bf1e07c5a9
14 changed files with 83 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

47
Makefile
View file

@ -4,12 +4,26 @@ endif
ifeq ($(PLATFORM),rpi3)
CPU_FLAGS += -march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard
MORE_CFLAGS += -DARMV6T2 -DUSE_ARMNEON
MORE_CFLAGS += -DARMV6T2 -DUSE_ARMNEON -DCAPSLOCK_DEBIAN_WORKAROUND
MORE_CFLAGS += -I/opt/vc/include -I/opt/vc/include/interface/vmcs_host/linux -I/opt/vc/include/interface/vcos/pthreads
LDFLAGS += -lbcm_host -lvchiq_arm -lvcos -llzma -lfreetype -logg -lm -L/opt/vc/lib
PROFILER_PATH = /home/pi/projects/amiberry
else ifeq ($(PLATFORM),rpi2)
CPU_FLAGS += -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard
MORE_CFLAGS += -DARMV6T2 -DUSE_ARMNEON
MORE_CFLAGS += -DARMV6T2 -DUSE_ARMNEON -DCAPSLOCK_DEBIAN_WORKAROUND
MORE_CFLAGS += -I/opt/vc/include -I/opt/vc/include/interface/vmcs_host/linux -I/opt/vc/include/interface/vcos/pthreads
LDFLAGS += -lbcm_host -lvchiq_arm -lvcos -llzma -lfreetype -logg -lm -L/opt/vc/lib
PROFILER_PATH = /home/pi/projects/amiberry
else ifeq ($(PLATFORM),rpi1)
CPU_FLAGS += -march=armv6zk -mfpu=vfp -mfloat-abi=hard
MORE_CFLAGS += -DCAPSLOCK_DEBIAN_WORKAROUND
MORE_CFLAGS += -I/opt/vc/include -I/opt/vc/include/interface/vmcs_host/linux -I/opt/vc/include/interface/vcos/pthreads
LDFLAGS += -lbcm_host -lvchiq_arm -lvcos -llzma -lfreetype -logg -lm -L/opt/vc/lib
PROFILER_PATH = /home/pi/projects/amiberry
else ifeq ($(PLATFORM),Pandora)
CPU_FLAGS += -march=armv7-a -mfpu=neon -mfloat-abi=softfp
MORE_CFLAGS += -DARMV6T2 -DUSE_ARMNEON -DPANDORA -msoft-float
PROFILER_PATH = /media/MAINSD/pandora/test
endif
NAME = amiberry-sdl2
@ -25,24 +39,22 @@ all: guisan $(PROG)
guisan:
$(MAKE) -C src/guisan
#DEBUG=1
DEBUG=1
SDL_CFLAGS = `sdl2-config --cflags --libs`
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 += -DAMIBERRY -DCPU_arm -DARMV6_ASSEMBLY
DEFS += -DUSE_SDL
MORE_CFLAGS += -Isrc -Isrc/osdep -Isrc/threaddep -Isrc/include -Isrc/guisan/include
MORE_CFLAGS += -Isrc -Isrc/osdep -Isrc/threaddep -Isrc/include -Isrc/guisan/include -Isrc/archivers
MORE_CFLAGS += -fdiagnostics-color=auto
MORE_CFLAGS += -mstructure-size-boundary=32
MORE_CFLAGS += -falign-functions=32
MORE_CFLAGS += -std=gnu++14 -pipe
MORE_CFLAGS += -std=gnu++14
LDFLAGS += -lpthread -lz -lpng -lrt -lxml2 -lFLAC -lmpg123 -ldl -lmpeg2convert -lmpeg2
LDFLAGS += -lSDL2 -lSDL2_image -lSDL2_ttf -lguisan -L/opt/vc/lib -Lsrc/guisan/lib
LDFLAGS += -lSDL2 -lSDL2_image -lSDL2_ttf -lguisan -Lsrc/guisan/lib
ifndef DEBUG
MORE_CFLAGS += -Ofast -pipe
@ -50,8 +62,6 @@ MORE_CFLAGS += -fweb -frename-registers
MORE_CFLAGS += -funroll-loops -ftracer -funswitch-loops
else
MORE_CFLAGS += -g -rdynamic -funwind-tables -mapcs-frame -DDEBUG -Wl,--export-dynamic
#MORE_CFLAGS += -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free
#LDFLAGS += -ltcmalloc -lprofiler
endif
@ -167,8 +177,8 @@ OBJS = \
src/osdep/cda_play.o \
src/osdep/charset.o \
src/osdep/fsdb_host.o \
src/osdep/hardfile_amiberry.o \
src/osdep/keyboard_amiberry.o \
src/osdep/amiberry_hardfile.o \
src/osdep/keyboard.o \
src/osdep/mp3decoder.o \
src/osdep/picasso96.o \
src/osdep/writelog.o \
@ -211,11 +221,7 @@ OBJS = \
src/osdep/gui/main_window.o \
src/osdep/gui/Navigation.o
ifeq ($(PLATFORM),rpi1)
OBJS += src/osdep/arm_helper.o
else
OBJS += src/osdep/neon_helper.o
endif
OBJS += src/osdep/neon_helper.o
OBJS += src/newcpu.o
OBJS += src/newcpu_common.o
@ -233,10 +239,7 @@ OBJS += src/jit/compemu_fpp.o
OBJS += src/jit/compemu_support.o
src/osdep/neon_helper.o: src/osdep/neon_helper.s
$(CXX) -falign-functions=32 $(CPU_FLAGS) -Wall -o src/osdep/neon_helper.o -c src/osdep/neon_helper.s
src/osdep/arm_helper.o: src/osdep/arm_helper.s
$(CXX) -falign-functions=32 $(CPU_FLAGS) -Wall -o src/osdep/arm_helper.o -c src/osdep/arm_helper.s
$(CXX) $(CPU_FLAGS) -Wall -o src/osdep/neon_helper.o -c src/osdep/neon_helper.s
$(PROG): $(OBJS)
$(CXX) $(CXXFLAGS) -o $(PROG) $(OBJS) $(LDFLAGS)

18
VSLinux/Amiberry.vcxproj
View file

@ -51,8 +51,8 @@
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<RemoteBuildCommandLine>cd ~/projects/Amiberry; make -j4</RemoteBuildCommandLine>
<RemoteReBuildCommandLine>cd ~/projects/Amiberry; make clean; make -j4</RemoteReBuildCommandLine>
<RemoteBuildCommandLine>cd ~/projects/Amiberry; make -j3</RemoteBuildCommandLine>
<RemoteReBuildCommandLine>cd ~/projects/Amiberry; make clean; make -j3</RemoteReBuildCommandLine>
<RemoteCleanCommandLine>cd ~/projects/Amiberry; make clean</RemoteCleanCommandLine>
<NMakeIncludeSearchPath>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:\GitHub\amiberry\src;C:\GitHub\amiberry\src\include;C:\GitHub\amiberry\src\osdep;C:\GitHub\amiberry\src\threaddep;C:\GitHub\amiberry\src\guisan\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\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<NMakePreprocessorDefinitions>DEBUG;ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;CAPSLOCK_DEBIAN_WORKAROUND;USE_SDL;_REENTRANT;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
@ -413,8 +413,8 @@
<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_amiberry.cpp" />
<ClCompile Include="..\src\osdep\keyboard_amiberry.cpp" />
<ClCompile Include="..\src\osdep\amiberry_hardfile.cpp" />
<ClCompile Include="..\src\osdep\keyboard.cpp" />
<ClCompile Include="..\src\osdep\mp3decoder.cpp" />
<ClCompile Include="..\src\osdep\picasso96.cpp" />
<ClCompile Include="..\src\osdep\sigsegv_handler.cpp" />
@ -518,19 +518,16 @@
<ClInclude Include="..\src\include\calc.h" />
<ClInclude Include="..\src\include\cd32_fmv.h" />
<ClInclude Include="..\src\include\cia.h" />
<ClInclude Include="..\src\include\clipboard.h" />
<ClInclude Include="..\src\include\commpipe.h" />
<ClInclude Include="..\src\include\cpummu.h" />
<ClInclude Include="..\src\include\cputbl.h" />
<ClInclude Include="..\src\include\cpu_prefetch.h" />
<ClInclude Include="..\src\include\crc32.h" />
<ClInclude Include="..\src\include\custom.h" />
<ClInclude Include="..\src\include\debug.h" />
<ClInclude Include="..\src\include\devices.h" />
<ClInclude Include="..\src\include\disk.h" />
<ClInclude Include="..\src\include\diskutil.h" />
<ClInclude Include="..\src\include\drawing.h" />
<ClInclude Include="..\src\include\ersatz.h" />
<ClInclude Include="..\src\include\events.h" />
<ClInclude Include="..\src\include\execio.h" />
<ClInclude Include="..\src\include\execlib.h" />
@ -538,8 +535,6 @@
<ClInclude Include="..\src\include\filesys.h" />
<ClInclude Include="..\src\include\flags_arm.h" />
<ClInclude Include="..\src\include\flashrom.h" />
<ClInclude Include="..\src\include\fpp-ieee-be.h" />
<ClInclude Include="..\src\include\fpp-unknown.h" />
<ClInclude Include="..\src\include\fpp.h" />
<ClInclude Include="..\src\include\fsdb.h" />
<ClInclude Include="..\src\include\fsusage.h" />
@ -559,15 +554,12 @@
<ClInclude Include="..\src\include\native2amiga_api.h" />
<ClInclude Include="..\src\include\newcpu.h" />
<ClInclude Include="..\src\include\options.h" />
<ClInclude Include="..\src\include\osemu.h" />
<ClInclude Include="..\src\include\picasso96.h" />
<ClInclude Include="..\src\include\readcpu.h" />
<ClInclude Include="..\src\include\rommgr.h" />
<ClInclude Include="..\src\include\rtc.h" />
<ClInclude Include="..\src\include\rtgmodes.h" />
<ClInclude Include="..\src\include\savestate.h" />
<ClInclude Include="..\src\include\scsi.h" />
<ClInclude Include="..\src\include\scsidev.h" />
<ClInclude Include="..\src\include\statusline.h" />
<ClInclude Include="..\src\include\sysdeps.h" />
<ClInclude Include="..\src\include\traps.h" />
@ -591,7 +583,6 @@
<ClInclude Include="..\src\jit\comptbl.h" />
<ClInclude Include="..\src\machdep\m68k.h" />
<ClInclude Include="..\src\machdep\maccess.h" />
<ClInclude Include="..\src\machdep\md-fpp.h" />
<ClInclude Include="..\src\machdep\rpt.h" />
<ClInclude Include="..\src\osdep\amiberry_gfx.h" />
<ClInclude Include="..\src\osdep\amiberry_rp9.h" />
@ -604,6 +595,7 @@
<ClInclude Include="..\src\osdep\gui\UaeListBox.hpp" />
<ClInclude Include="..\src\osdep\gui\UaeRadioButton.hpp" />
<ClInclude Include="..\src\osdep\mp3decoder.h" />
<ClInclude Include="..\src\osdep\picasso96.h" />
<ClInclude Include="..\src\osdep\sysconfig.h" />
<ClInclude Include="..\src\osdep\target.h" />
<ClInclude Include="..\src\softfloat\softfloat-macros.h" />

42
VSLinux/Amiberry.vcxproj.filters
View file

@ -486,12 +486,6 @@
<ClCompile Include="..\src\osdep\fsdb_host.cpp">
<Filter>src\osdep</Filter>
</ClCompile>
<ClCompile Include="..\src\osdep\hardfile_amiberry.cpp">
<Filter>src\osdep</Filter>
</ClCompile>
<ClCompile Include="..\src\osdep\keyboard_amiberry.cpp">
<Filter>src\osdep</Filter>
</ClCompile>
<ClCompile Include="..\src\osdep\mp3decoder.cpp">
<Filter>src\osdep</Filter>
</ClCompile>
@ -741,6 +735,12 @@
<ClCompile Include="..\src\archivers\7z\7zIn.cpp">
<Filter>src\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\src\osdep\keyboard.cpp">
<Filter>src\osdep</Filter>
</ClCompile>
<ClCompile Include="..\src\osdep\amiberry_hardfile.cpp">
<Filter>src\osdep</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\archivers\7z\7zBuf.h">
@ -845,9 +845,6 @@
<ClInclude Include="..\src\include\cia.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\clipboard.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\commpipe.h">
<Filter>src\include</Filter>
</ClInclude>
@ -863,9 +860,6 @@
<ClInclude Include="..\src\include\custom.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\debug.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\disk.h">
<Filter>src\include</Filter>
</ClInclude>
@ -875,9 +869,6 @@
<ClInclude Include="..\src\include\drawing.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\ersatz.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\events.h">
<Filter>src\include</Filter>
</ClInclude>
@ -893,12 +884,6 @@
<ClInclude Include="..\src\include\flags_arm.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\fpp-ieee-be.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\fpp-unknown.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\fsdb.h">
<Filter>src\include</Filter>
</ClInclude>
@ -944,12 +929,6 @@
<ClInclude Include="..\src\include\options.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\osemu.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\picasso96.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\readcpu.h">
<Filter>src\include</Filter>
</ClInclude>
@ -965,9 +944,6 @@
<ClInclude Include="..\src\include\scsi.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\scsidev.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\statusline.h">
<Filter>src\include</Filter>
</ClInclude>
@ -1013,9 +989,6 @@
<ClInclude Include="..\src\machdep\maccess.h">
<Filter>src\machdep</Filter>
</ClInclude>
<ClInclude Include="..\src\machdep\md-fpp.h">
<Filter>src\machdep</Filter>
</ClInclude>
<ClInclude Include="..\src\machdep\rpt.h">
<Filter>src\machdep</Filter>
</ClInclude>
@ -1199,6 +1172,9 @@
<ClInclude Include="..\src\include\ar.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\osdep\picasso96.h">
<Filter>src\osdep</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\src\archivers\7z\7zVersion.rc">

2
src/include/uae.h
View file

@ -31,7 +31,7 @@ extern void target_addtorecent (const TCHAR*, int);
extern void target_run (void);
extern void target_quit (void);
extern void target_restart (void);
extern void target_startup_msg(TCHAR *title, TCHAR *msg);
extern void target_startup_msg(const TCHAR *title, const TCHAR *msg);
extern void stripslashes (TCHAR *p);
extern void fixtrailing (TCHAR *p);
extern void getpathpart (TCHAR *outpath, int size, const TCHAR *inpath);

4
src/main.cpp
View file

@ -691,10 +691,8 @@ static void initialize_sdl2()
static int real_main2 (int argc, TCHAR **argv)
{
printf("Amiberry-SDL2 by Dimitris (MiDWaN) Panokostas\n");
initialize_sdl2();
keyboard_settrans();
set_config_changed();
if (restart_config[0]) {
default_prefs(&currprefs, true, 0);

2
src/osdep/hardfile_amiberry.cpp → src/osdep/amiberry_hardfile.cpp
View file

@ -38,7 +38,7 @@ struct uae_driveinfo {
#define CACHE_SIZE 16384
#define CACHE_FLUSH_TIME 5
static TCHAR *hdz[] = { _T("hdz"), _T("zip"), NULL };
static const TCHAR *hdz[] = { _T("hdz"), _T("zip"), NULL };
int hdf_open_target(struct hardfiledata *hfd, const TCHAR *pname)
{

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

@ -37,7 +37,8 @@ bool LoadConfigByName(const char* name)
{
if(emulating) {
uae_restart(-1, config->FullPath);
} else {
}
else {
txtName->setText(config->Name);
txtDesc->setText(config->Description);
target_cfgfile_load(&changed_prefs, config->FullPath, 0, 0);
@ -45,6 +46,7 @@ bool LoadConfigByName(const char* name)
DisableResume();
RefreshAllPanels();
}
}
return false;
}

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

@ -33,8 +33,10 @@ static gcn::UaeDropDown* cboAutofire;
static gcn::Label* lblMouseSpeed;
static gcn::Label* lblMouseSpeedInfo;
static gcn::Slider* sldMouseSpeed;
#ifdef PANDORA
static gcn::Label *lblTapDelay;
static gcn::UaeDropDown* cboTapDelay;
#endif
static gcn::UaeCheckBox* chkMouseHack;
static gcn::UaeCheckBox* chkCustomCtrl;
@ -259,7 +261,7 @@ public:
changed_prefs.input_joymouse_multiplier = mousespeed_values[int(sldMouseSpeed->getValue())];
RefreshPanelInput();
}
#ifdef PANDORA
else if (actionEvent.getSource() == cboTapDelay)
{
if(cboTapDelay->getSelected() == 0)
@ -269,7 +271,7 @@ public:
else
changed_prefs.pandora_tapDelay = 2;
}
#endif
else if (actionEvent.getSource() == chkMouseHack)
{
changed_prefs.input_tablet = chkMouseHack->isSelected() ? TABLET_MOUSEHACK : TABLET_OFF;
@ -457,6 +459,7 @@ void InitPanelInput(const struct _ConfigCategory& category)
sldMouseSpeed->addActionListener(inputActionListener);
lblMouseSpeedInfo = new gcn::Label(".25");
#ifdef PANDORA
lblTapDelay = new gcn::Label("Tap Delay:");
lblTapDelay->setSize(100, LABEL_HEIGHT);
lblTapDelay->setAlignment(gcn::Graphics::RIGHT);
@ -465,6 +468,7 @@ void InitPanelInput(const struct _ConfigCategory& category)
cboTapDelay->setBaseColor(gui_baseCol);
cboTapDelay->setId("cboTapDelay");
cboTapDelay->addActionListener(inputActionListener);
#endif
chkMouseHack = new gcn::UaeCheckBox("Enable mousehack");
chkMouseHack->setId("MouseHack");
@ -634,10 +638,13 @@ void InitPanelInput(const struct _ConfigCategory& category)
posY += sldMouseSpeed->getHeight() + DISTANCE_NEXT_Y * 2;
category.panel->add(chkMouseHack, DISTANCE_BORDER + lblA->getWidth() + 8, posY);
#ifdef PANDORA
category.panel->add(lblTapDelay, 300, posY);
category.panel->add(cboTapDelay, 300 + lblTapDelay->getWidth() + 8, posY);
posY += cboTapDelay->getHeight() + DISTANCE_NEXT_Y;
#else
posY += chkMouseHack->getHeight() + DISTANCE_NEXT_Y;
#endif
category.panel->add(chkCustomCtrl, DISTANCE_BORDER + lblA->getWidth() + 8, posY);
posY += chkCustomCtrl->getHeight() + DISTANCE_NEXT_Y;
category.panel->add(lblA, DISTANCE_BORDER, posY);
@ -687,8 +694,10 @@ void ExitPanelInput()
delete lblMouseSpeed;
delete sldMouseSpeed;
delete lblMouseSpeedInfo;
#ifdef PANDORA
delete lblTapDelay;
delete cboTapDelay;
#endif
delete chkMouseHack;
delete chkCustomCtrl;
@ -784,13 +793,14 @@ void RefreshPanelInput()
break;
}
}
#ifdef PANDORA
if (changed_prefs.pandora_tapDelay == 10)
cboTapDelay->setSelected(0);
else if (changed_prefs.pandora_tapDelay == 5)
cboTapDelay->setSelected(1);
else
cboTapDelay->setSelected(2);
#endif
chkMouseHack->setSelected(changed_prefs.input_tablet == TABLET_MOUSEHACK);
chkCustomCtrl->setSelected(changed_prefs.customControls);

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

@ -24,7 +24,7 @@ static TCHAR startup_title[MAX_STARTUP_TITLE] = _T("");
static TCHAR startup_message[MAX_STARTUP_MESSAGE] = _T("");
void target_startup_msg(TCHAR* title, TCHAR* msg)
void target_startup_msg(const TCHAR* title, const TCHAR* msg)
{
_tcsncpy(startup_title, title, MAX_STARTUP_TITLE);
_tcsncpy(startup_message, msg, MAX_STARTUP_MESSAGE);

8
src/osdep/picasso96.h
View file

@ -645,9 +645,11 @@ extern int p96hsync_counter;
#ifdef __cplusplus
extern "C" {
#endif
void copy_screen_8bit(uae_u8 *dst, uae_u8 *src, int bytes, uae_u32 *clut);
void copy_screen_16bit_swap(uae_u8 *dst, uae_u8 *src, int bytes);
void copy_screen_32bit_to_16bit(uae_u8 *dst, uae_u8 *src, int bytes);
void copy_screen_8bit(uae_u8 *dst, uae_u8 *src, int bytes, uae_u32 *clut);
void copy_screen_16bit_swap(uae_u8 *dst, uae_u8 *src, int bytes);
void copy_screen_16bit_swap_arm(uae_u8 *dst, uae_u8 *src, int bytes);
void copy_screen_32bit_to_16bit_neon(uae_u8 *dst, uae_u8 *src, int bytes);
void copy_screen_32bit_to_16bit_arm(uae_u8 *dst, uae_u8 *src, int bytes);
#ifdef __cplusplus
}
#endif

2
src/sounddep/sound.cpp
View file

@ -219,7 +219,7 @@ bool cdaudio_catchup(void)
/* 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)
if (amiberry_start_sound(currprefs.sound_freq, 16, currprefs.sound_stereo) != 0)
return 0;
sound_available = 1;

1
src/sounddep/sound.h
View file

@ -6,6 +6,7 @@
* Copyright 1997 Bernd Schmidt
*/
#pragma once
#define DEFAULT_SOUND_CHANNELS 2
#define SOUND_BUFFERS_COUNT 4

9
src/statusline.cpp
View file

@ -66,15 +66,20 @@ 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;
#ifdef PANDORA
if(currprefs.pandora_hide_idle_led)
x += TD_WIDTH;
#endif
if(picasso_on)
memset (buf + (x - 4) * 2, 0, (prSDLScreen->w - x + 4) * 2);
memset (buf + (x - 4) * 2, 0, (screen->w - x + 4) * 2);
else
memset (buf + (x - 4) * gfxvidinfo.drawbuffer.pixbytes, 0, (gfxvidinfo.drawbuffer.outwidth - x + 4) * gfxvidinfo.drawbuffer.pixbytes);
#ifdef PANDORA
for (led = (currprefs.pandora_hide_idle_led == 0) ? -2 : -1; led < (currprefs.nr_floppies+1); led++) {
#else
for (led = -2; led < (currprefs.nr_floppies + 1); led++) {
#endif
int num1 = -1, num2 = -1, num3 = -1;
if (led == 0 && nr_units() < 1)

5
src/traps.cpp
View file

@ -107,10 +107,9 @@ unsigned int define_trap(TrapHandler handler_func, int flags, const TCHAR *name)
target_startup_msg(_T("Internal error"), _T("Ran out of emulator traps."));
uae_restart(1, nullptr);
return -1;
} else {
}
int i;
unsigned int trap_num;
struct Trap *trap;
uaecptr addr = here();
for (int i = 0; i < trap_count; i++) {