IPad Version

.editorconfig

@@ -20,5 +20,5 @@ indent_style = space
 [*.md]
 indent_style = space
 
-[{*.css,*.html,*.js}]
+[{*.css,*.html,*.js,*.json,*.xib,*.xcscheme}]
 indent_style = space

.gitignore

@@ -15,3 +15,62 @@ x16emu.js
 x16emu.wasm
 x16emu.worker.js
 
+xcode/Frameworks/SDL/Xcode-iOS/Test/Info.plist
+xcode/Frameworks/SDL/Xcode-iOS/Test/README
+xcode/Frameworks/SDL/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj
+xcode/Frameworks/SDL/Xcode/SDL/Info-Framework.plist
+xcode/Frameworks/SDL/Xcode/SDL/pkg-support/SDL.info
+xcode/Frameworks/SDL/Xcode/SDL/pkg-support/sdl_logo.pdf
+xcode/Frameworks/SDL/Xcode/SDL/pkg-support/resources/License.txt
+xcode/Frameworks/SDL/Xcode/SDL/pkg-support/resources/ReadMe.txt
+xcode/Frameworks/SDL/Xcode/SDL/pkg-support/resources/SDL_DS_Store
+xcode/Frameworks/SDL/Xcode/SDL/SDL.xcodeproj/project.pbxproj
+xcode/Frameworks/SDL/Xcode/SDLTest/TestDropFile-Info.plist
+xcode/Frameworks/SDL/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj
+xcode/Frameworks/SDL/Xcode/XcodeDocSet/Doxyfile
+xcode/X16/__MACOSX/JoyStickView/._JoyStickView.xcodeproj
+xcode/X16/__MACOSX/JoyStickView/JoyStickViewTests/._JoyStickViewMonitorTests.swift
+xcode/X16/__MACOSX/JoyStickView/JoyStickViewTests/._JoyStickViewTests.swift
+xcode/X16/__MACOSX/JoyStickView/Resources/._Info.plist
+xcode/X16/__MACOSX/JoyStickView/Src/._CoreGraphics+Additions.swift
+xcode/X16/__MACOSX/JoyStickView/Src/._JoyStickView.h
+xcode/X16/__MACOSX/JoyStickView/Src/._JoyStickView.swift
+xcode/X16/__MACOSX/JoyStickView/Src/._JoyStickViewMonitor.swift
+xcode/X16/__MACOSX/SDL/include/._SDL_config_iphoneos.h
+xcode/X16/__MACOSX/SDL/include/._SDL_events.h
+xcode/X16/__MACOSX/SDL/include/._SDL_gesture.h
+xcode/X16/__MACOSX/SDL/include/._SDL_main.h
+xcode/X16/__MACOSX/SDL/include/._SDL_platform.h
+xcode/X16/__MACOSX/SDL/include/._SDL_scancode.h
+xcode/X16/__MACOSX/SDL/include/._SDL_stdinc.h
+xcode/X16/__MACOSX/SDL/include/._SDL_touch.h
+xcode/X16/__MACOSX/SDL/src/._SDL.c
+xcode/X16/__MACOSX/SDL/src/audio/._SDL_audio.c
+xcode/X16/__MACOSX/SDL/src/audio/._SDL_audiocvt.c
+xcode/X16/__MACOSX/SDL/src/events/._SDL_dropevents.c
+xcode/X16/__MACOSX/SDL/src/events/._SDL_dropevents_c.h
+xcode/X16/__MACOSX/SDL/src/events/._SDL_events_c.h
+xcode/X16/__MACOSX/SDL/src/events/._SDL_gesture.c
+xcode/X16/__MACOSX/SDL/src/events/._SDL_gesture_c.h
+xcode/X16/__MACOSX/SDL/src/events/._SDL_keyboard.c
+xcode/X16/__MACOSX/SDL/src/events/._SDL_keyboard_c.h
+xcode/X16/__MACOSX/SDL/src/hidapi/testgui/._TestGUI.app.in
+xcode/X16/__MACOSX/SDL/src/video/uikit/._SDL_uikitappdelegate.h
+xcode/X16/__MACOSX/SDL/src/video/uikit/._SDL_uikitappdelegate.m
+xcode/X16/__MACOSX/SDL/src/video/uikit/._SDL_uikitclipboard.h
+xcode/X16/__MACOSX/SDL/src/video/uikit/._SDL_uikitevents.m
+xcode/X16/__MACOSX/SDL/src/video/uikit/._SDL_uikitviewcontroller.h
+xcode/X16/__MACOSX/SDL/src/video/uikit/._SDL_uikitviewcontroller.m
+xcode/X16/__MACOSX/SDL/Xcode-iOS/Demos/._Demos.xcodeproj
+xcode/X16/__MACOSX/SDL/Xcode-iOS/SDL/._SDL.xcodeproj
+xcode/X16/__MACOSX/SDL/Xcode-iOS/SDLtest/._SDL2test.xcodeproj
+xcode/X16/__MACOSX/SDL/Xcode-iOS/Template/SDL iOS Application/.____PROJECTNAME___.xcodeproj
+xcode/X16/__MACOSX/SDL/Xcode-iOS/Test/._TestiPhoneOS.xcodeproj
+xcode/X16/__MACOSX/SDL/Xcode/SDL/._SDL.xcodeproj
+xcode/X16/__MACOSX/SDL/Xcode/SDLTest/._SDLTest.xcodeproj
+xcode/Frameworks/SDL/test/.testmultiaudio.c.swp
+xcode/Frameworks/SDL/test/testaudioinfo
+xcode/Frameworks/SDL/test/testmultiaudio
+xcode/Frameworks/SDL/Xcode-iOS/Demos/Demos.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+xcode/Frameworks/SDL/Xcode-iOS/Demos/Demos.xcodeproj/xcuserdata/mpe18.xcuserdatad/xcschemes/xcschememanagement.plist
+xcode/Frameworks/SDL/Xcode/SDL/SDL.xcodeproj/xcuserdata/mpe18.xcuserdatad/xcschemes/xcschememanagement.plist

README.md

@@ -25,6 +25,14 @@ You can build a ROM image yourself using the [build instructions][x16rom-build]
 
 Install SDL2 using `brew install sdl2`.
 
+### iPad Build
+
+Using Xcode open the project file in the emulator Xcode directory.
+A copy of the framework source required is included as a zip file (Frameworks.zip).
+Extract it in place before building.
+
+Choose your device or simulator and press run.
+
 ### Linux Build
 
 The SDL2 development package is available as a distribution package with most major versions of Linux:
@@ -162,7 +170,6 @@ The emulator will interpret filenames relative to the directory it was started i
 
 To avoid incompatibility problems between the PETSCII and ASCII encodings, use lower case filenames on the host side, and unshifted filenames on the X16 side.
 
-
 Dealing with BASIC Programs
 ---------------------------
 
@@ -211,6 +218,29 @@ When `-debug` is selected the No-Operation $FF will break into the debugger auto
 
 Effectively keyboard routines only work when the debugger is running normally. Single stepping through keyboard code will not work at present.
 
+iPad
+----
+
+
+### Release 0.1
+
+* Files are saved in the $HOME/Documents folder
+* On-screen joystick and external Gamecontrollers can be accessed by using a Long Press on the main window and pressing the appropriate button
+* Function keys, a reset button and "ESC" button are available on the on-sceen keyboard
+* To run PRG files:
+        1. Browse to the file in the "File App"
+        2. Select any BIN files you need and open them with the X16 app
+        3. Select the PRG file you wish to run.
+        4. The emulator will open and load the PRG
+        5. "RUN" will be displayed when it has loaded and is ready to go. Press ENTER at this point
+* BASIC Code can be pasted by tapping the "Paste" Icon on the software keyboard
+* Sound is now supported by default
+
+TODO:
+* BAS files are not yet able to be loaded from the Files app
+* Mouse support
+* Improve and optimise UI
+* Implement command line parameters in UI such as uart and debugging tools
 
 Wiki
 ----

debugger.c

@@ -13,9 +13,11 @@
 #include <stdio.h>
 #include <inttypes.h>
 #include <SDL.h>
+
 #include "glue.h"
 #include "disasm.h"
 #include "memory.h"
+
 #include "video.h"
 #include "cpu/fake6502.h"
 #include "debugger.h"

disasm.c

@@ -6,8 +6,8 @@
 #include <stdio.h>
 #include <inttypes.h>
 #include <string.h>
+#include "glue.h"
 #include "memory.h"
-
 #include "cpu/mnemonics.h"				// Automatically generated mnemonic table.
 
 // *******************************************************************************************

javascript_interface.c

@@ -7,6 +7,10 @@
 #include <string.h>
 #include "glue.h"
 
+#ifdef WITH_YM2151
+void init_audio(void);
+#endif
+
 char javascript_text_data[65536];
 
 void

joystick.h

@@ -11,6 +11,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <SDL.h>
+
 #include "glue.h"
 #include "via.h"
 

keyboard.c

@@ -1,4 +1,3 @@
-#include <SDL.h>
 #include <stdio.h>
 #include <stdbool.h>
 #include "glue.h"
@@ -225,41 +224,46 @@ void
 handle_keyboard(bool down, SDL_Keycode sym, SDL_Scancode scancode)
 {
 	if (down) {
-		if (log_keyboard) {
-			printf("DOWN 0x%02X\n", scancode);
-			fflush(stdout);
+#if __APPLE__ && (TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE)
+		// iOS device
+		if (scancode == SDL_SCANCODE_MENU) {
+			sendNotification("ShowKeyboard");
 		}
+#endif
+
+		if (log_keyboard) {
+				printf("DOWN 0x%02X\n", scancode);
+				fflush(stdout);
+			}
 
-		int ps2_scancode = ps2_scancode_from_SDL_Scancode(scancode);
-		if (ps2_scancode == 0xff) {
-			// "Pause/Break" sequence
-			ps2_buffer_add(0, 0xe1);
-			ps2_buffer_add(0, 0x14);
-			ps2_buffer_add(0, 0x77);
-			ps2_buffer_add(0, 0xe1);
-			ps2_buffer_add(0, 0xf0);
-			ps2_buffer_add(0, 0x14);
-			ps2_buffer_add(0, 0xf0);
-			ps2_buffer_add(0, 0x77);
+			int ps2_scancode = ps2_scancode_from_SDL_Scancode(scancode);
+			if (ps2_scancode == 0xff) {
+				// "Pause/Break" sequence
+				ps2_buffer_add(0, 0xe1);
+				ps2_buffer_add(0, 0x14);
+				ps2_buffer_add(0, 0x77);
+				ps2_buffer_add(0, 0xe1);
+				ps2_buffer_add(0, 0xf0);
+				ps2_buffer_add(0, 0x14);
+				ps2_buffer_add(0, 0xf0);
+				ps2_buffer_add(0, 0x77);
+			} else {
+				if (ps2_scancode & EXTENDED_FLAG) {
+					ps2_buffer_add(0, 0xe0);
+				}
+				ps2_buffer_add(0, ps2_scancode & 0xff);
+			}
 		} else {
+			if (log_keyboard) {
+				printf("UP	 0x%02X\n", scancode);
+				fflush(stdout);
+			}
+
+			int ps2_scancode = ps2_scancode_from_SDL_Scancode(scancode);
 			if (ps2_scancode & EXTENDED_FLAG) {
 				ps2_buffer_add(0, 0xe0);
 			}
+			ps2_buffer_add(0, 0xf0); // BREAK
 			ps2_buffer_add(0, ps2_scancode & 0xff);
 		}
-	} else {
-		if (log_keyboard) {
-			printf("UP   0x%02X\n", scancode);
-			fflush(stdout);
-		}
-
-		int ps2_scancode = ps2_scancode_from_SDL_Scancode(scancode);
-		if (ps2_scancode & EXTENDED_FLAG) {
-			ps2_buffer_add(0, 0xe0);
-		}
-		ps2_buffer_add(0, 0xf0); // BREAK
-		ps2_buffer_add(0, ps2_scancode & 0xff);
-	}
 }
-
-

keyboard.h

@@ -1,2 +1,11 @@
+#if __APPLE__
+#include <TargetConditionals.h>
+#if TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE
+#include "ios_functions.h"
+#endif
+#endif
+
+#include <SDL.h>
+
 void handle_keyboard(bool down, SDL_Keycode sym, SDL_Scancode scancode);
 

loadsave.c

@@ -9,10 +9,16 @@
 #include <dirent.h>
 #include <unistd.h>
 #include "glue.h"
+
 #include "memory.h"
+
 #include "video.h"
 #include "rom_symbols.h"
 
+#if __APPLE__
+#include <TargetConditionals.h>
+#endif
+
 #define MIN(a,b) (((a)<(b))?(a):(b))
 #define MAX(a,b) (((a)>(b))?(a):(b))
 
@@ -51,7 +57,17 @@ create_directory_listing(uint8_t *data)
 	*data++ = 'C';
 	*data++ = 0;
 
-	if (!(dirp = opendir("."))) {
+	#if __APPLE__ && (TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE)
+	char filename[255];
+	//use correct file location for ios
+	strcpy(filename,getenv("HOME"));
+	//concatenating the path string returned from HOME
+	strcat(filename,"/Documents/.");
+	#else
+	const char *filename = ".";
+	#endif
+
+	if (!(dirp = opendir(filename))) {
 		return 0;
 	}
 	while ((dp = readdir(dirp))) {
@@ -132,7 +148,19 @@ LOAD()
 		RAM[STATUS] = 0;
 		a = 0;
 	} else {
-		FILE *f = fopen(filename, "rb");
+		#if __APPLE__ && (TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE)
+		//use correct file location for ios
+		char full_filename[255];
+		//concatenating the path string returned from HOME
+		strcpy(full_filename, getenv("HOME"));
+		strcat(full_filename, "/Documents/");
+		strcat(full_filename, filename);
+		#else
+		char *full_filename = filename;
+		#endif
+
+		FILE *f = fopen(full_filename, "rb");
+
 		if (!f) {
 			a = 4; // FNF
 			RAM[STATUS] = a;
@@ -209,8 +237,20 @@ SAVE()
 		a = 0;
 		return;
 	}
+	//use correct file location for ios
+	#if __APPLE__ && (TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE)
+	//use correct file location for ios
+	char full_filename[255];
+	//concatenating the path string returned from HOME
+	strcpy(full_filename, getenv("HOME"));
+	strcat(full_filename, "/Documents/");
+	strcat(full_filename, filename);
+	#else
+	char *full_filename = filename;
+	#endif
+
+	FILE *f = fopen(full_filename, "wb");
 
-	FILE *f = fopen(filename, "wb");
 	if (!f) {
 		a = 4; // FNF
 		RAM[STATUS] = a;