Merge pull request #492 from jepler/applediskii

Add support for the interfacing to an Apple Disk ][

doc/greaseweazle.md

@@ -37,8 +37,12 @@ Supported features with the GreaseWeazle include:
   - simple reading and writing of disks, seeking etc
   - erasing disks
   - determining disk rotation speed
-  - both Shugart and normal IBM buses (via
+  - Shugart and normal IBM buses (via
 	`--usb.greaseweazle.bus_type=SHUGART` or `IBMPC`; the default is `IBMPC`)
+  - Apple 5.25 floppy interfaces (via `--usb.greaseweazle.bus_type=APPLE2`)
+
+Which device types are supported depend on the hardware. Genuine Greaseweazle hardware supports SHUGART and IBMPC.
+APPLE2 is only supported with hand wiring and the Adafruit\_Floppy greaseweazle-compatible firmware.
 
 What doesn't work
 -----------------

lib/usb/greaseweazle.h

@@ -75,9 +75,10 @@ extern Bytes stripPartialRotation(const Bytes& fldata);
 /*
  * CMD_SET_BUS CODES
  */
-#define BUS_NONE            0
+#define BUS_NONE              0
-#define BUS_IBMPC           1
+#define BUS_IBMPC             1
-#define BUS_SHUGART         2
+#define BUS_SHUGART           2
+#define BUS_APPLE2            3
 
 
 /*

lib/usb/usb.proto

@@ -3,7 +3,7 @@ syntax = "proto2";
 import "lib/common.proto";
 
 message GreaseWeazleProto {
-	enum BusType {
+	enum BusType { /* note that these must match CMD_SET_BUS codes */
 		BUSTYPE_INVALID = 0;
 		IBMPC = 1;
 		SHUGART = 2;