From 2735e71753fb361c4396cf7efbce4369b1efb385 Mon Sep 17 00:00:00 2001
From: Steven Hugg <hugg@fasterlight.com>
Date: Wed, 28 Nov 2018 12:39:10 -0500
Subject: [PATCH] renamed sg1000 to sms-sg1000

---
 presets/coleco/cursorsmooth.c                           | 4 ----
 presets/{sg1000 => sms-sg1000}                          | 0
 src/platform/{sg1000.ts => sms.ts}                      | 2 +-
 src/views.ts                                            | 1 +
 src/worker/lib/{sg1000 => sms-sg1000}/crt0-sms.lst      | 0
 src/worker/lib/{sg1000 => sms-sg1000}/crt0-sms.rel      | 0
 src/worker/lib/{sg1000 => sms-sg1000}/cv.h              | 0
 src/worker/lib/{sg1000 => sms-sg1000}/cv_graphics.h     | 0
 src/worker/lib/{sg1000 => sms-sg1000}/cv_input.h        | 0
 src/worker/lib/{sg1000 => sms-sg1000}/cv_sound.h        | 0
 src/worker/lib/{sg1000 => sms-sg1000}/cv_support.h      | 0
 src/worker/lib/{sg1000 => sms-sg1000}/cvu.h             | 0
 src/worker/lib/{sg1000 => sms-sg1000}/cvu_c.h           | 0
 src/worker/lib/{sg1000 => sms-sg1000}/cvu_compression.h | 0
 src/worker/lib/{sg1000 => sms-sg1000}/cvu_f.h           | 0
 src/worker/lib/{sg1000 => sms-sg1000}/cvu_graphics.h    | 0
 src/worker/lib/{sg1000 => sms-sg1000}/cvu_input.h       | 0
 src/worker/lib/{sg1000 => sms-sg1000}/cvu_sound.h       | 0
 src/worker/lib/{sg1000 => sms-sg1000}/libcv-sms.lib     | 0
 src/worker/lib/{sg1000 => sms-sg1000}/libcvu-sms.lib    | 0
 src/worker/workermain.ts                                | 2 +-
 21 files changed, 3 insertions(+), 6 deletions(-)
 rename presets/{sg1000 => sms-sg1000} (100%)
 rename src/platform/{sg1000.ts => sms.ts} (99%)
 rename src/worker/lib/{sg1000 => sms-sg1000}/crt0-sms.lst (100%)
 rename src/worker/lib/{sg1000 => sms-sg1000}/crt0-sms.rel (100%)
 rename src/worker/lib/{sg1000 => sms-sg1000}/cv.h (100%)
 rename src/worker/lib/{sg1000 => sms-sg1000}/cv_graphics.h (100%)
 rename src/worker/lib/{sg1000 => sms-sg1000}/cv_input.h (100%)
 rename src/worker/lib/{sg1000 => sms-sg1000}/cv_sound.h (100%)
 rename src/worker/lib/{sg1000 => sms-sg1000}/cv_support.h (100%)
 rename src/worker/lib/{sg1000 => sms-sg1000}/cvu.h (100%)
 rename src/worker/lib/{sg1000 => sms-sg1000}/cvu_c.h (100%)
 rename src/worker/lib/{sg1000 => sms-sg1000}/cvu_compression.h (100%)
 rename src/worker/lib/{sg1000 => sms-sg1000}/cvu_f.h (100%)
 rename src/worker/lib/{sg1000 => sms-sg1000}/cvu_graphics.h (100%)
 rename src/worker/lib/{sg1000 => sms-sg1000}/cvu_input.h (100%)
 rename src/worker/lib/{sg1000 => sms-sg1000}/cvu_sound.h (100%)
 rename src/worker/lib/{sg1000 => sms-sg1000}/libcv-sms.lib (100%)
 rename src/worker/lib/{sg1000 => sms-sg1000}/libcvu-sms.lib (100%)

diff --git a/presets/coleco/cursorsmooth.c b/presets/coleco/cursorsmooth.c
index 1fc24355..41d36d3d 100644
--- a/presets/coleco/cursorsmooth.c
+++ b/presets/coleco/cursorsmooth.c
@@ -48,10 +48,6 @@ void move_cursor(struct cvu_sprite *s, int controller) {
   if (cs.joystick & CV_DOWN) y++;
   if (cs.joystick & CV_UP) y--;
 
-  // Move cursor by the spinner controllers (if present)
-  x += cvu_get_spinner(0);
-  y += cvu_get_spinner(1);
-
   // Make sure cursor doesn't leave the screen.
   if(x < 0) x = 0;
   if(x > 239) x = 239;
diff --git a/presets/sg1000 b/presets/sms-sg1000
similarity index 100%
rename from presets/sg1000
rename to presets/sms-sg1000
diff --git a/src/platform/sg1000.ts b/src/platform/sms.ts
similarity index 99%
rename from src/platform/sg1000.ts
rename to src/platform/sms.ts
index 0c05d342..4d2b50e6 100644
--- a/src/platform/sg1000.ts
+++ b/src/platform/sms.ts
@@ -196,4 +196,4 @@ const _SG1000Platform = function(mainElement) {
 
 ///
 
-PLATFORMS['sg1000'] = _SG1000Platform;
+PLATFORMS['sms-sg1000'] = _SG1000Platform;
diff --git a/src/views.ts b/src/views.ts
index 51aa3b6c..38c767f6 100644
--- a/src/views.ts
+++ b/src/views.ts
@@ -197,6 +197,7 @@ export class SourceEditor implements ProjectView {
 
   updateListing() {
     // update editor annotations
+    // TODO: recreate editor if gutter-bytes is used (verilog)
     this.editor.clearGutter("gutter-info");
     this.editor.clearGutter("gutter-bytes");
     this.editor.clearGutter("gutter-offset");
diff --git a/src/worker/lib/sg1000/crt0-sms.lst b/src/worker/lib/sms-sg1000/crt0-sms.lst
similarity index 100%
rename from src/worker/lib/sg1000/crt0-sms.lst
rename to src/worker/lib/sms-sg1000/crt0-sms.lst
diff --git a/src/worker/lib/sg1000/crt0-sms.rel b/src/worker/lib/sms-sg1000/crt0-sms.rel
similarity index 100%
rename from src/worker/lib/sg1000/crt0-sms.rel
rename to src/worker/lib/sms-sg1000/crt0-sms.rel
diff --git a/src/worker/lib/sg1000/cv.h b/src/worker/lib/sms-sg1000/cv.h
similarity index 100%
rename from src/worker/lib/sg1000/cv.h
rename to src/worker/lib/sms-sg1000/cv.h
diff --git a/src/worker/lib/sg1000/cv_graphics.h b/src/worker/lib/sms-sg1000/cv_graphics.h
similarity index 100%
rename from src/worker/lib/sg1000/cv_graphics.h
rename to src/worker/lib/sms-sg1000/cv_graphics.h
diff --git a/src/worker/lib/sg1000/cv_input.h b/src/worker/lib/sms-sg1000/cv_input.h
similarity index 100%
rename from src/worker/lib/sg1000/cv_input.h
rename to src/worker/lib/sms-sg1000/cv_input.h
diff --git a/src/worker/lib/sg1000/cv_sound.h b/src/worker/lib/sms-sg1000/cv_sound.h
similarity index 100%
rename from src/worker/lib/sg1000/cv_sound.h
rename to src/worker/lib/sms-sg1000/cv_sound.h
diff --git a/src/worker/lib/sg1000/cv_support.h b/src/worker/lib/sms-sg1000/cv_support.h
similarity index 100%
rename from src/worker/lib/sg1000/cv_support.h
rename to src/worker/lib/sms-sg1000/cv_support.h
diff --git a/src/worker/lib/sg1000/cvu.h b/src/worker/lib/sms-sg1000/cvu.h
similarity index 100%
rename from src/worker/lib/sg1000/cvu.h
rename to src/worker/lib/sms-sg1000/cvu.h
diff --git a/src/worker/lib/sg1000/cvu_c.h b/src/worker/lib/sms-sg1000/cvu_c.h
similarity index 100%
rename from src/worker/lib/sg1000/cvu_c.h
rename to src/worker/lib/sms-sg1000/cvu_c.h
diff --git a/src/worker/lib/sg1000/cvu_compression.h b/src/worker/lib/sms-sg1000/cvu_compression.h
similarity index 100%
rename from src/worker/lib/sg1000/cvu_compression.h
rename to src/worker/lib/sms-sg1000/cvu_compression.h
diff --git a/src/worker/lib/sg1000/cvu_f.h b/src/worker/lib/sms-sg1000/cvu_f.h
similarity index 100%
rename from src/worker/lib/sg1000/cvu_f.h
rename to src/worker/lib/sms-sg1000/cvu_f.h
diff --git a/src/worker/lib/sg1000/cvu_graphics.h b/src/worker/lib/sms-sg1000/cvu_graphics.h
similarity index 100%
rename from src/worker/lib/sg1000/cvu_graphics.h
rename to src/worker/lib/sms-sg1000/cvu_graphics.h
diff --git a/src/worker/lib/sg1000/cvu_input.h b/src/worker/lib/sms-sg1000/cvu_input.h
similarity index 100%
rename from src/worker/lib/sg1000/cvu_input.h
rename to src/worker/lib/sms-sg1000/cvu_input.h
diff --git a/src/worker/lib/sg1000/cvu_sound.h b/src/worker/lib/sms-sg1000/cvu_sound.h
similarity index 100%
rename from src/worker/lib/sg1000/cvu_sound.h
rename to src/worker/lib/sms-sg1000/cvu_sound.h
diff --git a/src/worker/lib/sg1000/libcv-sms.lib b/src/worker/lib/sms-sg1000/libcv-sms.lib
similarity index 100%
rename from src/worker/lib/sg1000/libcv-sms.lib
rename to src/worker/lib/sms-sg1000/libcv-sms.lib
diff --git a/src/worker/lib/sg1000/libcvu-sms.lib b/src/worker/lib/sms-sg1000/libcvu-sms.lib
similarity index 100%
rename from src/worker/lib/sg1000/libcvu-sms.lib
rename to src/worker/lib/sms-sg1000/libcvu-sms.lib
diff --git a/src/worker/workermain.ts b/src/worker/workermain.ts
index 74a6bc3a..003854dc 100644
--- a/src/worker/workermain.ts
+++ b/src/worker/workermain.ts
@@ -104,7 +104,7 @@ var PLATFORM_PARAMS = {
     extra_preproc_args: ['-I', '/share/include/coleco'],
     extra_link_args: ['-k', '/share/lib/coleco', '-l', 'libcv', '-l', 'libcvu', 'crt0.rel'],
   },
-  'sg1000': {
+  'sms-sg1000': {
     rom_start: 0x0000,
     code_start: 0x0100,
     rom_size: 0xc000,