[LinuxBIOS] r2905 - trunk/LinuxBIOSv2/src/southbridge/sis/sis966

svn at openbios.org svn at openbios.org
Tue Oct 30 03:17:49 CET 2007


Author: stepan
Date: 2007-10-30 03:17:49 +0100 (Tue, 30 Oct 2007)
New Revision: 2905

Modified:
   trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_aza.c
   trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_ht.c
   trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_ide.c
   trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_lpc.c
   trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_nic.c
   trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_pci.c
   trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_pcie.c
   trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_sata.c
   trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_smbus.c
   trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_usb.c
   trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_usb2.c
   trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sisnb.c
Log:
fix the readwrite/readonly clashes for the pci_driver structs in the sis
code. This is trivial, I did it for the other components before.

Signed-off-by: Stefan Reinauer <stepan at coresystems.de>
Acked-by: Stefan Reinauer <stepan at coresystems.de>



Modified: trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_aza.c
===================================================================
--- trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_aza.c	2007-10-30 01:12:20 UTC (rev 2904)
+++ trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_aza.c	2007-10-30 02:17:49 UTC (rev 2905)
@@ -31,8 +31,7 @@
 #include <arch/io.h>
 #include "sis966.h"
 
-uint8_t	SiS_SiS7502_init[6][3]={
-
+uint8_t	SiS_SiS7502_init[7][3]={
 {0x04, 0xFF, 0x07},					 
 {0x2C, 0xFF, 0x39},					 
 {0x2D, 0xFF, 0x10},					 
@@ -493,7 +492,7 @@
 	.ops_pci	= &lops_pci,
 };
 
-static struct pci_driver azaaudio_driver __pci_driver = {
+static const struct pci_driver azaaudio_driver __pci_driver = {
 	.ops	= &aza_audio_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_AZA,

Modified: trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_ht.c
===================================================================
--- trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_ht.c	2007-10-30 01:12:20 UTC (rev 2904)
+++ trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_ht.c	2007-10-30 02:17:49 UTC (rev 2905)
@@ -48,7 +48,7 @@
 	.ops_pci	= &lops_pci,
 };
 
-static struct pci_driver ht_driver __pci_driver = {
+static const struct pci_driver ht_driver __pci_driver = {
 	.ops	= &ht_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_HT,

Modified: trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_ide.c
===================================================================
--- trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_ide.c	2007-10-30 01:12:20 UTC (rev 2904)
+++ trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_ide.c	2007-10-30 02:17:49 UTC (rev 2905)
@@ -167,7 +167,7 @@
 	.ops_pci	= &lops_pci,
 };
 
-static struct pci_driver ide_driver __pci_driver = {
+static const struct pci_driver ide_driver __pci_driver = {
 	.ops	= &ide_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_IDE,

Modified: trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_lpc.c
===================================================================
--- trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_lpc.c	2007-10-30 01:12:20 UTC (rev 2904)
+++ trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_lpc.c	2007-10-30 02:17:49 UTC (rev 2905)
@@ -397,39 +397,39 @@
 //	.enable		= sis966_enable,
 	.ops_pci	= &lops_pci,
 };
-static struct pci_driver lpc_driver __pci_driver = {
+static const struct pci_driver lpc_driver __pci_driver = {
 	.ops	= &lpc_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_LPC,
 };
 
-static struct pci_driver lpc_driver_pro __pci_driver = {
+static const struct pci_driver lpc_driver_pro __pci_driver = {
 	.ops	= &lpc_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_PRO,
 };
 
-static struct pci_driver lpc_driver_lpc2 __pci_driver = {
+static const struct pci_driver lpc_driver_lpc2 __pci_driver = {
 	.ops	= &lpc_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_LPC_2,
 };
-static struct pci_driver lpc_driver_lpc3 __pci_driver = {
+static const struct pci_driver lpc_driver_lpc3 __pci_driver = {
 	.ops	= &lpc_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_LPC_3,
 };
-static struct pci_driver lpc_driver_lpc4 __pci_driver = {
+static const struct pci_driver lpc_driver_lpc4 __pci_driver = {
 	.ops	= &lpc_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_LPC_4,
 };
-static struct pci_driver lpc_driver_lpc5 __pci_driver = {
+static const struct pci_driver lpc_driver_lpc5 __pci_driver = {
 	.ops	= &lpc_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_LPC_5,
 };
-static struct pci_driver lpc_driver_lpc6 __pci_driver = {
+static const struct pci_driver lpc_driver_lpc6 __pci_driver = {
 	.ops	= &lpc_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_LPC_6,
@@ -444,7 +444,7 @@
 	.ops_pci	= &lops_pci,
 };
 
-static struct pci_driver lpc_driver_slave __pci_driver = {
+static const struct pci_driver lpc_driver_slave __pci_driver = {
 	.ops	= &lpc_slave_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_SLAVE,

Modified: trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_nic.c
===================================================================
--- trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_nic.c	2007-10-30 01:12:20 UTC (rev 2904)
+++ trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_nic.c	2007-10-30 02:17:49 UTC (rev 2905)
@@ -631,12 +631,12 @@
 //	.enable		= sis966_enable,
 	.ops_pci	= &lops_pci,
 };
-static struct pci_driver nic_driver __pci_driver = {
+static const struct pci_driver nic_driver __pci_driver = {
 	.ops	= &nic_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_NIC1,
 };
-static struct pci_driver nic_bridge_driver __pci_driver = {
+static const struct pci_driver nic_bridge_driver __pci_driver = {
 	.ops	= &nic_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_NIC_BRIDGE,

Modified: trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_pci.c
===================================================================
--- trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_pci.c	2007-10-30 01:12:20 UTC (rev 2904)
+++ trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_pci.c	2007-10-30 02:17:49 UTC (rev 2905)
@@ -101,7 +101,7 @@
 	.ops_pci	= &lops_pci,
 };
 
-static struct pci_driver pci_driver __pci_driver = {
+static const struct pci_driver pci_driver __pci_driver = {
 	.ops	= &pci_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_PCI,

Modified: trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_pcie.c
===================================================================
--- trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_pcie.c	2007-10-30 01:12:20 UTC (rev 2904)
+++ trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_pcie.c	2007-10-30 02:17:49 UTC (rev 2905)
@@ -58,27 +58,27 @@
 	.ops_pci	= &lops_pci,
 };
 
-static struct pci_driver pciebc_driver __pci_driver = {
+static const struct pci_driver pciebc_driver __pci_driver = {
 	.ops	= &pcie_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_PCIE_B_C,
 };
-static struct pci_driver pciee_driver __pci_driver = {
+static const struct pci_driver pciee_driver __pci_driver = {
 	.ops	= &pcie_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_PCIE_E,
 };
-static struct pci_driver pciea_driver __pci_driver = {
+static const struct pci_driver pciea_driver __pci_driver = {
 	.ops	= &pcie_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_PCIE_A,
 };
-static struct pci_driver pcief_driver __pci_driver = {
+static const struct pci_driver pcief_driver __pci_driver = {
 	.ops	= &pcie_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_PCIE_F,
 };
-static struct pci_driver pcied_driver __pci_driver = {
+static const struct pci_driver pcied_driver __pci_driver = {
 	.ops	= &pcie_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_PCIE_D,

Modified: trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_sata.c
===================================================================
--- trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_sata.c	2007-10-30 01:12:20 UTC (rev 2904)
+++ trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_sata.c	2007-10-30 02:17:49 UTC (rev 2905)
@@ -288,13 +288,13 @@
 	.ops_pci	= &lops_pci,
 };
 
-static struct pci_driver sata0_driver __pci_driver = {
+static const struct pci_driver sata0_driver __pci_driver = {
 	.ops	= &sata_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_SATA0,
 };
 
-static struct pci_driver sata1_driver __pci_driver = {
+static const struct pci_driver sata1_driver __pci_driver = {
 	.ops	= &sata_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_SATA1,

Modified: trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_smbus.c
===================================================================
--- trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_smbus.c	2007-10-30 01:12:20 UTC (rev 2904)
+++ trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_smbus.c	2007-10-30 02:17:49 UTC (rev 2905)
@@ -146,7 +146,7 @@
 	.ops_pci	= &lops_pci,
 	.ops_smbus_bus	= &lops_smbus_bus,
 };
-static struct pci_driver smbus_driver __pci_driver = {
+static const struct pci_driver smbus_driver __pci_driver = {
 	.ops	= &smbus_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_SM2,

Modified: trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_usb.c
===================================================================
--- trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_usb.c	2007-10-30 01:12:20 UTC (rev 2904)
+++ trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_usb.c	2007-10-30 02:17:49 UTC (rev 2905)
@@ -107,7 +107,7 @@
 	.ops_pci	= &lops_pci,
 };
 
-static struct pci_driver usb_driver __pci_driver = {
+static const struct pci_driver usb_driver __pci_driver = {
 	.ops	= &usb_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_USB,

Modified: trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_usb2.c
===================================================================
--- trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_usb2.c	2007-10-30 01:12:20 UTC (rev 2904)
+++ trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sis966_usb2.c	2007-10-30 02:17:49 UTC (rev 2905)
@@ -161,7 +161,7 @@
 	.ops_pci	= &lops_pci,
 };
 
-static struct pci_driver usb2_driver __pci_driver = {
+static const struct pci_driver usb2_driver __pci_driver = {
 	.ops	= &usb2_ops,
 	.vendor	= PCI_VENDOR_ID_SIS,
 	.device	= PCI_DEVICE_ID_SIS_SIS966_EHCI,

Modified: trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sisnb.c
===================================================================
--- trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sisnb.c	2007-10-30 01:12:20 UTC (rev 2904)
+++ trunk/LinuxBIOSv2/src/southbridge/sis/sis966/sisnb.c	2007-10-30 02:17:49 UTC (rev 2905)
@@ -185,7 +185,7 @@
 	.ops_pci          = 0,
 };
 
-static struct pci_driver sisnb_driver __pci_driver = {
+static const struct pci_driver sisnb_driver __pci_driver = {
 	.ops    = &sisnb_ops,
 	.vendor = PCI_VENDOR_ID_SIS,
 	.device = PCI_DEVICE_ID_SIS_SIS761,





More information about the coreboot mailing list