Rename side -> head all the way down into firmware.

inc/cdc_acm_protocol.h

@@ -25,8 +25,8 @@
 #define CMD_UPDATE          1
 /* CMD_SEEK, length=3, cyl#. Seek to cyl# on selected drive. */
 #define CMD_SEEK            2
-/* CMD_SIDE, length=3, side# (0=bottom) */
-#define CMD_SIDE            3
+/* CMD_HEAD, length=3, head# (0=bottom) */
+#define CMD_HEAD            3
 /* CMD_SET_PARAMS, length=3+nr, idx, <nr bytes> */
 #define CMD_SET_PARAMS      4
 /* CMD_GET_PARAMS, length=4, idx, nr_bytes. Returns nr_bytes after ACK. */

scripts/greaseweazle/usb.py

@@ -22,7 +22,7 @@ class Cmd:
     GetInfo         =  0
     Update          =  1
     Seek            =  2
-    Side            =  3
+    Head            =  3
     SetParams       =  4
     GetParams       =  5
     Motor           =  6
@@ -43,7 +43,7 @@ class Cmd:
         GetInfo: "GetInfo",
         Update: "Update",
         Seek: "Seek",
-        Side: "Side",
+        Head: "Head",
         SetParams: "SetParams",
         GetParams: "GetParams",
         Motor: "Motor",
@@ -202,10 +202,10 @@ class Unit:
 
 
     ## seek:
-    ## Seek the selected drive's heads to the specified track (cyl, side).
-    def seek(self, cyl, side):
+    ## Seek the selected drive's heads to the specified track (cyl, head).
+    def seek(self, cyl, head):
         self._send_cmd(struct.pack("2Bb", Cmd.Seek, 3, cyl))
-        self._send_cmd(struct.pack("3B", Cmd.Side, 3, side))
+        self._send_cmd(struct.pack("3B", Cmd.Head, 3, head))
 
 
     ## set_bus_type:

src/f1/floppy.c

@@ -37,8 +37,8 @@ static unsigned int GPI_bus;
 #define pin_step   13 /* PB13 */
 #define gpio_wgate gpiob
 #define pin_wgate  14 /* PB14 */
-#define gpio_side  gpiob
-#define pin_side   15 /* PB15 */
+#define gpio_head  gpiob
+#define pin_head   15 /* PB15 */
 
 /* RDATA: Pin B3, Timer 2 Channel 2, DMA1 Channel 7. */
 #define gpio_rdata  gpiob

src/f7/floppy.c

@@ -43,8 +43,8 @@ static unsigned int AFO_bus;
 #define pin_step   7  /* PA7 */
 #define gpio_wgate gpioa
 #define pin_wgate  6  /* PA6 */
-#define gpio_side  gpioc
-#define pin_side   3  /* PC3 */
+#define gpio_head  gpioc
+#define pin_head   3  /* PC3 */
 
 /* RDATA: Pin A0, Timer 2 Channel 1, DMA1 Stream 5 Channel 3. */
 #define gpio_rdata  gpioa

src/floppy.c

@@ -267,7 +267,7 @@ void floppy_init(void)
     configure_pin(dir,    GPO_bus);
     configure_pin(step,   GPO_bus);
     configure_pin(wgate,  GPO_bus);
-    configure_pin(side,   GPO_bus);
+    configure_pin(head,   GPO_bus);
     configure_pin(wdata,  GPO_bus);
 
     /* Input pins. */
@@ -1116,11 +1116,11 @@ static void process_command(void)
         u_buf[1] = floppy_seek(cyl);
         goto out;
     }
-    case CMD_SIDE: {
-        uint8_t side = u_buf[2];
-        if ((len != 3) || (side > 1))
+    case CMD_HEAD: {
+        uint8_t head = u_buf[2];
+        if ((len != 3) || (head > 1))
             goto bad_command;
-        write_pin(side, side);
+        write_pin(head, head);
         break;
     }
     case CMD_SET_PARAMS: {