LoadRGB4 Kick 1.3/3.1 compatibility Update

arch/m68k-amiga/hidd/gayle_ata/bus_class.h

@@ -9,6 +9,7 @@ struct ata_ProbedBus
     UBYTE *altport;
     UBYTE *gayleirqbase;
     BOOL a4000;
+    BOOL a500;
     UBYTE doubler;
 };
 
@@ -22,6 +23,7 @@ struct ATA_BusData
     UBYTE *gayleirqbase;
     UBYTE *gayleintbase;
     BOOL ideintadded;
+    BOOL a500;
 };
 
 struct ataBase

arch/m68k-amiga/hidd/gayle_ata/gayleata_busclass.c

@@ -1,5 +1,5 @@
 /*
-    Copyright � 2013-2020, The AROS Development Team. All rights reserved.
+    Copyright © 2013-2020, The AROS Development Team. All rights reserved.
     $Id$
 
     Desc: A600/A1200/A4000 ATA HIDD
@@ -57,12 +57,21 @@ static BOOL ata_CreateGayleInterrupt(struct ATA_BusData *bus, UBYTE num)
 {
     struct Interrupt *irq = &bus->ideint;
 
-        bus->gayleintbase = (UBYTE*)GAYLE_INT_1200;
-        irq->is_Code = (APTR)IDE_Handler_A1200;
-
+    if(bus->a500)
+    {
+        bus->gayleintbase = (UBYTE*)GAYLE_INT_500;
+    }
+    else
+    {
+        bus->gayleintbase = (UBYTE*)GAYLE_INT_1200;   
+    }
+    irq->is_Code = (APTR)IDE_Handler_A1200;
+
     irq->is_Node.ln_Pri = 20;
     irq->is_Node.ln_Type = NT_INTERRUPT;
-    irq->is_Node.ln_Name = "AT-IDE";
+    if(bus->a500)
+        irq->is_Node.ln_Name = "AT-IDE2";
+    else irq->is_Node.ln_Name = "AT-IDE";
     irq->is_Data = bus;
     AddIntServer(INTB_PORTS, irq);
 
@@ -112,6 +121,7 @@ OOP_Object *GAYLEATA__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *
         data->bus->atapb_Node.ln_Succ = (struct Node *)-1;
         data->gaylebase = data->bus->port;
         data->gayleirqbase = data->bus->gayleirqbase;
+        data->a500 = data->bus->a500;
         //ata_CreateGayleInterrupt(data, 0);
 
         //mDispose = msg->mID - moRoot_New + moRoot_Dispose;
@@ -201,6 +211,7 @@ APTR GAYLEATA__Hidd_ATABus__GetPIOInterface(OOP_Class *cl, OOP_Object *o, OOP_Ms
         pio->port = data->bus->port;
         pio->altport  = data->bus->altport;
         pio->dataport = (UBYTE*)(((ULONG)pio->port) & ~3);
+        pio->a500 = data->bus->a500;
         /* 
          * (A600/A1200) Data port is in a shadow bank of gayle (offset of 0x2000).
          * This shadow bank is for 16/32-bit data transfers, while the

arch/m68k-amiga/hidd/gayle_ata/interface_pio.c

@@ -34,28 +34,52 @@ static void ata_outsl(struct pio_data *data, APTR address, ULONG count)
 {
     volatile ULONG *addr = (ULONG*)data->dataport;
 
-
+    if(data->a500)
+    {
+    asm volatile(
+"1:     move.l (%[address])+,(0xda2000)  \n"
+"       move.l (%[address])+,(0xda2000)  \n"
+"       subq.l #1,%[count]              \n"
+"       bnes 1b                         \n"
+        ::[count]"d"(count >> 3),[address]"a"(address),[port]"a"(addr));
+    }
+    else
+    {
     asm volatile(
 "1:     move.l (%[address])+,(0xdd2000)  \n"
 "       move.l (%[address])+,(0xdd2000)  \n"
 "       subq.l #1,%[count]              \n"
 "       bnes 1b                         \n"
         ::[count]"d"(count >> 3),[address]"a"(address),[port]"a"(addr));
+    }
+
 }
 
 
 static void ata_insl(struct pio_data *data, APTR address, ULONG count)
 {
     volatile ULONG *addr = (ULONG*)data->dataport;
 
-
+    if(data->a500)
+    {
+    asm volatile(
+"       bra 2f                          \n"
+"1:                                     \n"
+"       move16 0x00da6000,(%[address])+ \n"
+"       move16 0x00da6000,(%[address])+ \n"
+"2:     dbra   %[count],1b              \n"
+        ::[count]"d"(count >> 5),[address]"a"(address));
+    }
+    else
+    {
     asm volatile(
 "       bra 2f                          \n"
 "1:                                     \n"
 "       move16 0x00dd6000,(%[address])+ \n"
 "       move16 0x00dd6000,(%[address])+ \n"
 "2:     dbra   %[count],1b              \n"
         ::[count]"d"(count >> 5),[address]"a"(address));
+    }
 }
 
 const APTR bus_FuncTable[] =

arch/m68k-amiga/hidd/gayle_ata/interface_pio.h

@@ -7,13 +7,23 @@
 /*
  * Standard Amiga Gayle Definitions
  */
-#define GAYLE_BASE_1200         0xdd0000                        /* 0xda0000.W, 0xda0004.B, 0xda0008.B ...               */
+#if VAMPIRECARDSERIES==2
+#define GAYLE_BASE_1200         0xda0000                        /* 0xda0000.W, 0xda0004.B, 0xda0008.B ...               */
+#define GAYLE_IRQ_1200          0xda9000
+#define GAYLE_INT_1200          0xdaa000
+#else
+#define GAYLE_BASE_1200         0xdd0000                        /* 0xdd0000.W, 0xdd0004.B, 0xdd0008.B ...               */
 #define GAYLE_IRQ_1200          0xdd9000
 #define GAYLE_INT_1200          0xdda000
+#endif
 
 #define GAYLE_BASE_4000         0xdd2022                        /* 0xdd2020.W, 0xdd2026.B, 0xdd202a.B ... (argh!)       */
 #define GAYLE_IRQ_4000          0xdd3020
 
+#define GAYLE_BASE_500          0xda0000                         /* Let's call it A500 even if it's used in others as well */
+#define GAYLE_IRQ_500           0xda9000
+#define GAYLE_INT_500           0xdaa000
+
 #define GAYLE_IRQ_IDE           0x80
 #define GAYLE_INT_IDE           0x80
 
@@ -22,6 +32,7 @@ struct pio_data
     UBYTE *dataport;
     UBYTE *port;
     UBYTE *altport;
+    BOOL a500;
 };
 
 extern const APTR bus_FuncTable[];

arch/m68k-amiga/hidd/gayle_ata/probe.c

@@ -1,5 +1,5 @@
 /*
-    Copyright � 2013-2020, The AROS Development Team. All rights reserved.
+    Copyright © 2013-2020, The AROS Development Team. All rights reserved.
     $Id$
 
     Desc: A600/A1200/A4000 ATA HIDD hardware detection routine
@@ -33,18 +33,63 @@
 
 
 
-static UBYTE *getport(struct ata_ProbedBus *ddata)
+static UBYTE *getport(struct ata_ProbedBus *ddata, int a500)
 {
     volatile struct Custom *custom = (struct Custom*)0xdff000;
     UBYTE id, status1, status2;
     volatile UBYTE *port, *altport;
     struct GfxBase *gfx;
-
+    int retrynum = 0;
+
+    struct GayleAdr {unsigned short a;};
+    struct GayleAdr *ga = (struct GayleAdr *)0xda0018;
+    struct GayleAdr *gd = (struct GayleAdr *)0xdd0018;
+    struct GayleAdr *ca = (struct GayleAdr *)0xda1010;
+    struct GayleAdr *cd = (struct GayleAdr *)0xdd1010;
+    struct GayleAdr *cmda = (struct GayleAdr *)0xda101C;
+    struct GayleAdr *cmdd = (struct GayleAdr *)0xdd101C;
+    struct Board {UWORD type;};
+    struct Board *MyBoard = (struct Board *)0xDFF3FC;
+    /* Is the following correct or can we do it more intelligent? */
+    if(a500 > 0)
+    {
+        // A500 only has one controller
+        if((MyBoard->type == 0x02)||(MyBoard->type == 0x03))
+          return 0;
+        ga->a = 0x0;
+        cmda->a = 0x10;
+        ca->a = 0x10;
+        if(ca->a != 0x10) return 0; // no hardware?
+        ca->a = 0x34;
+        if(ca->a != 0x34) return 0; // no hardware?
+    	if((ga->a & 0xFF) == 0xFF) return 0;
+    }
+    else
+    {
+         gd->a = 0x0;
+         cd->a = 0x10;
+         cmdd->a = 0x10;
+         if(cd->a != 0x10) return 0; // no hardware?
+         cd->a = 0x34;
+         if(cd->a != 0x34) return 0; // no hardware?
+   	     if((gd->a & 0xFF ) == 0xFF) return 0;
+    }
+
     port = NULL;
     gfx = (struct GfxBase*)TaggedOpenLibrary(TAGGEDOPEN_GRAPHICS);
     Disable();
-    port = (UBYTE*)GAYLE_BASE_1200;
-    ddata->gayleirqbase = (UBYTE*)GAYLE_IRQ_1200;
+    if(a500 > 0)
+    {
+        port = (UBYTE*)GAYLE_BASE_500;
+        ddata->gayleirqbase = (UBYTE*)GAYLE_IRQ_500;
+        ddata->a500 = TRUE;
+    }
+    else
+    {
+        port = (UBYTE*)GAYLE_BASE_1200;
+        ddata->gayleirqbase = (UBYTE*)GAYLE_IRQ_1200;
+        ddata->a500 = FALSE;
+    }  
     Enable();
     CloseLibrary((struct Library*)gfx);
 
@@ -73,7 +118,9 @@ static UBYTE *getport(struct ata_ProbedBus *ddata)
        if (   (((status1 | status2) & (ATAF_BUSY | ATAF_DRDY)) == (ATAF_BUSY | ATAF_DRDY))
            || ((status1 | status2) & (ATAF_ERROR | ATAF_DATAREQ)))
        {
-//	   goto RETRY;
+           retrynum++;
+           if(retrynum == 10) return NULL;
+	       goto RETRY;
 
            //D(bug("[ATA:Gayle] No Devices detected\n");)
            //return NULL;
@@ -87,70 +134,94 @@ static int gayle_bus_Scan(struct ataBase *base)
 {
     struct ata_ProbedBus *probedbus;
     OOP_Class *busClass = base->GayleBusClass;
-    struct TagItem ata_tags[] =
+
+    for(int i=0; i<2; i++)
     {
-            {aHidd_Name         , (IPTR)"ata_gayle.hidd"        },
-            {aHidd_HardwareName , 0                             },
+
+        struct TagItem ata_tags[] =
+        {
+                {aHidd_Name         , (IPTR)"ata_gayle.hidd"        },
+                {aHidd_HardwareName , 0                             },
 #define ATA_TAG_HARDWARENAME 1
-            {TAG_DONE           , 0                             }
-    };
-
-    probedbus = AllocVec(sizeof(struct ata_ProbedBus), MEMF_ANY | MEMF_CLEAR);
-    if (probedbus && getport(probedbus)) {
-        OOP_Object *ata;
-            if (probedbus->doubler == 0)
-                ata_tags[ATA_TAG_HARDWARENAME].ti_Data = (IPTR)"Amiga(tm) Gayle IDE Controller";
+                {TAG_DONE           , 0                             }
+        };
+
+        probedbus = AllocVec(sizeof(struct ata_ProbedBus), MEMF_ANY | MEMF_CLEAR);
+        if (probedbus && getport(probedbus, i)) {
+            OOP_Object *ata;
+            if(i == 0)
+            {
+                if (probedbus->doubler == 0)
+                    ata_tags[ATA_TAG_HARDWARENAME].ti_Data = (IPTR)"Amiga(tm) Gayle IDE Controller";
+                else
+                    ata_tags[ATA_TAG_HARDWARENAME].ti_Data = (IPTR)"Amiga(tm) Gayle IDE Controller + Port Doubler";
+            }
             else
-                ata_tags[ATA_TAG_HARDWARENAME].ti_Data = (IPTR)"Amiga(tm) Gayle IDE Controller + Port Doubler";
-
-        ata = HW_AddDriver(base->storageRoot, base->ataClass, ata_tags);
-        if (ata) {
-            struct TagItem attrs[] =
             {
-                {aHidd_Name                     , (IPTR)"ata_gayle.hidd"        },
-                {aHidd_HardwareName             , 0                             },
+                if (probedbus->doubler == 0)
+                    ata_tags[ATA_TAG_HARDWARENAME].ti_Data = (IPTR)"Amiga(tm) Gayle IDE Controller 2";
+                else
+                    ata_tags[ATA_TAG_HARDWARENAME].ti_Data = (IPTR)"Amiga(tm) Gayle IDE Controller 2 + Port Doubler";
+            }
+
+            ata = HW_AddDriver(base->storageRoot, base->ataClass, ata_tags);
+            if (ata) {
+                struct TagItem attrs[] =
+                {
+                    {aHidd_Name                     , (IPTR)"ata_gayle.hidd"        },
+                    {aHidd_HardwareName             , 0                             },
  #define BUS_TAG_HARDWARENAME 1
-                {aHidd_DriverData               , (IPTR)probedbus               },
-                {aHidd_ATABus_PIODataSize       , sizeof(struct pio_data)       },
-                {aHidd_ATABus_BusVectors        , (IPTR)bus_FuncTable           },
-                {aHidd_ATABus_PIOVectors        , (IPTR)pio_FuncTable           },
-                {aHidd_Bus_KeepEmpty            , FALSE                         },
-                {TAG_DONE                       , 0                             }
-            };
-            OOP_Object *bus;
-
-            /*
-             * We use this field as ownership indicator.
-             * The trick is that HW_AddDriver() fails if either object creation fails
-             * or subsystem-side setup fails. In the latter case our object will be
-             * disposed.
-             * We need to know whether OOP_DisposeObject() or we should deallocate
-             * this structure on failure.
-             */
-            probedbus->atapb_Node.ln_Succ = NULL;
-
-            /*
-             * Check if we have a FastATA adaptor
-             */
-                attrs[BUS_TAG_HARDWARENAME].ti_Data = (IPTR)"Gayle IDE Channel";
+                    {aHidd_DriverData               , (IPTR)probedbus               },
+                    {aHidd_ATABus_PIODataSize       , sizeof(struct pio_data)       },
+                    {aHidd_ATABus_BusVectors        , (IPTR)bus_FuncTable           },
+                    {aHidd_ATABus_PIOVectors        , (IPTR)pio_FuncTable           },
+                    {aHidd_Bus_KeepEmpty            , FALSE                         },
+                    {TAG_DONE                       , 0                             }
+                };
+                if(i == 1)
+                    attrs[0].ti_Data = (IPTR)"ata_gayle2.hidd";
+
+                OOP_Object *bus;
+
+                /*
+                 * We use this field as ownership indicator.
+                 * The trick is that HW_AddDriver() fails if either object creation fails
+                 * or subsystem-side setup fails. In the latter case our object will be
+                 * disposed.
+                 * We need to know whether OOP_DisposeObject() or we should deallocate
+                 * this structure on failure.
+                 */
+                probedbus->atapb_Node.ln_Succ = NULL;
+
+                /*
+                 * Check if we have a FastATA adaptor
+                 */
+                if(i == 0)    
+                     attrs[BUS_TAG_HARDWARENAME].ti_Data = (IPTR)"Gayle IDE Channel";
+                else attrs[BUS_TAG_HARDWARENAME].ti_Data = (IPTR)"Gayle IDE Channel 2";
 
 
-            bus = HIDD_StorageController_AddBus(ata, busClass, attrs);
-            if (bus)
-                return TRUE;
-            D(bug("[ATA:Gayle] Failed to create object for device IO: %x:%x IRQ: %x\n",
-                probedbus->port, probedbus->altport, probedbus->gayleirqbase);)
-
-            /*
-             * Free the structure only upon object creation failure!
-             * In case of success it becomes owned by the driver object!
-             */
-            if (!probedbus->atapb_Node.ln_Succ)
-                 FreeVec(probedbus);
-            return TRUE;
+                bus = HIDD_StorageController_AddBus(ata, busClass, attrs);
+
+                // Do not exit, we could have more controllers
+                // if (bus)
+                //    return TRUE;
+
+                D(bug("[ATA:Gayle] Failed to create object for device IO: %x:%x IRQ: %x\n",
+                    probedbus->port, probedbus->altport, probedbus->gayleirqbase);)
+
+                /*
+                 * Free the structure only upon object creation failure!
+                 * In case of success it becomes owned by the driver object!
+                 * Edit: Can we really free it yet? We are collecting controllers. Please enable the two lines if sure.
+                 */
+            //    if (!probedbus->atapb_Node.ln_Succ)
+            //         FreeVec(probedbus);
+            //    return TRUE;
+            }
         }
+        FreeVec(probedbus);
     }
-    FreeVec(probedbus);
 
     return TRUE;
 }