testkit: Rename joystick, ... test to "Controller Ports Test"

testkit/joymouse.c

@@ -2,7 +2,8 @@
  * joymouse.c
  * 
  * Test the two standard 9-pin general-purpose controller ports.
- * Supports three-button mouse, two-button joystick, and seven-button gamepad.
+ * Supports three-button mouse, two-button joystick, seven-button gamepad,
+ * and analog (aka proportional) controllers.
  * 
  * Written & released by Keir Fraser <[email protected]>
  * 
@@ -136,7 +137,7 @@ static uint32_t read_gamepad(uint8_t port, volatile struct amiga_cia *_ciaa)
 void joymousecheck(void)
 {
     char s[80];
-    struct char_row r = { .x = 8, .y = 1, .s = s };
+    struct char_row r = { .x = 11, .y = 1, .s = s };
     uint16_t joydat[2], newjoydat[2], _potgo = 0;
     uint8_t key, nr_box = 0;
     unsigned int port, i, j;
@@ -158,7 +159,7 @@ void joymousecheck(void)
 
     print_menu_nav_line();
 
-    sprintf(s, "-- Mouse/Joystick/Gamepad Test --");
+    sprintf(s, "-- Controller Ports Test --");
     print_line(&r);
     r.x = 0;
     r.y += 2;

testkit/testkit.c

@@ -5,7 +5,7 @@
  *  - Memory
  *  - Keyboard
  *  - Floppy Drive
- *  - Joystick / Mouse
+ *  - Controller Ports
  *  - Audio
  *  - Video
  *  - CIA Timers
@@ -911,7 +911,7 @@ static void mainmenu(void)
         { memcheck,      "Memory" },
         { kbdcheck,      "Keyboard" },
         { floppycheck,   "Floppy Drive" },
-        { joymousecheck, "Mouse, Joystick, Gamepad" },
+        { joymousecheck, "Controller Ports" },
         { audiocheck,    "Audio" },
         { videocheck,    "Video" },
         { ciacheck,      "CIA, Chipset, Batt.Clock" },