diff --git a/.gitattributes b/.gitattributes index a273db8..6c35295 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,4 +4,5 @@ ## This will handle all files NOT defined below. * text=auto +startup-sequence text eol=lf Startup-Sequence text eol=lf \ No newline at end of file diff --git a/.gitignore b/.gitignore index 43d8291..ee935ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ build -fs-uae/hd0/gencop +uae/dh0/gencop .DS_Store bin \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json index c5a0683..f58e5e1 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -2,11 +2,15 @@ "version": "0.2.0", "configurations": [ { - "type": "fs-uae-run", + "type": "fs-uae", "request": "launch", - "name": "Run", + "name": "FS-UAE Debug", + "stopOnEntry": false, + "serverName": "localhost", + "serverPort": 6860, + "trace": false, + "startEmulator": true, "buildWorkspace": true, - "emulator": "${workspaceFolder}/bin/fs-uae", "windows": { "emulator": "${workspaceFolder}/bin/fs-uae.exe", }, @@ -17,24 +21,50 @@ "emulator": "${workspaceFolder}/bin/fs-uae", }, "emulatorWorkingDir": "${workspaceFolder}/bin", + "program": "${workspaceFolder}/uae/dh0/gencop", "options": [ "--chip_memory=1024", - "--hard_drive_0=${workspaceFolder}/fs-uae/hd0", + "--hard_drive_0=${workspaceFolder}/uae/dh0", "--joystick_port_1=none", "--amiga_model=A1200", - "--slow_memory=1792" + "--slow_memory=1792", + "--remote_debugger=200", + "--use_remote_debugger=true", + "--automatic_input_grab=0" ] }, { - "type": "fs-uae", + "type": "winuae", "request": "launch", - "name": "Debug", + "name": "WinUAE Debug", + "buildWorkspace": true, "stopOnEntry": false, "serverName": "localhost", - "serverPort": 6860, - "trace": false, + "serverPort": 2345, "startEmulator": true, + "trace": false, + "exceptionMask": 8188, + "emulatorStartDelay": 1500, + "emulator": "${workspaceFolder}/bin/winuae.exe", + "emulatorWorkingDir": "${workspaceFolder}/bin", + "program": "${workspaceFolder}/uae/dh0/gencop", + "options": [ + "-s", + "quickstart=a500,1", + "-s", + "filesystem=rw,dh0:${workspaceFolder}\\uae\\dh0", + "-s", + "debugging_trigger=SYS:gencop", + "-s", + "debugging_features=gdbserver" + ] + }, + { + "type": "fs-uae-run", + "request": "launch", + "name": "FS-UAE Run", "buildWorkspace": true, + "emulator": "${workspaceFolder}/bin/fs-uae", "windows": { "emulator": "${workspaceFolder}/bin/fs-uae.exe", }, @@ -45,16 +75,12 @@ "emulator": "${workspaceFolder}/bin/fs-uae", }, "emulatorWorkingDir": "${workspaceFolder}/bin", - "program": "${workspaceFolder}/fs-uae/hd0/gencop", "options": [ "--chip_memory=1024", - "--hard_drive_0=${workspaceFolder}/fs-uae/hd0", + "--hard_drive_0=${workspaceFolder}/uae/dh0", "--joystick_port_1=none", "--amiga_model=A1200", - "--slow_memory=1792", - "--remote_debugger=200", - "--use_remote_debugger=true", - "--automatic_input_grab=0" + "--slow_memory=1792" ] } ] diff --git a/fs-uae/hd0/c/UAEquit b/uae/dh0/c/UAEquit similarity index 100% rename from fs-uae/hd0/c/UAEquit rename to uae/dh0/c/UAEquit diff --git a/fs-uae/hd0/s/Startup-Sequence b/uae/dh0/s/startup-sequence similarity index 98% rename from fs-uae/hd0/s/Startup-Sequence rename to uae/dh0/s/startup-sequence index 1e384c7..c38c32a 100644 --- a/fs-uae/hd0/s/Startup-Sequence +++ b/uae/dh0/s/startup-sequence @@ -1,4 +1,3 @@ sys:gencop - ; Quits the emulator at the end of the program UAEquit \ No newline at end of file diff --git a/vscode-amiga-wks-example.code-workspace b/vscode-amiga-wks-example.code-workspace index ee678f0..cc9fdc5 100644 --- a/vscode-amiga-wks-example.code-workspace +++ b/vscode-amiga-wks-example.code-workspace @@ -20,7 +20,7 @@ "file": "bin/vlink", "includes": "*.s", "excludes": "", - "exefilename": "../fs-uae/hd0/gencop", + "exefilename": "../uae/dh0/gencop", "options": [ "-bamigahunk", "-Bstatic" @@ -28,7 +28,7 @@ }, "amiga-assembly.adfgenerator": { "ADFToolsParentDir": "bin", - "sourceRootDir": "fs-uae/hd0", + "sourceRootDir": "uae/dh0", "outputADFFile": "./build/disk.adf", "includes": "**/*", "excludes": "**/.*"