Merge branch 'master' into 1500-add-physical-cd-drive-support

# Conflicts:
#	src/osdep/amiberry.cpp
#	src/osdep/gui/PanelHD.cpp
#	src/osdep/gui/PanelQuickstart.cpp

.github/workflows/c-cpp.yml

@@ -58,6 +58,11 @@ jobs:
               codesign -s "Developer ID Application: Dimitris Panokostas (5GQP72592A)" -f -o runtime,hard $file
             fi
           done
+          for file in build/Amiberry.app/Contents/Resources/plugins/*.dylib; do
+            if [ -f "$file" ]; then
+              codesign -s "Developer ID Application: Dimitris Panokostas (5GQP72592A)" -f -o runtime,hard $file
+            fi
+          done
 
       - name: Codesign the app
         run: |
@@ -140,6 +145,11 @@ jobs:
               codesign -s "Developer ID Application: Dimitris Panokostas (5GQP72592A)" -f -o runtime,hard $file
             fi
           done
+          for file in build/Amiberry.app/Contents/Resources/plugins/*.dylib; do
+            if [ -f "$file" ]; then
+              codesign -s "Developer ID Application: Dimitris Panokostas (5GQP72592A)" -f -o runtime,hard $file
+            fi
+          done
 
       - name: Codesign the app
         run: |

CMakeLists.txt

@@ -9,7 +9,7 @@ endif ()
 option(USE_GPIOD "Use GPIOD" OFF)
 # Use DBUS to control the emulator?
 option(USE_DBUS "Use DBus" OFF)
-# Use OpenGL for rendering?
+# Use OpenGL for rendering? NOTE: Not yet implemented
 option(USE_OPENGL "Use OpenGL" OFF)
 # Enable Link Time Optimization?
 option(WITH_LTO "Enable Link Time Optimization" OFF)
@@ -18,7 +18,7 @@ option(WITH_LTO "Enable Link Time Optimization" OFF)
 set(VERSION_MAJOR "7")
 set(VERSION_MINOR "0")
 set(VERSION_PATCH "0")
-set(VERSION_PRE_RELEASE "RC1")
+set(VERSION_PRE_RELEASE "RC2")
 
 set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 

cmake/SourceFiles.cmake

@@ -68,6 +68,7 @@ set(SOURCE_FILES
         src/luascript.cpp
         src/main.cpp
         src/memory.cpp
+        src/mos6502.cpp
         src/midiemu.cpp
         src/native2amiga.cpp
         src/ncr9x_scsi.cpp
@@ -194,6 +195,12 @@ set(SOURCE_FILES
         src/caps/caps_amiberry.cpp
         src/dsp3210/dsp_glue.cpp
         src/dsp3210/DSP3210_emulation.cpp
+        src/kbmcu/8048/co8048.cpp
+        src/kbmcu/keyboard_mcu_6500_1.cpp
+        src/kbmcu/keyboard_mcu_6805.cpp
+        src/kbmcu/keyboard_mcu_d8039hlc.cpp
+        src/kbmcu/m6805/m68_ops.cpp
+        src/kbmcu/m6805/m68emu.cpp
         src/machdep/support.cpp
         src/mame/a2410.cpp
         src/mame/tm34010/tms34010.cpp

cmake/macos/CMakeLists.txt

@@ -21,21 +21,21 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
 add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_if_different
         $<TARGET_FILE:capsimage>
-        $<TARGET_FILE_DIR:${PROJECT_NAME}>/../Frameworks/$<TARGET_FILE_NAME:capsimage>)
+        $<TARGET_FILE_DIR:${PROJECT_NAME}>/../Resources/plugins/$<TARGET_FILE_NAME:capsimage>)
 add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_if_different
         $<TARGET_FILE:floppybridge>
-        $<TARGET_FILE_DIR:${PROJECT_NAME}>/../Frameworks/$<TARGET_FILE_NAME:floppybridge>)
+        $<TARGET_FILE_DIR:${PROJECT_NAME}>/../Resources/plugins/$<TARGET_FILE_NAME:floppybridge>)
 
 # Gather all dependencies with dylibbundler
 add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
         COMMAND dylibbundler -od -b -x $<TARGET_FILE:${PROJECT_NAME}> -d $<TARGET_FILE_DIR:${PROJECT_NAME}>/../Frameworks/ -p @executable_path/../Frameworks/)
 
 if (NOT "${CMAKE_GENERATOR}" MATCHES "Xcode")
     install(FILES $<TARGET_FILE:capsimage>
-            DESTINATION $<TARGET_FILE_DIR:${PROJECT_NAME}>/../Frameworks/)
+            DESTINATION $<TARGET_FILE_DIR:${PROJECT_NAME}>/../Resources/plugins/)
     install(FILES $<TARGET_FILE:floppybridge>
-            DESTINATION $<TARGET_FILE_DIR:${PROJECT_NAME}>/../Frameworks/)
+            DESTINATION $<TARGET_FILE_DIR:${PROJECT_NAME}>/../Resources/plugins/)
 
     # This one contains the gamecontrollersdb.txt file
     install(DIRECTORY ${CMAKE_SOURCE_DIR}/controllers

docs/README.md

@@ -52,3 +52,7 @@ Some distros (like RetroPie, DietPi, Pimiga and others) already include Amiberry
 Alternatively, you can [compile the latest version of Amiberry from source](https://github.com/BlitterStudio/amiberry/wiki/Compile-from-source).
 
 For more documentation subjects, please check the [Wiki page](https://github.com/BlitterStudio/amiberry/wiki)
+
+### Supported by
+
+[![JetBrains logo.](https://resources.jetbrains.com/storage/products/company/brand/logos/jetbrains.svg)](https://jb.gg/OpenSourceSupport)

external/capsimage/src/Core/DiskFile.cpp

@@ -68,15 +68,13 @@ int CDiskFile::OpenAny(char **name, unsigned int mode)
 // return the path index 0...n on the first successful attempt, -1 if all failed
 int CDiskFile::OpenAnyPath(char **path, const char *name, unsigned int mode)
 {
-	int pos;
-
 	// if name and path list are valid
 	if (name && path) {
 		// try each path entry in order
-		for (pos=0; path[pos]; pos++) {
+		for (int pos = 0; path[pos]; pos++) {
 			// append name to current path entry
-			int len=sprintf(tempname, "%s", path[pos]);
-			sprintf(tempname+len, "%s", name);
+			const int len=snprintf(tempname, sizeof tempname, "%s", path[pos]);
+			snprintf(tempname+len, sizeof tempname, "%s", name);
 
 			// open the file, return the name index position on success
 			if (!Open(tempname, mode))

external/floppybridge/src/ArduinoFloppyBridge.cpp

@@ -124,9 +124,9 @@ bool ArduinoFloppyDiskBridge::openInterface(std::string& errorMessage) {
 			// Must be at least V1.8
 			char buf[20];
 #ifdef _WIN32			
-			sprintf_s(buf, "%i.%i.%i", fv.major, fv.minor, fv.buildNumber);
+			snprintf_s(buf, sizeof buf, "%i.%i.%i", fv.major, fv.minor, fv.buildNumber);
 #else
-			sprintf(buf, "%i.%i.%i", fv.major, fv.minor, fv.buildNumber);
+			snprintf(buf, sizeof buf, "%i.%i.%i", fv.major, fv.minor, fv.buildNumber);
 #endif			
 			errorMessage = "DrawBridge aka Arduino Floppy Reader/Writer Firmware is Out Of Date\n\nWinUAE requires V1.8 (and ideally with the modded circuit design).\n\n";
 			errorMessage += "You are currently using V" + std::string(buf) + ".  Please update the firmware.";

external/floppybridge/src/ArduinoInterface.cpp

@@ -837,21 +837,21 @@ DiagnosticResponse ArduinoInterface::selectTrack(const unsigned char trackIndex,
 		char flags = (int)searchSpeed;
 		if (!ignoreDiskInsertCheck) flags |= 4;
 #ifdef _WIN32		
-		sprintf_s(buf, "%c%02i%c", COMMAND_GOTOTRACK_REPORT, trackIndex, flags);
+		snprintf_s(buf, sizeof buf, "%c%02i%c", COMMAND_GOTOTRACK_REPORT, trackIndex, flags);
 #else
-		sprintf(buf, "%c%02i%c", COMMAND_GOTOTRACK_REPORT, trackIndex, flags);
+		snprintf(buf, sizeof buf, "%c%02i%c", COMMAND_GOTOTRACK_REPORT, trackIndex, flags);
 #endif	
 	}
 	else {
 #ifdef _WIN32			
-		sprintf_s(buf, "%c%02i", COMMAND_GOTOTRACK, trackIndex);
+		snprintf_s(buf, sizeof buf, "%c%02i", COMMAND_GOTOTRACK, trackIndex);
 #else		
-		sprintf(buf, "%c%02i", COMMAND_GOTOTRACK, trackIndex);
+		snprintf(buf, sizeof buf, "%c%02i", COMMAND_GOTOTRACK, trackIndex);
 #endif	
 	}
 
 	// Send track number. 
-	if (!deviceWrite(buf, (unsigned int)strlen(buf))) {
+	if (!deviceWrite(buf, static_cast<unsigned int>(strlen(buf)))) {
 		m_lastError = DiagnosticResponse::drSendFailed;
 		return m_lastError;
 	}