From a00a1f4144274e7357e36d82ea05ae441b1b7607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 5 Nov 2007 17:45:31 +0000 Subject: [PATCH] * Added the device/vendor pair of the ICH7 used in the MacBooks, courtesy of "chrisjp", see bug #1599. * Minor cleanup. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22836 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/busses/scsi/ahci/ahci.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/add-ons/kernel/busses/scsi/ahci/ahci.c b/src/add-ons/kernel/busses/scsi/ahci/ahci.c index db4f5769dc..7581121e28 100644 --- a/src/add-ons/kernel/busses/scsi/ahci/ahci.c +++ b/src/add-ons/kernel/busses/scsi/ahci/ahci.c @@ -20,8 +20,7 @@ device_manager_info *gDeviceManager; -device_info sSupportedDevices[] = -{ +const device_info kSupportedDevices[] = { { 0x1002, 0x4380, "ATI SB600" }, { 0x1002, 0x4390, "ATI SB700/800" }, { 0x1002, 0x4391, "ATI IXP700" }, @@ -92,6 +91,7 @@ device_info sSupportedDevices[] = { 0x8086, 0x2683, "Intel ESB2" }, { 0x8086, 0x27c1, "Intel ICH7R (AHCI mode)" }, { 0x8086, 0x27c3, "Intel ICH7R (RAID mode)" }, + { 0x8086, 0x27c4, "Intel ICH7 (AHCI mode)" }, { 0x8086, 0x27c5, "Intel ICH7-M (AHCI mode)" }, { 0x8086, 0x27c6, "Intel ICH7-M DH (RAID mode)" }, { 0x8086, 0x2821, "Intel ICH8 (AHCI mode)" }, @@ -116,10 +116,11 @@ device_info sSupportedDevices[] = status_t -get_device_info(uint16 vendorID, uint16 deviceID, const char **name, uint32 *flags) +get_device_info(uint16 vendorID, uint16 deviceID, const char **name, + uint32 *flags) { - device_info *info; - for (info = sSupportedDevices; info->vendor; info++) { + const device_info *info; + for (info = kSupportedDevices; info->vendor; info++) { if (info->vendor == vendorID && info->device == deviceID) { if (name) *name = info->name; @@ -170,6 +171,7 @@ register_sim(device_node_handle parent) // #pragma mark - + static float ahci_supports_device(device_node_handle parent, bool *_noConnection) {