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

* Fixes to let the device manager try to use the driver:

Browse Source 
- 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
This commit is contained in:
Axel Dörfler
2007-08-22 18:44:38 +00:00
parent 5c34aef797
commit 3460c2c4eb
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+3 -2
View File
@@ -153,7 +153,8 @@ AddDriversToHaikuImage : console dprintf $(X86_ONLY)keyboard null
AddDriversToHaikuImage audio hmulti : $(BEOS_ADD_ONS_DRIVERS_AUDIO) ; AddDriversToHaikuImage audio hmulti : $(BEOS_ADD_ONS_DRIVERS_AUDIO) ;
AddDriversToHaikuImage midi : $(BEOS_ADD_ONS_DRIVERS_MIDI) ; AddDriversToHaikuImage midi : $(BEOS_ADD_ONS_DRIVERS_MIDI) ;
AddDriversToHaikuImage bus : usb_raw ; 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 disk virtual : nbd ;
AddDriversToHaikuImage dvb : cx23882 ; AddDriversToHaikuImage dvb : cx23882 ;
AddDriversToHaikuImage graphics : $(BEOS_ADD_ONS_DRIVERS_GRAPHICS) ; 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 ; AddSymlinkToHaikuImage beos system lib : libnetwork.so : libbnetapi.so ;
# libGL.so have GLUT built-in # libGL.so have GLUT built-in
if $(TARGET_ARCH) = x86 { 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 # servers
src/add-ons/kernel/drivers/disk/ahci/ahci.c
+8 -3
View File
@@ -7,7 +7,7 @@
#include <device_manager.h> #include <device_manager.h>
#define TRACE(a...) dprintf("ahci: " a) #define TRACE(a...) dprintf("\33[35mahci:\33[30m " a)
#define FLOW(a...) dprintf("ahci: " a) #define FLOW(a...) dprintf("ahci: " a)
static float static float
@@ -39,7 +39,6 @@ ahci_supports_device(device_node_handle parent, bool *_noConnection)
} }
#endif #endif
return 0.0; return 0.0;
} }
@@ -85,7 +84,13 @@ ahci_device_cleanup(device_node_handle node)
static void static void
ahci_get_supported_paths(const char ***_busses, const char ***_devices) 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"); TRACE("ahci_get_supported_paths\n");
*_busses = kBus;
*_devices = kDevice;
} }
@@ -105,7 +110,7 @@ std_ops(int32 op, ...)
driver_module_info ahci_driver = { driver_module_info ahci_driver = {
{ {
"ahci", "ahci/device_v1",
0, 0,
std_ops std_ops
}, },