[svn-commits] fjoe: freebsd/trunk r8724 - in /freebsd/trunk/include/dahdi: ./ compat/

[SVN commits to the Digium repositories]

Author: fjoe
Date: Tue Jun  1 03:40:10 2010
New Revision: 8724

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8724
Log:
- Add dahdi_pci_get_device() and dahdi_pci_get_vendor() implementations.
- Fix dahdi_pci_get_bus() Linux implementation.

Modified:
    freebsd/trunk/include/dahdi/compat/bsd.h
    freebsd/trunk/include/dahdi/kernel.h

Modified: freebsd/trunk/include/dahdi/compat/bsd.h
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/include/dahdi/compat/bsd.h?view=diff&rev=8724&r1=8723&r2=8724
==============================================================================
--- freebsd/trunk/include/dahdi/compat/bsd.h (original)
+++ freebsd/trunk/include/dahdi/compat/bsd.h Tue Jun  1 03:40:10 2010
@@ -390,6 +390,8 @@
 #define dahdi_pci_get_bus(pci_dev)	pci_get_bus((pci_dev)->dev)
 #define dahdi_pci_get_slot(pci_dev)	pci_get_slot((pci_dev)->dev)
 #define dahdi_pci_get_irq(pci_dev)	pci_get_irq((pci_dev)->dev)
+#define dahdi_pci_get_device(pci_dev)	pci_get_device((pci_dev)->dev)
+#define dahdi_pci_get_vendor(pci_dev)	pci_get_vendor((pci_dev)->dev)
 
 struct pci_device_id *dahdi_pci_device_id_lookup(device_t dev, struct pci_device_id *tbl);
 

Modified: freebsd/trunk/include/dahdi/kernel.h
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/include/dahdi/kernel.h?view=diff&rev=8724&r1=8723&r2=8724
==============================================================================
--- freebsd/trunk/include/dahdi/kernel.h (original)
+++ freebsd/trunk/include/dahdi/kernel.h Tue Jun  1 03:40:10 2010
@@ -106,9 +106,11 @@
 #define spin_lock_destroy(lock)
 #define _LIST_HEAD(n)	LIST_HEAD(n)
 
-#define dahdi_pci_get_bus(dev)	((dev)->bus->number)
-#define dahdi_pci_get_slot(dev)	(PCI_SLOT((dev)->devfn) + 1)
-#define dahdi_pci_get_irq(dev)	((dev)->irq)
+#define dahdi_pci_get_bus(dev)		((dev)->bus->number)
+#define dahdi_pci_get_slot(dev)		(PCI_SLOT((dev)->devfn))
+#define dahdi_pci_get_irq(dev)		((dev)->irq)
+#define dahdi_pci_get_device(dev)	((dev)->device)
+#define dahdi_pci_get_vendor(dev)	((dev)->vendor)
 #endif /* !__FreeBSD__ */
 
 /*! Default chunk size for conferences and such -- static right now, might make