commit 833f0acc20f0e9806e817d0129a171346739b981
parent e0929d98dae59645e613f9237ce8eeef097081c4
Author: Andrew Alderwick <andrew@alderwick.co.uk>
Date: Mon, 26 Apr 2021 18:52:46 +0100
Made room for multiple audio devices
Diffstat:
20 files changed, 47 insertions(+), 47 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);
