[Midnightbsd-cvs] src: dev/ata: Add additional intel, nvidia, and amd parts.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Add additional intel, nvidia, and amd parts.  The intel device using 0x28508086 is an ICH8 mobile ultra ata controller, but I'm not sure what identifier to use with it.  It is a santa rosa 2850 controller.  Some of these ids are from FreeBSD 6.3 (Soren and other contributors).

Modified Files:
--------------
    src/sys/dev/ata:
        ata-chipset.c (r1.10 -> r1.11)
        ata-pci.h (r1.7 -> r1.8)

-------------- next part --------------
Index: ata-pci.h
===================================================================
RCS file: /home/cvs/src/sys/dev/ata/ata-pci.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -L sys/dev/ata/ata-pci.h -L sys/dev/ata/ata-pci.h -u -r1.7 -r1.8
--- sys/dev/ata/ata-pci.h
+++ sys/dev/ata/ata-pci.h
@@ -81,6 +81,7 @@
 #define ATA_ATP865R             0x00091191
 
 #define ATA_AMD_ID              0x1022
+#define ATA_AMD5536             0x209a1022
 #define ATA_AMD755              0x74011022
 #define ATA_AMD756              0x74091022
 #define ATA_AMD766              0x74111022
@@ -171,7 +172,13 @@
 #define ATA_I82801HB_S2         0x28258086
 #define ATA_I82801HBM_S3        0x28298086
 #define ATA_I82801HBM_S2        0x282a8086
-#define ATA_I82801HBM_S1	0x28288086
+#define ATA_I82801HBM_S1        0x28288086
+#define ATA_I82801HBM           0x28508086
+#define ATA_I82801IB_S1         0x29208086
+#define ATA_I82801IB_AH2        0x29218086
+#define ATA_I82801IB_AH6        0x29228086
+#define ATA_I82801IB_AH4        0x29238086
+#define ATA_I82801IB_S2         0x29268086
 #define ATA_I31244              0x32008086
 
 #define ATA_ITE_ID              0x1283
@@ -226,6 +233,12 @@
 #define ATA_NFORCE_MCP55_S2     0x037f10de
 #define ATA_NFORCE_MCP61        0x03ec10de 
 #define ATA_NFORCE_MCP61_S1     0x03f610de 
+#define ATA_NFORCE_MCP61_S2     0x03f610de
+#define ATA_NFORCE_MCP61_S3     0x03f710de
+#define ATA_NFORCE_MCP65        0x044810de
+#define ATA_NFORCE_MCP67        0x056010de
+#define ATA_NFORCE_MCP73        0x056c10de
+#define ATA_NFORCE_MCP77        0x075910de
 
 #define ATA_PROMISE_ID          0x105a
 #define ATA_PDC20246            0x4d33105a
Index: ata-chipset.c
===================================================================
RCS file: /home/cvs/src/sys/dev/ata/ata-chipset.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -L sys/dev/ata/ata-chipset.c -L sys/dev/ata/ata-chipset.c -u -r1.10 -r1.11
--- sys/dev/ata/ata-chipset.c
+++ sys/dev/ata/ata-chipset.c
@@ -1341,6 +1341,7 @@
      { ATA_AMD766,  0x00, AMDNVIDIA, AMDCABLE|AMDBUG, ATA_UDMA5, "766" },
      { ATA_AMD768,  0x00, AMDNVIDIA, AMDCABLE,        ATA_UDMA5, "768" },
      { ATA_AMD8111, 0x00, AMDNVIDIA, AMDCABLE,        ATA_UDMA6, "8111" },
+     { ATA_AMD5536, 0x00, AMDNVIDIA, 0x00,            ATA_UDMA5, "CS5536" },
      { 0, 0, 0, 0, 0, 0}};
     char buffer[64]; 
 
@@ -1848,9 +1849,15 @@
      { ATA_I82801HB_R1,  0, AHCI, 0x00, ATA_SA300, "ICH8" },
      { ATA_I82801HB_AH4, 0, AHCI, 0x00, ATA_SA300, "ICH8" },
      { ATA_I82801HB_AH6, 0, AHCI, 0x00, ATA_SA300, "ICH8" },
+     { ATA_I82801HBM,    0,    0, 0x00, ATA_UDMA5, "ICH8M" },
      { ATA_I82801HBM_S1, 0, AHCI, 0x00, ATA_SA300, "ICH8M" },
      { ATA_I82801HBM_S2, 0, AHCI, 0x00, ATA_SA300, "ICH8M" },
      { ATA_I82801HBM_S3, 0, AHCI, 0x00, ATA_SA300, "ICH8M" },
+     { ATA_I82801IB_S1,  0, AHCI, 0x00, ATA_SA300, "ICH9" },
+     { ATA_I82801IB_S2,  0, AHCI, 0x00, ATA_SA300, "ICH9" },
+     { ATA_I82801IB_AH2, 0, AHCI, 0x00, ATA_SA300, "ICH9" },
+     { ATA_I82801IB_AH4, 0, AHCI, 0x00, ATA_SA300, "ICH9" },
+     { ATA_I82801IB_AH6, 0, AHCI, 0x00, ATA_SA300, "ICH9" },
      { ATA_I31244,       0,    0, 0x00, ATA_SA150, "31244" },
      { 0, 0, 0, 0, 0, 0}};
     char buffer[64]; 
@@ -3043,6 +3050,12 @@
      { ATA_NFORCE_MCP55_S2, 0, 0,         NV4|NVQ, ATA_SA300, "nForce MCP55" },
      { ATA_NFORCE_MCP61,    0, AMDNVIDIA, NVIDIA,  ATA_UDMA6, "nForce MCP61" },
      { ATA_NFORCE_MCP61_S1, 0, 0,         NV4|NVQ, ATA_SA300, "nForce MCP61" },
+     { ATA_NFORCE_MCP61_S2, 0, 0,         NV4|NVQ, ATA_SA300, "nForce MCP61" },
+     { ATA_NFORCE_MCP61_S3, 0, 0,         NV4|NVQ, ATA_SA300, "nForce MCP61" },
+     { ATA_NFORCE_MCP65,    0, AMDNVIDIA, NVIDIA,  ATA_UDMA6, "nForce MCP65" },
+     { ATA_NFORCE_MCP67,    0, AMDNVIDIA, NVIDIA,  ATA_UDMA6, "nForce MCP67" },
+     { ATA_NFORCE_MCP73,    0, AMDNVIDIA, NVIDIA,  ATA_UDMA6, "nForce MCP73" },
+     { ATA_NFORCE_MCP77,    0, AMDNVIDIA, NVIDIA,  ATA_UDMA6, "nForce MCP77" },
      { 0, 0, 0, 0, 0, 0}} ;
     char buffer[64] ;