Added an extra device for shugart bus handle with pin 6

Author: Per Mårtensson

src/floppy.c

@@ -43,7 +43,7 @@ static struct unit {
     bool_t initialised;
     bool_t is_flippy;
     bool_t motor;
-} unit[3];
+} unit[4];
 
 static struct gw_delay delay_params;
 static const struct gw_delay factory_delay_params = {
@@ -197,6 +197,7 @@ static void drive_deselect(void)
         case 0: pin = 10; break;
         case 1: pin = 12; break;
         case 2: pin = 14; break;
+        case 3: pin = 6; break;
         }
         break;
     }
@@ -230,6 +231,7 @@ static uint8_t drive_select(uint8_t nr)
         case 0: pin = 10; break;
         case 1: pin = 12; break;
         case 2: pin = 14; break;
+        case 3: pin = 6; break;
         default: return ACK_BAD_UNIT;
         }
         break;
@@ -264,7 +266,7 @@ static uint8_t drive_motor(uint8_t nr, bool_t on)
         }
         break;
     case BUS_SHUGART:
-        if (nr >= 3)
+        if (nr >= 4)
             return ACK_BAD_UNIT;
         /* All shugart units share one motor line. Alias them all to unit 0. */
         nr = 0;
@@ -305,7 +307,7 @@ static uint8_t drive_get_info(int nr, struct gw_drive_info *d)
             return ACK_BAD_UNIT;
         break;
     case BUS_SHUGART:
-        if (nr >= 3)
+        if (nr >= 4)
             return ACK_BAD_UNIT;
         break;
     default:

src/mcu/at32f4/board.c

@@ -24,6 +24,7 @@ const static struct core_floppy_pins _core_floppy_pins_v4 = {
 };
 
 const static struct pin_mapping _msel_pins_v4[] = {
+    {  6, _A,  7 },
     { 10, _A,  3 },
     { 12, _B,  9 },
     { 14, _A,  4 },
@@ -34,7 +35,6 @@ const static struct pin_mapping _msel_pins_v4[] = {
 const static struct pin_mapping _user_pins_v4[] = {
     {  2, _A,  6 },
     {  4, _A,  5 },
-    {  6, _A,  7 },
     {  0,  0,  0 }
 };
 

src/mcu/stm32f1/board.c

@@ -19,6 +19,7 @@ const static struct pin_mapping _msel_pins_std[] = {
 };
 
 const static struct pin_mapping _msel_pins_f1_plus[] = {
+    { 6,  _A,  1 },
     { 10, _B, 11 },
     { 12, _B,  0 },
     { 14, _B, 10 },
@@ -32,12 +33,10 @@ const static struct pin_mapping _user_pins_std[] = {
 const static struct pin_mapping _user_pins_f1_plus[] = {
     { 2, _B,  9, _PP },
     { 4, _A,  3, _PP },
-    { 6, _A,  1, _PP },
     { 0,  0,  0, _PP } };
 const static struct pin_mapping _user_pins_f1_plus_unbuffered[] = {
     { 2, _B,  9, _OD },
     { 4, _A,  3, _OD },
-    { 6, _A,  1, _OD },
     { 0,  0,  0, _OD } };
 
 const static struct board_config _board_config[] = {

src/mcu/stm32f7/board.c

@@ -20,6 +20,51 @@ const static struct pin_mapping _msel_pins_std[] = {
     {  0,  0,  0 }
 };
 
+const static struct pin_mapping _msel_pins_F7SM_lightning_plus[] = {
+    {  6, _E, 14 },  
+    { 10, _B,  1 },
+    { 12, _B,  0 },
+    { 14, _B, 11 },
+    { 16, _B, 10 },
+    {  0,  0,  0 }
+};
+
+const static struct pin_mapping _msel_pins_F7SM_v2[] = {
+    {  6, _C,  7 }, 
+    { 10, _B,  1 },
+    { 12, _B,  0 },
+    { 14, _B, 11 }, 
+    { 16, _B, 10 },
+    {  0,  0,  0 }
+};
+
+const static struct pin_mapping _msel_pins_F7SM_v3[] = {
+    {  6, _C,  7 }, 
+    { 10, _B,  1 },
+    { 12, _B,  0 },
+    { 14, _B, 11 }, 
+    { 16, _B, 10 },
+    {  0,  0,  0 }
+};
+
+const static struct pin_mapping _msel_pins_F7SM_ant_goffart_f7_plus_v2[] = {
+    {  6, _C,  7 },
+    { 10, _B,  1 },
+    { 12, _B,  0 },
+    { 14, _B, 11 },  
+    { 16, _B, 10 },
+    {  0,  0,  0 }
+};
+
+const static struct pin_mapping _msel_pins_F7SM_lightning[] = {
+    {  6, _E, 14 },
+    { 10, _B,  1 },
+    { 12, _B,  0 },
+    { 14, _B, 11 },
+    { 16, _B, 10 },
+    {  0,  0,  0 }
+};
+
 const static struct pin_mapping _msel_pins_f7_slim[] = {
     { 10, _B,  1 },
     { 14, _B, 11 },
@@ -36,29 +81,24 @@ const static struct pin_mapping _user_pins_F7SM_ant_goffart_f7_plus_v1[] = {
 const static struct pin_mapping _user_pins_F7SM_lightning[] = {
     { 2, _B, 12, _PP },
     { 4, _E, 15, _PP },
-    { 6, _E, 14, _PP },
     { 0,  0,  0, _PP } };
 const static struct pin_mapping _user_pins_F7SM_v2[] = {
     { 2, _B, 12, _OD },
     { 4, _C,  8, _OD },
-    { 6, _C,  7, _OD },
     { 0,  0,  0, _OD } };
 const static struct pin_mapping _user_pins_F7SM_ant_goffart_f7_plus_v2[] = {
     { 2, _B, 12, _PP },
     { 4, _C,  8, _PP },
-    { 6, _C,  7, _PP },
     { 0,  0,  0, _PP } };
 const static struct pin_mapping _user_pins_F7SM_lightning_plus[] = {
     { 2, _B, 12, _PP },
     { 4, _E, 15, _PP },
-    { 6, _E, 14, _PP },
     { 0,  0,  0, _PP } };
 const static struct pin_mapping _user_pins_F7SM_slim[] = {
     { 0,  0,  0, _PP } };
 const static struct pin_mapping _user_pins_F7SM_v3[] = {
     { 2, _B, 12, _PP },
     { 4, _C,  8, _PP },
-    { 6, _C,  7, _PP },
     { 0,  0,  0, _PP } };
 const static struct board_config _board_config[] = {
     [F7SM_v1] = {
@@ -73,11 +113,11 @@ const static struct board_config _board_config[] = {
         .hse_mhz   = 16,
         .hs_usb    = TRUE,
         .user_pins = _user_pins_F7SM_lightning,
-        .msel_pins = _msel_pins_std },
+        .msel_pins = _msel_pins_F7SM_lightning },
     [F7SM_v2] = {
         .hse_mhz   = 8,
         .user_pins = _user_pins_F7SM_v2,
-        .msel_pins = _msel_pins_std },
+        .msel_pins = _msel_pins_F7SM_v2 },
     [F7SM_ant_goffart_f7_plus_v2] = {
         .hse_mhz   = 8,
         .user_pins = _user_pins_F7SM_ant_goffart_f7_plus_v2,
@@ -88,7 +128,7 @@ const static struct board_config _board_config[] = {
         .hs_usb    = TRUE,
         .flippy    = TRUE,
         .user_pins = _user_pins_F7SM_lightning_plus,
-        .msel_pins = _msel_pins_std },
+        .msel_pins = _msel_pins_F7SM_lightning_plus },
     [F7SM_slim] = {
         .hse_mhz   = 16,
         .hse_byp   = TRUE,
@@ -98,7 +138,7 @@ const static struct board_config _board_config[] = {
         .hse_mhz   = 8,
         .flippy    = TRUE,
         .user_pins = _user_pins_F7SM_v3,
-        .msel_pins = _msel_pins_std },
+        .msel_pins = _msel_pins_F7SM_v3 },
 };
 
 /* Blink the activity LED to indicate fatal error. */