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

use defines from PCI.h

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22333 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
2007-09-27 13:50:48 +00:00
parent 5aa7b7b6da
commit 2745621c91
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp
+1 -1
View File
@@ -82,7 +82,7 @@ AHCIController::Init()
uint16 pcicmd = gPCI->read_pci_config(fPCIDevice, PCI_command, 2); uint16 pcicmd = gPCI->read_pci_config(fPCIDevice, PCI_command, 2);
TRACE("pcicmd old 0x%04x\n", pcicmd); TRACE("pcicmd old 0x%04x\n", pcicmd);
pcicmd = PCI_PCICMD_BME | PCI_PCICMD_MSE | (pcicmd & ~PCI_PCICMD_IOS); pcicmd = PCI_command_master | PCI_command_memory | (pcicmd & ~PCI_command_io);
TRACE("pcicmd new 0x%04x\n", pcicmd); TRACE("pcicmd new 0x%04x\n", pcicmd);
gPCI->write_pci_config(fPCIDevice, PCI_command, 2, pcicmd); gPCI->write_pci_config(fPCIDevice, PCI_command, 2, pcicmd);
src/add-ons/kernel/busses/scsi/ahci/ahci_defs.h
-4
View File
@@ -219,10 +219,6 @@ extern scsi_for_sim_interface *gSCSI;
#define HI32(val) (((uint64)(val)) >> 32) #define HI32(val) (((uint64)(val)) >> 32)
#define ASSERT(expr) if (expr) {} else panic(#expr) #define ASSERT(expr) if (expr) {} else panic(#expr)
#define PCI_PCICMD_IOS 0x01
#define PCI_PCICMD_MSE 0x02
#define PCI_PCICMD_BME 0x04
#define PCI_VENDOR_INTEL 0x8086 #define PCI_VENDOR_INTEL 0x8086
#define PCI_VENDOR_JMICRON 0x197b #define PCI_VENDOR_JMICRON 0x197b
#define PCI_JMICRON_CONTROLLER_CONTROL_1 0x40 #define PCI_JMICRON_CONTROLLER_CONTROL_1 0x40