[Haiku-commits] r31020 - in haiku/trunk: headers/os/drivers src/add-ons/kernel/bus_managers/pci

[korli at BerliOS]

Author: korli
Date: 2009-06-12 23:16:04 +0200 (Fri, 12 Jun 2009)
New Revision: 31020
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=31020&view=rev

Modified:
   haiku/trunk/headers/os/drivers/PCI.h
   haiku/trunk/src/add-ons/kernel/bus_managers/pci/pci_info.cpp
Log:
added some PCI capabilities, wireless class values


Modified: haiku/trunk/headers/os/drivers/PCI.h
===================================================================
--- haiku/trunk/headers/os/drivers/PCI.h	2009-06-12 20:41:07 UTC (rev 31019)
+++ haiku/trunk/headers/os/drivers/PCI.h	2009-06-12 21:16:04 UTC (rev 31020)
@@ -265,8 +265,8 @@
 #define PCI_input					0x09	/* input devices */
 #define PCI_docking_station			0x0a	/* docking stations */
 #define PCI_processor				0x0b	/* processors */
-#define PCI_serial_bus				0x0c	/* serial_bus_controller */
-#define PCI_wireless				0x0d
+#define PCI_serial_bus				0x0c	/* serial bus controllers */
+#define PCI_wireless				0x0d	/* wireless controllers */
 #define PCI_intelligent_io			0x0e
 #define PCI_satellite_communications 0x0f
 #define PCI_encryption_decryption	0x10
@@ -362,8 +362,10 @@
 #define PCI_pcmcia			0x05			/* PCMCIA bridge */
 #define PCI_nubus			0x06			/* NuBus bridge */
 #define PCI_cardbus			0x07			/* CardBus bridge */
-#define PCI_raceway         0x08            /* RACEway bridge */
-#define PCI_bridge_other	0x80			/* other bridge device */
+#define PCI_raceway			0x08			/* RACEway bridge */
+#define PCI_bridge_transparent		0x09			/* PCI transparent */
+#define PCI_bridge_infiniband		0x0a			/* Infiniband */
+#define PCI_bridge_other		0x80			/* other bridge device */
 
 
 /* ---
@@ -469,6 +471,7 @@
 --- */
 
 #define PCI_docking_generic		0x00	/* generic docking station */
+#define PCI_docking_other		0x80	/* other docking stations */
 
 /* ---
 	values for the class_sub field for class_base = 0x0b (processor)
@@ -492,6 +495,11 @@
 #define PCI_ssa					0x02	/* SSA */
 #define PCI_usb					0x03	/* Universal Serial Bus */
 #define PCI_fibre_channel		0x04	/* Fibre channel */
+#define PCI_smbus			0x05
+#define PCI_infiniband			0x06
+#define PCI_ipmi			0x07
+#define PCI_sercos			0x08
+#define PCI_canbus			0x09
 
 /* ---
 	values of the class_api field for
@@ -503,6 +511,17 @@
 #define PCI_usb_ohci			0x10	/* Open Host Controller Interface */
 #define PCI_usb_ehci			0x20	/* Enhanced Host Controller Interface */
 
+/* ---
+	values for the class_sub field for class_base = 0x0d (wireless controller)
+--- */
+#define PCI_wireless_irda			0x00
+#define PCI_wireless_consumer_ir		0x01
+#define PCI_wireless_rf				0x02
+#define PCI_wireless_bluetooth			0x03
+#define PCI_wireless_broadband			0x04
+#define PCI_wireless_80211A			0x10
+#define PCI_wireless_80211B			0x20
+#define PCI_wireless_other			0x80
 
 /* ---
 	masks for command register bits
@@ -614,22 +633,26 @@
 #define PCI_pin_max             0x04
 
 /** PCI Capability Codes */
-#define PCI_cap_id_reserved     0x00
-#define PCI_cap_id_pm           0x01      /* Power management */
-#define PCI_cap_id_agp          0x02      /* AGP */
-#define PCI_cap_id_vpd          0x03      /* Vital product data */
-#define PCI_cap_id_slotid       0x04      /* Slot ID */
-#define PCI_cap_id_msi          0x05      /* Message signalled interrupt */
-#define PCI_cap_id_chswp        0x06      /* Compact PCI HotSwap */
-#define PCI_cap_id_pcix         0x07      /* PCI-X */
-#define PCI_cap_id_ldt          0x08
-#define PCI_cap_id_vendspec     0x09
-#define PCI_cap_id_debugport    0x0a
+#define PCI_cap_id_reserved	0x00
+#define PCI_cap_id_pm		0x01      /* Power management */
+#define PCI_cap_id_agp		0x02      /* AGP */
+#define PCI_cap_id_vpd		0x03      /* Vital product data */
+#define PCI_cap_id_slotid	0x04      /* Slot ID */
+#define PCI_cap_id_msi		0x05      /* Message signalled interrupt */
+#define PCI_cap_id_chswp	0x06      /* Compact PCI HotSwap */
+#define PCI_cap_id_pcix		0x07      /* PCI-X */
+#define PCI_cap_id_ldt		0x08
+#define PCI_cap_id_vendspec	0x09
+#define PCI_cap_id_debugport	0x0a
 #define PCI_cap_id_cpci_rsrcctl 0x0b
 #define PCI_cap_id_hotplug      0x0c
-#define PCI_cap_id_pcie			0x10	  /* PCIe (PCI express) */
-#define PCI_cap_id_msix			0x11      /* MSI-X */
-#define PCI_cap_id_sata         0x12      /* Serial ATA Capability */
+#define PCI_cap_id_subvendor	0x0d
+#define PCI_cap_id_agp8x	0x0e
+#define PCI_cap_id_secure_dev	0x0f
+#define PCI_cap_id_pcie		0x10	/* PCIe (PCI express) */
+#define PCI_cap_id_msix		0x11	/* MSI-X */
+#define PCI_cap_id_sata		0x12	/* Serial ATA Capability */
+#define PCI_cap_id_pciaf	0x13	/* PCI Advanced Features */
 
 /** Power Management Control Status Register settings */
 #define PCI_pm_mask             0x03

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/pci/pci_info.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/pci/pci_info.cpp	2009-06-12 20:41:07 UTC (rev 31019)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/pci/pci_info.cpp	2009-06-12 21:16:04 UTC (rev 31020)
@@ -235,7 +235,7 @@
 		case PCI_cap_id_msi:
 			return "MSI";
 		case PCI_cap_id_chswp:
-			return "chswp";
+			return "CompactPCIHotSwap";
 		case PCI_cap_id_pcix:
 			return "PCI-X";
 		case PCI_cap_id_ldt:
@@ -248,12 +248,20 @@
 			return "cpci_rsrcctl";
 		case PCI_cap_id_hotplug:
 			return "HotPlug";
+		case PCI_cap_id_subvendor:
+			return "subvendor";
+		case PCI_cap_id_agp8x:
+			return "AGP8x";
+		case PCI_cap_id_secure_dev:
+			return "Secure Device";
 		case PCI_cap_id_pcie:
 			return "PCIe";
 		case PCI_cap_id_msix:
 			return "MSI-X";
 		case PCI_cap_id_sata:
 			return "SATA";
+		case PCI_cap_id_pciaf:
+			return "AdvancedFeatures";
 		default:
 			return NULL;
 	}