removed fast_log usage

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23326 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/add-ons/kernel/bus_managers/ata/Jamfile

@@ -7,7 +7,6 @@ UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
 KernelAddon ide :
 	ata.c
 	atapi.c
-	basic_protocol.c
 	channels.c
 	devices.c
 	dma.c
@@ -15,7 +14,6 @@ KernelAddon ide :
 	ide.c
 	ide_sim.c
 	pio.c
-	queuing.c
 	scsi2ata.c
 	sync.c
 	virtual_memory.c

src/add-ons/kernel/bus_managers/ata/ata.c

@@ -137,14 +137,13 @@ ata_send_command(ide_device_info *device, ide_qrequest *qrequest,
 
 	ASSERT(new_state == ata_state_pio); // XXX only pio for now
 
-	FAST_LOGN(bus->log, ev_ide_send_command, 15, device->is_device1, (uint32)qrequest, 
+	FLOW("ata_send_command: %d:%d, qrequest %p, request %p, tf %02x,%02x,%02x,%02x,%02x,%02x,%02x,%02x,%02x,%02x,%02x\n",
+		device->target_id, device->is_device1, 
+		qrequest, qrequest ? qrequest->request : NULL,
 		device->tf.raw.r[0], device->tf.raw.r[1], device->tf.raw.r[2], 
 		device->tf.raw.r[3], device->tf.raw.r[4], device->tf.raw.r[5], 
-		device->tf.raw.r[6], 
+		device->tf.raw.r[6], device->tf.raw.r[7], device->tf.raw.r[8],
-		device->tf.raw.r[7], device->tf.raw.r[8], device->tf.raw.r[9], 
+		device->tf.raw.r[9], device->tf.raw.r[10], device->tf.raw.r[11]);
-		device->tf.raw.r[10], device->tf.raw.r[11]);
-
-	TRACE("ata_send_command: qrequest %p, request %p\n", qrequest, qrequest ? qrequest->request : NULL);
 
 	// disable Interrupts for PIO transfers
 	if (new_state == ata_state_pio) {

src/add-ons/kernel/bus_managers/ata/ide_internal.h

@@ -17,7 +17,6 @@
 #include "ide_device_infoblock.h"
 #include <ide_types.h>
 #include <device_manager.h>
-#include <fast_log.h>
 
 #define debug_level_error 2
 #define debug_level_info 1
@@ -28,24 +27,6 @@
 #include "wrapper.h"
 
 
-//#define USE_FAST_LOG
-
-#ifdef USE_FAST_LOG
-#define FAST_LOG0( handle, event ) fast_log->log_0( handle, event )
-#define FAST_LOG1( handle, event, param ) fast_log->log_1( handle, event, param )
-#define FAST_LOG2( handle, event, param1, param2 ) fast_log->log_2( handle, event, param1, param2 )
-#define FAST_LOG3( handle, event, param1, param2, param3 ) fast_log->log_3( handle, event, param1, param2, param3 )
-#define FAST_LOGN( handle, event, num_params... ) fast_log->log_n( handle, event, num_params )
-#else
-#define FAST_LOG0( handle, event )
-#define FAST_LOG1( handle, event, param )
-#define FAST_LOG2( handle, event, param1, param2 )
-#define FAST_LOG3( handle, event, param1, param2, param3 )
-#define FAST_LOGN( handle, event, num_params... )
-#endif
-
-
-
 #define IDE_STD_TIMEOUT 10
 #define IDE_RELEASE_TIMEOUT 10000000
 
@@ -58,7 +39,6 @@
 #define IDE_CHANNEL_ID_ITEM "ide/channel_id"
 
 extern device_manager_info *pnp;
-extern fast_log_info *fast_log;
 
 
 typedef struct ide_bus_info ide_bus_info;
@@ -215,7 +195,6 @@ struct ide_bus_info {
 	uint8 can_DMA;
 	uint8 can_CQ;
 
-	fast_log_handle log;
 	char name[32];
 };
 

src/add-ons/kernel/bus_managers/ata/ide_sim.c

@@ -37,41 +37,6 @@
 
 
 scsi_for_sim_interface *scsi;
-fast_log_info *fast_log;
-
-
-#ifdef USE_FAST_LOG
-static fast_log_event_type ide_events[] =
-{
-	{ ev_ide_send_command, "ev_ide_send_command " },
-	{ ev_ide_device_start_service, "ev_ide_device_start_service" },
-	{ ev_ide_device_start_service2, "ev_ide_device_start_service2" },
-	{ ev_ide_dpc_service, "ev_ide_dpc_service" },
-	{ ev_ide_dpc_continue, "ev_ide_dpc_continue" },
-	{ ev_ide_irq_handle, "ev_ide_irq_handle" },
-	{ ev_ide_cancel_irq_timeout, "ev_ide_cancel_irq_timeout" },
-	{ ev_ide_start_waiting, "ev_ide_start_waiting" },
-	{ ev_ide_timeout_dpc, "ev_ide_timeout_dpc" },
-	{ ev_ide_timeout, "ev_ide_timeout" },
-	{ ev_ide_reset_bus, "ev_ide_reset_bus" },
-	{ ev_ide_reset_device, "ev_ide_reset_device" },
-	
-	{ ev_ide_scsi_io, "ev_ide_scsi_io" },
-	{ ev_ide_scsi_io_exec, "ev_ide_scsi_io_exec" },
-	{ ev_ide_scsi_io_invalid_device, "ev_ide_scsi_io_invalid_device" },
-	{ ev_ide_scsi_io_bus_busy, "ev_ide_scsi_io_bus_busy" },
-	{ ev_ide_scsi_io_device_busy, "ev_ide_scsi_io_device_busy" },
-	{ ev_ide_scsi_io_disconnected, "ev_ide_scsi_io_disconnected" },
-	{ ev_ide_finish_request, "ev_ide_finish_request" },
-	{ ev_ide_finish_norelease, "ev_ide_finish_norelease" },
-
-	{ ev_ide_scan_device_int, "ev_ide_scan_device_int" },
-	{ ev_ide_scan_device_int_cant_send, "ev_ide_scan_device_int_cant_send" },
-	{ ev_ide_scan_device_int_keeps_busy, "ev_ide_scan_device_int_keeps_busy" },
-	{ ev_ide_scan_device_int_found, "ev_ide_scan_device_int_found" },
-	{}
-};
-#endif
 
 
 static void disconnect_worker(ide_bus_info *bus, void *arg);
@@ -85,8 +50,6 @@ sim_scsi_io(ide_bus_info *bus, scsi_ccb *request)
 	ide_qrequest *qrequest;
 	//ide_request_priv *priv;
 
-//	FAST_LOG3( bus->log, ev_ide_scsi_io, (uint32)request, request->target_id, request->target_lun );	
-//	SHOW_FLOW(3, "%d:%d", request->target_id, request->target_lun);
 	FLOW("sim_scsi_iobus %p, %d:%d\n", bus, request->target_id, request->target_lun);
 
 	if (bus->disconnected)
@@ -133,8 +96,8 @@ sim_scsi_io(ide_bus_info *bus, scsi_ccb *request)
 
 	bus->active_qrequest = qrequest; // XXX whats this!?!?!
 
-	FAST_LOGN(bus->log, ev_ide_scsi_io_exec, 4, (uint32)qrequest,
+
-		(uint32)request, bus->num_running_reqs, device->num_running_reqs);
+	FLOW("calling exec_io: %p, %d:%d\n", bus, request->target_id, request->target_lun);
 
 	device->exec_io(device, qrequest);
 
@@ -142,7 +105,6 @@ sim_scsi_io(ide_bus_info *bus, scsi_ccb *request)
 
 err_inv_device:
 	FLOW("Invalid device %d:%d\n", request->target_id, request->target_lun);
-	FAST_LOG1(bus->log, ev_ide_scsi_io_invalid_device, (uint32)request);
 
 	request->subsys_status = SCSI_SEL_TIMEOUT;
 	scsi->finished(request, 1);
@@ -150,7 +112,6 @@ err_inv_device:
 
 err_bus_busy:
 	FLOW("Bus busy\n");
-	FAST_LOG1(bus->log, ev_ide_scsi_io_bus_busy, (uint32)request);
 
 	IDE_UNLOCK(bus);
 	scsi->requeue(request, true);
@@ -159,7 +120,6 @@ err_bus_busy:
 
 err_device_busy:
 	FLOW("Device busy\n");
-	FAST_LOG1(bus->log, ev_ide_scsi_io_device_busy, (uint32)request);
 
 	IDE_UNLOCK(bus);
 	scsi->requeue(request, false);
@@ -168,7 +128,6 @@ err_device_busy:
 
 err_disconnected:
 	TRACE("No controller anymore\n");
-	FAST_LOG1(bus->log, ev_ide_scsi_io_disconnected, (uint32)request);
 	request->subsys_status = SCSI_NO_HBA;
 	scsi->finished(request, 1);
 	return;
@@ -369,7 +328,6 @@ finish_request(ide_qrequest *qrequest, bool resubmit)
 	ide_bus_info *bus = device->bus;
 	scsi_ccb *request;
 
-	FAST_LOG2(bus->log, ev_ide_finish_request, (uint32)qrequest, resubmit);
 	SHOW_FLOW0(3, "");
 
 	// save request first, as qrequest can be reused as soon as
@@ -481,7 +439,6 @@ finish_norelease(ide_qrequest *qrequest, bool resubmit)
 	ide_device_info *device = qrequest->device;
 	ide_bus_info *bus = device->bus;
 
-	FAST_LOG2(bus->log, ev_ide_finish_norelease, (uint32)qrequest, resubmit);
 
 	qrequest->running = false;
 
@@ -565,13 +522,6 @@ ide_sim_init_bus(device_node_handle node, void *user_cookie, void **cookie)
 		sprintf(bus->name, "ide_bus %d", (int)channel_id);
 	}
 
-#if 0
-	bus->log = fast_log->start_log(bus->name, ide_events);
-	if (bus->log == NULL) {
-		res = B_NO_MEMORY;
-		goto err;
-	}
-#endif
 
 	init_synced_pc(&bus->disconnect_syncinfo, disconnect_worker);
 
@@ -642,10 +592,7 @@ err4:
 	scsi->free_dpc(bus->irq_dpc);
 err1:
 	uninit_synced_pc(&bus->disconnect_syncinfo);
-#ifdef USE_FAST_LOG
-	fast_log->stop_log(bus->log);
 err:
-#endif
 	free(bus);
 
 	return status;
@@ -666,7 +613,6 @@ ide_sim_uninit_bus(ide_bus_info *bus)
 	DELETE_BEN(&bus->status_report_ben);	
 	scsi->free_dpc(bus->irq_dpc);
 	uninit_synced_pc(&bus->disconnect_syncinfo);
-//	fast_log->stop_log(bus->log);
 
 	free(bus);
 

src/add-ons/kernel/bus_managers/ata/sync.c

@@ -43,7 +43,6 @@ ide_dpc(void *arg)
 	// in idle state, so we just check whether there is an active request,
 	// which means that we were async_waiting
 	if (bus->active_qrequest != NULL) {
-		FAST_LOG1(bus->log, ev_ide_dpc_continue, (uint32)bus->active_qrequest);
 		TRACE(("continue command\n"));
 
 		// cancel timeout
@@ -67,8 +66,6 @@ ide_dpc(void *arg)
 		// for service requests
 		TRACE(("irq in idle mode - possible service request\n"));
 
-		FAST_LOG0(bus->log, ev_ide_dpc_service);
-
 		device = get_current_device(bus);
 		if (device == NULL) {
 			// got an interrupt from a non-existing device
@@ -189,8 +186,6 @@ ide_irq_handler(ide_bus_info *bus, uint8 status)
 void
 cancel_irq_timeout(ide_bus_info *bus)
 {
-	FAST_LOG0(bus->log, ev_ide_cancel_irq_timeout);
-
 	IDE_LOCK(bus);
 	bus->state = ide_state_accessing;
 	IDE_UNLOCK(bus);
@@ -207,8 +202,6 @@ start_waiting(ide_bus_info *bus, uint32 timeout, int new_state)
 {
 	int res;
 
-	FAST_LOG1(bus->log, ev_ide_start_waiting, new_state);
-
 	TRACE(("timeout = %u\n", (uint)timeout));
 
 	bus->state = new_state;
@@ -257,8 +250,6 @@ ide_timeout_dpc(void *arg)
 
 	dprintf("ide: ide_timeout_dpc() bus %p, device %p\n", bus, device);
 
-	FAST_LOG1(bus->log, ev_ide_timeout_dpc, (uint32)qrequest);
-
 	// this also resets overlapped commands
 //	reset_device(device, qrequest);