From 8eca44fa7ebb9ab3c2e96510ca9ef6d24fe4f958 Mon Sep 17 00:00:00 2001 From: Marcus Overhagen Date: Sun, 26 Aug 2007 16:04:10 +0000 Subject: [PATCH] added more debug output git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22063 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/busses/scsi/ahci/ahci.c | 11 +++--- .../kernel/busses/scsi/ahci/ahci_sim.c | 35 ++++++++++++------- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/src/add-ons/kernel/busses/scsi/ahci/ahci.c b/src/add-ons/kernel/busses/scsi/ahci/ahci.c index 1ad616d9e8..c24fcf57c1 100644 --- a/src/add-ons/kernel/busses/scsi/ahci/ahci.c +++ b/src/add-ons/kernel/busses/scsi/ahci/ahci.c @@ -70,7 +70,6 @@ ahci_supports_device(device_node_handle parent, bool *_noConnection) TRACE("ahci_supports_device\n"); - // make sure parent is an PCI IDE mass storage host adapter device node if (sDeviceManager->get_attr_string(parent, B_DRIVER_BUS, &bus, false) != B_OK || sDeviceManager->get_attr_uint8(parent, @@ -164,9 +163,11 @@ ahci_register_device(device_node_handle parent) static status_t -ahci_init_driver(device_node_handle node, void *userCookie, void **_cookie) +ahci_init_driver(device_node_handle node, void *user_cookie, void **_cookie) { - TRACE("ahci_init_driver\n"); + TRACE("ahci_init_driver, user_cookie %p\n", user_cookie); + *_cookie = (void *)0x5678; + TRACE("cookie = %p\n", *_cookie); return B_OK; } @@ -174,7 +175,7 @@ ahci_init_driver(device_node_handle node, void *userCookie, void **_cookie) static status_t ahci_uninit_driver(void *cookie) { - TRACE("ahci_uninit_driver\n"); + TRACE("ahci_uninit_driver, cookie %p\n", cookie); return B_OK; } @@ -182,7 +183,7 @@ ahci_uninit_driver(void *cookie) static void ahci_device_removed(device_node_handle node, void *cookie) { - TRACE("ahci_device_removed\n"); + TRACE("ahci_device_removed, cookie %p\n", cookie); } diff --git a/src/add-ons/kernel/busses/scsi/ahci/ahci_sim.c b/src/add-ons/kernel/busses/scsi/ahci/ahci_sim.c index c3a23c0069..f5436dc861 100644 --- a/src/add-ons/kernel/busses/scsi/ahci/ahci_sim.c +++ b/src/add-ons/kernel/busses/scsi/ahci/ahci_sim.c @@ -22,7 +22,7 @@ scsi_for_sim_interface *gSCSI; static void ahci_scsi_io(scsi_sim_cookie cookie, scsi_ccb *request) { - TRACE("ahci_scsi_io()\n"); + TRACE("ahci_scsi_io, cookie %p\n", cookie); request->subsys_status = SCSI_NO_HBA; gSCSI->finished(request, 1); @@ -33,7 +33,7 @@ ahci_scsi_io(scsi_sim_cookie cookie, scsi_ccb *request) static uchar ahci_abort_io(scsi_sim_cookie cookie, scsi_ccb *request) { - TRACE("ahci_abort_io()\n"); + TRACE("ahci_abort_io, cookie %p\n", cookie); return SCSI_REQ_CMP; } @@ -42,7 +42,7 @@ ahci_abort_io(scsi_sim_cookie cookie, scsi_ccb *request) static uchar ahci_reset_device(scsi_sim_cookie cookie, uchar targetID, uchar targetLUN) { - TRACE("ahci_reset_device()\n"); + TRACE("ahci_reset_device, cookie %p\n", cookie); return SCSI_REQ_CMP; } @@ -52,7 +52,7 @@ ahci_reset_device(scsi_sim_cookie cookie, uchar targetID, uchar targetLUN) static uchar ahci_terminate_io(scsi_sim_cookie cookie, scsi_ccb *request) { - TRACE("ahci_terminate_io()\n"); + TRACE("ahci_terminate_io, cookie %p\n", cookie); return SCSI_NO_HBA; } @@ -62,7 +62,16 @@ ahci_terminate_io(scsi_sim_cookie cookie, scsi_ccb *request) static uchar ahci_path_inquiry(scsi_sim_cookie cookie, scsi_path_inquiry *info) { - TRACE("ahci_path_inquiry()\n"); + TRACE("ahci_path_inquiry, cookie %p\n", cookie); + + memset(info, 0, sizeof(*info)); + info->version_num = 1; + // supports tagged requests and soft reset + info->hba_inquiry = 0; // SCSI_PI_TAG_ABLE | SCSI_PI_SOFT_RST; + // controller is 32, devices are 0 to 31 + info->initiator_id = 32; + // adapter command queue size + info->hba_queue_size = 1; return SCSI_NO_HBA; } @@ -72,7 +81,7 @@ ahci_path_inquiry(scsi_sim_cookie cookie, scsi_path_inquiry *info) static uchar ahci_scan_bus(scsi_sim_cookie cookie) { - TRACE("ahci_scan_bus()\n"); + TRACE("ahci_scan_bus, cookie %p\n", cookie); return SCSI_NO_HBA; } @@ -81,7 +90,7 @@ ahci_scan_bus(scsi_sim_cookie cookie) static uchar ahci_reset_bus(scsi_sim_cookie cookie) { - TRACE("ahci_reset_bus()\n"); + TRACE("ahci_reset_bus, cookie %p\n", cookie); return SCSI_NO_HBA; } @@ -94,7 +103,7 @@ static void ahci_get_restrictions(scsi_sim_cookie cookie, uchar targetID, bool *isATAPI, bool *noAutoSense, uint32 *maxBlocks) { - TRACE("ahci_get_restrictions()\n"); + TRACE("ahci_get_restrictions, cookie %p\n", cookie); *isATAPI = false; *noAutoSense = false; @@ -106,7 +115,7 @@ static status_t ahci_ioctl(scsi_sim_cookie cookie, uint8 targetID, uint32 op, void *buffer, size_t length) { - TRACE("ahci_ioctl()\n"); + TRACE("ahci_ioctl, cookie %p\n", cookie); return B_BAD_VALUE; } @@ -117,7 +126,9 @@ ahci_ioctl(scsi_sim_cookie cookie, uint8 targetID, uint32 op, void *buffer, static status_t ahci_sim_init_bus(device_node_handle node, void *user_cookie, void **_cookie) { - TRACE("ahci_sim_init_bus\n"); + TRACE("ahci_sim_init_bus, user_cookie %p\n", user_cookie); + *_cookie = (void *)0x1234; + TRACE("cookie = %p\n", *_cookie); return B_OK; } @@ -125,7 +136,7 @@ ahci_sim_init_bus(device_node_handle node, void *user_cookie, void **_cookie) static status_t ahci_sim_uninit_bus(void *cookie) { - TRACE("ahci_sim_uninit_bus\n"); + TRACE("ahci_sim_uninit_bus, cookie %p\n", cookie); return B_OK; } @@ -133,7 +144,7 @@ ahci_sim_uninit_bus(void *cookie) static void ahci_sim_bus_removed(device_node_handle node, void *cookie) { - TRACE("ahci_sim_bus_removed\n"); + TRACE("ahci_sim_bus_removed, cookie %p\n", cookie); }