From 833f0acc20f0e9806e817d0129a171346739b981 Mon Sep 17 00:00:00 2001 From: Andrew Alderwick Date: Mon, 26 Apr 2021 18:52:46 +0100 Subject: [PATCH] Made room for multiple audio devices --- projects/demos/bifurcan.usm | 4 ++-- projects/demos/musictracker.usm | 6 +++--- projects/demos/piano.usm | 6 +++--- projects/demos/theme.usm | 2 +- projects/examples/blank.usm | 8 ++++---- projects/examples/devices/controller.buttons.usm | 2 +- projects/examples/devices/controller.keys.usm | 2 +- projects/examples/devices/datetime.usm | 2 +- projects/examples/devices/file.usm | 2 +- projects/examples/devices/mouse.usm | 2 +- projects/examples/gui/hover.usm | 2 +- projects/examples/gui/picture.usm | 2 +- projects/examples/gui/wallpaper.usm | 8 ++++---- projects/software/asma.usm | 8 ++++---- projects/software/left.usm | 6 +++--- projects/software/nasu.usm | 6 +++--- projects/software/neralie.usm | 2 +- projects/software/noodle.usm | 6 +++--- projects/software/orca.usm | 4 ++-- src/emulator.c | 14 +++++++------- 20 files changed, 47 insertions(+), 47 deletions(-) diff --git a/projects/demos/bifurcan.usm b/projects/demos/bifurcan.usm index ba9b4cf..e8224c3 100644 --- a/projects/demos/bifurcan.usm +++ b/projects/demos/bifurcan.usm @@ -14,8 +14,8 @@ |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ] |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ] -|60 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] -|a0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ] +|90 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] +|b0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ] ( variables ) diff --git a/projects/demos/musictracker.usm b/projects/demos/musictracker.usm index 3ded08e..0f7836f 100644 --- a/projects/demos/musictracker.usm +++ b/projects/demos/musictracker.usm @@ -30,9 +30,9 @@ |10 @Console [ &vector $2 &pad $6 &char $1 &byte $1 &short $2 &string $2 ] |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ] |30 @Audio [ &pad $8 &adsr $2 &len $2 &addr $2 &volume $1 &pitch $1 ] -|40 @Controller [ &vector $2 &button $1 &key $1 ] -|60 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] -|70 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ] +|80 @Controller [ &vector $2 &button $1 &key $1 ] +|90 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] +|a0 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ] ( vectors ) diff --git a/projects/demos/piano.usm b/projects/demos/piano.usm index 3b442cf..91f4c7e 100644 --- a/projects/demos/piano.usm +++ b/projects/demos/piano.usm @@ -13,9 +13,9 @@ |10 @Console [ &pad $8 &char $1 &byte $1 &short $2 &string $2 ] |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ] |30 @Audio [ &pad $8 &adsr $2 &length $2 &addr $2 &volume $1 &pitch $1 ] -|40 @Controller [ &vector $2 &button $1 &key $1 ] -|60 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] -|90 @Midi [ &vector $2 &message $2 ] +|70 @Midi [ &vector $2 &message $2 ] +|80 @Controller [ &vector $2 &button $1 &key $1 ] +|90 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] ( variables ) diff --git a/projects/demos/theme.usm b/projects/demos/theme.usm index 26a3125..b12fcfa 100644 --- a/projects/demos/theme.usm +++ b/projects/demos/theme.usm @@ -11,7 +11,7 @@ |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ] |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ] -|60 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] +|90 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] ( variables ) diff --git a/projects/examples/blank.usm b/projects/examples/blank.usm index 8399014..19c5bd6 100644 --- a/projects/examples/blank.usm +++ b/projects/examples/blank.usm @@ -6,10 +6,10 @@ |10 @Console [ &pad $8 &char $1 &byte $1 &short $2 &string $2 ] |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ] |30 @Audio [ &wave $2 &envelope $2 &pad $4 &volume $1 &pitch $1 &play $1 &value $2 &delay $2 &finish $1 ] -|40 @Controller [ &vector $2 &button $1 &key $1 ] -|60 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] -|70 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ] -|a0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ] +|80 @Controller [ &vector $2 &button $1 &key $1 ] +|90 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] +|a0 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ] +|b0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ] ( variables ) diff --git a/projects/examples/devices/controller.buttons.usm b/projects/examples/devices/controller.buttons.usm index 00f02b3..62a5ed1 100644 --- a/projects/examples/devices/controller.buttons.usm +++ b/projects/examples/devices/controller.buttons.usm @@ -8,7 +8,7 @@ |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ] |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ] -|40 @Controller [ &vector $2 &button $1 &key $1 ] +|80 @Controller [ &vector $2 &button $1 &key $1 ] ( variables ) diff --git a/projects/examples/devices/controller.keys.usm b/projects/examples/devices/controller.keys.usm index 6dcf9f2..42df17e 100644 --- a/projects/examples/devices/controller.keys.usm +++ b/projects/examples/devices/controller.keys.usm @@ -8,7 +8,7 @@ |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ] |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ] -|40 @Controller [ &vector $2 &button $1 &key $1 ] +|80 @Controller [ &vector $2 &button $1 &key $1 ] ( init ) diff --git a/projects/examples/devices/datetime.usm b/projects/examples/devices/datetime.usm index 26298ba..9381dbb 100644 --- a/projects/examples/devices/datetime.usm +++ b/projects/examples/devices/datetime.usm @@ -11,7 +11,7 @@ |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ] |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ] -|a0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ] +|b0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ] ( variables ) diff --git a/projects/examples/devices/file.usm b/projects/examples/devices/file.usm index 5e92937..baba445 100644 --- a/projects/examples/devices/file.usm +++ b/projects/examples/devices/file.usm @@ -8,7 +8,7 @@ |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ] |10 @Console [ &pad $8 &char $1 &byte $1 &short $2 &string $2 ] |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ] -|70 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ] +|a0 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ] ( variables ) diff --git a/projects/examples/devices/mouse.usm b/projects/examples/devices/mouse.usm index 9c91801..200fa4f 100644 --- a/projects/examples/devices/mouse.usm +++ b/projects/examples/devices/mouse.usm @@ -7,7 +7,7 @@ |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ] |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ] -|60 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] +|90 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] |0000 diff --git a/projects/examples/gui/hover.usm b/projects/examples/gui/hover.usm index 45adbb5..61e4c9b 100644 --- a/projects/examples/gui/hover.usm +++ b/projects/examples/gui/hover.usm @@ -6,7 +6,7 @@ |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ] |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ] -|60 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] +|90 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] ( variables ) diff --git a/projects/examples/gui/picture.usm b/projects/examples/gui/picture.usm index 36ac95e..b3c8666 100644 --- a/projects/examples/gui/picture.usm +++ b/projects/examples/gui/picture.usm @@ -8,7 +8,7 @@ |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ] |10 @Console [ &vector $2 &pad $6 &char $1 &byte $1 &short $2 &string $2 ] |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ] -|70 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ] +|a0 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ] ( variables ) diff --git a/projects/examples/gui/wallpaper.usm b/projects/examples/gui/wallpaper.usm index 7d918f4..5f17c70 100644 --- a/projects/examples/gui/wallpaper.usm +++ b/projects/examples/gui/wallpaper.usm @@ -4,10 +4,10 @@ |10 @Console [ &vector $2 &pad $6 &char $1 &byte $1 &short $2 &string $2 ] |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ] |30 @Audio [ &wave $2 &envelope $2 &pad $4 &volume $1 &pitch $1 &play $1 &value $2 &delay $2 &finish $1 ] -|40 @Controller [ &vector $2 &button $1 &key $1 ] -|60 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] -|70 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ] -|a0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ] +|80 @Controller [ &vector $2 &button $1 &key $1 ] +|90 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] +|a0 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ] +|b0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ] ( variables ) diff --git a/projects/software/asma.usm b/projects/software/asma.usm index 08729bf..677c164 100644 --- a/projects/software/asma.usm +++ b/projects/software/asma.usm @@ -10,10 +10,10 @@ |10 @Console [ &vector $2 &pad $6 &char $1 &byte $1 &short $2 &string $2 ] |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ] |30 @Audio [ &wave $2 &envelope $2 &pad $4 &volume $1 &pitch $1 &play $1 &value $2 &delay $2 &finish $1 ] -|40 @Controller [ &vector $2 &button $1 &key $1 ] -|60 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] -|70 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ] -|a0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ] +|80 @Controller [ &vector $2 &button $1 &key $1 ] +|90 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] +|a0 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ] +|b0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ] ( variables ) diff --git a/projects/software/left.usm b/projects/software/left.usm index de46c9c..9f55a59 100644 --- a/projects/software/left.usm +++ b/projects/software/left.usm @@ -31,9 +31,9 @@ |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ] |10 @Console [ &vector $2 &pad $6 &char $1 &byte $1 &short $2 &string $2 ] |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ] -|40 @Controller [ &vector $2 &button $1 &key $1 ] -|60 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] -|70 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ] +|80 @Controller [ &vector $2 &button $1 &key $1 ] +|90 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] +|a0 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ] ( variables ) diff --git a/projects/software/nasu.usm b/projects/software/nasu.usm index a74e2cc..52e597f 100644 --- a/projects/software/nasu.usm +++ b/projects/software/nasu.usm @@ -43,9 +43,9 @@ |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ] |10 @Console [ &vector $2 &pad $6 &char $1 &byte $1 &short $2 &string $2 ] |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ] -|40 @Controller [ &vector $2 &button $1 &key $1 ] -|60 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] -|70 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ] +|80 @Controller [ &vector $2 &button $1 &key $1 ] +|90 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] +|a0 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ] ( variables ) diff --git a/projects/software/neralie.usm b/projects/software/neralie.usm index 0a7ec60..d5336b2 100644 --- a/projects/software/neralie.usm +++ b/projects/software/neralie.usm @@ -14,7 +14,7 @@ |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ] |10 @Console [ &vector $2 &pad $6 &char $1 &byte $1 &short $2 &string $2 ] |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ] -|a0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ] +|b0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ] ( variables ) diff --git a/projects/software/noodle.usm b/projects/software/noodle.usm index 755edcb..6418e1b 100644 --- a/projects/software/noodle.usm +++ b/projects/software/noodle.usm @@ -30,9 +30,9 @@ |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ] |10 @Console [ &vector $2 &pad $6 &char $1 &byte $1 &short $2 &string $2 ] |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ] -|40 @Controller [ &vector $2 &button $1 &key $1 ] -|60 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] -|70 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ] +|80 @Controller [ &vector $2 &button $1 &key $1 ] +|90 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] +|a0 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ] ( variables ) diff --git a/projects/software/orca.usm b/projects/software/orca.usm index 69490d7..f7e40c7 100644 --- a/projects/software/orca.usm +++ b/projects/software/orca.usm @@ -41,8 +41,8 @@ |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ] |10 @Console [ &vector $2 &pad $6 &char $1 &byte $1 &short $2 &string $2 ] |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ] -|40 @Controller [ &vector $2 &button $1 &key $1 ] -|60 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] +|80 @Controller [ &vector $2 &button $1 &key $1 ] +|90 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ] ( variables ) diff --git a/src/emulator.c b/src/emulator.c index 147a6f9..29d36bf 100644 --- a/src/emulator.c +++ b/src/emulator.c @@ -379,14 +379,14 @@ main(int argc, char **argv) portuxn(&u, 0x1, "console", console_talk); devscreen = portuxn(&u, 0x2, "screen", screen_talk); portuxn(&u, 0x3, "audio", audio_talk); - devctrl = portuxn(&u, 0x4, "controller", nil_talk); + portuxn(&u, 0x4, "---", nil_talk); portuxn(&u, 0x5, "---", nil_talk); - devmouse = portuxn(&u, 0x6, "mouse", nil_talk); - portuxn(&u, 0x7, "file", file_talk); - portuxn(&u, 0x8, "---", nil_talk); - devmidi = portuxn(&u, 0x9, "midi", midi_talk); - portuxn(&u, 0xa, "datetime", datetime_talk); - portuxn(&u, 0xb, "---", nil_talk); + portuxn(&u, 0x6, "---", nil_talk); + devmidi = portuxn(&u, 0x7, "midi", midi_talk); + devctrl = portuxn(&u, 0x8, "controller", nil_talk); + devmouse = portuxn(&u, 0x9, "mouse", nil_talk); + portuxn(&u, 0xa, "file", file_talk); + portuxn(&u, 0xb, "datetime", datetime_talk); portuxn(&u, 0xc, "---", nil_talk); portuxn(&u, 0xd, "---", nil_talk); portuxn(&u, 0xe, "---", nil_talk);