i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed line into pin, since in PCI terminology, IRQ interrupt number == line, and the physical interrupt wire == pin

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4862 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
beveloper
2003-09-29 19:09:32 +00:00
parent fb5398b8f7
commit 79f40e4322
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/pci_priv.h
+14 -6
View File
@@ -1,5 +1,8 @@
#include <BeBuild.h> #include <KernelExport.h>
#include <SupportDefs.h>
#ifdef __cplusplus
extern "C" {
#endif
status_t pci_config_init(void); status_t pci_config_init(void);
uint32 pci_read_config(uint8 bus, uint8 device, uint8 function, uint8 offset, uint8 size); uint32 pci_read_config(uint8 bus, uint8 device, uint8 function, uint8 offset, uint8 size);
@@ -15,15 +18,16 @@ uint32 pci_read_io_32(int mapped_io_addr);
void pci_write_io_32(int mapped_io_addr, uint32 value); void pci_write_io_32(int mapped_io_addr, uint32 value);
status_t pci_irq_init(void); status_t pci_irq_init(void);
uint8 pci_read_irq(uint8 bus, uint8 device, uint8 function, uint8 line); uint8 pci_read_irq(uint8 bus, uint8 device, uint8 function, uint8 pin);
void pci_write_irq(uint8 bus, uint8 device, uint8 function, uint8 line, uint8 irq); void pci_write_irq(uint8 bus, uint8 device, uint8 function, uint8 pin, uint8 irq);
extern spinlock gConfigLock;
extern int gMaxBusDevices; extern int gMaxBusDevices;
extern bool gIrqRouterAvailable; extern bool gIrqRouterAvailable;
#define PCI_LOCK_CONFIG(status) \ #define PCI_LOCK_CONFIG(cpu_status) \
{ \ { \
status = disable_interrupts(); \ cpu_status = disable_interrupts(); \
acquire_spinlock(&gConfigLock); \ acquire_spinlock(&gConfigLock); \
} }
@@ -32,3 +36,7 @@ extern bool gIrqRouterAvailable;
release_spinlock(&gConfigLock); \ release_spinlock(&gConfigLock); \
restore_interrupts(cpu_status); \ restore_interrupts(cpu_status); \
} }
#ifdef __cplusplus
}
#endif
src/add-ons/kernel/bus_managers/pci/arch/ppc/pci_irq.c
+2 -2
View File
@@ -8,13 +8,13 @@ pci_irq_init(void)
uint8 uint8
pci_read_irq(uint8 bus, uint8 device, uint8 function, uint8 line) pci_read_irq(uint8 bus, uint8 device, uint8 function, uint8 pin)
{ {
return 0; return 0;
} }
void void
pci_write_irq(uint8 bus, uint8 device, uint8 function, uint8 line, uint8 irq) pci_write_irq(uint8 bus, uint8 device, uint8 function, uint8 pin, uint8 irq)
{ {
} }
src/add-ons/kernel/bus_managers/pci/arch/x86/pci_irq.c
+2 -2
View File
@@ -8,13 +8,13 @@ pci_irq_init(void)
uint8 uint8
pci_read_irq(uint8 bus, uint8 device, uint8 function, uint8 line) pci_read_irq(uint8 bus, uint8 device, uint8 function, uint8 pin)
{ {
return 0; return 0;
} }
void void
pci_write_irq(uint8 bus, uint8 device, uint8 function, uint8 line, uint8 irq) pci_write_irq(uint8 bus, uint8 device, uint8 function, uint8 pin, uint8 irq)
{ {
} }