From 3460c2c4eb8a6acbf564b07dfbce7c1dee6c4a83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 22 Aug 2007 18:44:38 +0000 Subject: [PATCH] * Fixes to let the device manager try to use the driver: - module name didn't have the "/device_v1" suffix (which is used to differentiate device modules, as they can be everywhere in the path). - ahci_get_supported_paths() now tells the device manager that it exports a PCI disk device. * Moved ahci out of the "scsi" sub-directory. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22041 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/HaikuImage | 5 +++-- src/add-ons/kernel/drivers/disk/ahci/ahci.c | 11 ++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 21fe9cd8ee..2923b97825 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -153,7 +153,8 @@ AddDriversToHaikuImage : console dprintf $(X86_ONLY)keyboard null AddDriversToHaikuImage audio hmulti : $(BEOS_ADD_ONS_DRIVERS_AUDIO) ; AddDriversToHaikuImage midi : $(BEOS_ADD_ONS_DRIVERS_MIDI) ; AddDriversToHaikuImage bus : usb_raw ; -AddDriversToHaikuImage disk scsi : ahci scsi_cd scsi_dsk ; +AddDriversToHaikuImage disk : ahci ; +AddDriversToHaikuImage disk scsi : scsi_cd scsi_dsk ; AddDriversToHaikuImage disk virtual : nbd ; AddDriversToHaikuImage dvb : cx23882 ; AddDriversToHaikuImage graphics : $(BEOS_ADD_ONS_DRIVERS_GRAPHICS) ; @@ -175,7 +176,7 @@ AddSymlinkToHaikuImage beos system lib : libnetwork.so : libnetapi.so ; AddSymlinkToHaikuImage beos system lib : libnetwork.so : libbnetapi.so ; # libGL.so have GLUT built-in if $(TARGET_ARCH) = x86 { -AddSymlinkToHaikuImage beos system lib : $(X86_ONLY)libGL.so : libglut.so ; + AddSymlinkToHaikuImage beos system lib : $(X86_ONLY)libGL.so : libglut.so ; } # servers diff --git a/src/add-ons/kernel/drivers/disk/ahci/ahci.c b/src/add-ons/kernel/drivers/disk/ahci/ahci.c index d315590541..e411f26e62 100644 --- a/src/add-ons/kernel/drivers/disk/ahci/ahci.c +++ b/src/add-ons/kernel/drivers/disk/ahci/ahci.c @@ -7,7 +7,7 @@ #include -#define TRACE(a...) dprintf("ahci: " a) +#define TRACE(a...) dprintf("\33[35mahci:\33[30m " a) #define FLOW(a...) dprintf("ahci: " a) static float @@ -39,7 +39,6 @@ ahci_supports_device(device_node_handle parent, bool *_noConnection) } #endif - return 0.0; } @@ -85,7 +84,13 @@ ahci_device_cleanup(device_node_handle node) static void ahci_get_supported_paths(const char ***_busses, const char ***_devices) { + static const char *kBus[] = { "pci", NULL }; + static const char *kDevice[] = { "drivers/dev/disk/sata", NULL }; + TRACE("ahci_get_supported_paths\n"); + + *_busses = kBus; + *_devices = kDevice; } @@ -105,7 +110,7 @@ std_ops(int32 op, ...) driver_module_info ahci_driver = { { - "ahci", + "ahci/device_v1", 0, std_ops },