Diff reduction to Adaptec's driver (around build 15317): catch up with a

change in debugging routines.

The fwprintf macro in the AAC_DEBUG case (mapping to printf) isn't from the
Adaptec driver.

1 files changed, 5 insertions, 7 deletions

diff --git a/sys/dev/aac/aac_cam.c b/sys/dev/aac/aac_cam.c
index a21517e..e38b0ab 100644
--- a/sys/dev/aac/aac_cam.c
+++ b/sys/dev/aac/aac_cam.c
@@ -127,7 +127,7 @@ aac_cam_event(struct aac_softc *sc, struct aac_event *event, void *arg)
 static int
 aac_cam_probe(device_t dev)
 {
-	debug_called(2);
+	fwprintf(NULL, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
 	return (0);
 }
@@ -137,7 +137,7 @@ aac_cam_detach(device_t dev)
 {
 	struct aac_softc *sc;
 	struct aac_cam *camsc;
-	debug_called(2);
+	fwprintf(NULL, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
 	camsc = (struct aac_cam *)device_get_softc(dev);
 	sc = camsc->inf->aac_sc;
@@ -166,7 +166,7 @@ aac_cam_attach(device_t dev)
 	struct aac_cam *camsc;
 	struct aac_sim *inf;
 
-	debug_called(1);
+	fwprintf(NULL, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
 	camsc = (struct aac_cam *)device_get_softc(dev);
 	inf = (struct aac_sim *)device_get_ivars(dev);
@@ -215,10 +215,9 @@ aac_cam_action(struct cam_sim *sim, union ccb *ccb)
 	struct	aac_fib *fib;
 	struct	aac_command *cm;
 
-	debug_called(2);
-
 	camsc = (struct aac_cam *)cam_sim_softc(sim);
 	sc = camsc->inf->aac_sc;
+	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
 	/* Synchronous ops, and ops that don't require communication with the
 	 * controller */
@@ -484,9 +483,8 @@ aac_cam_complete(struct aac_command *cm)
 	struct 	aac_srb_response *srbr;
 	struct	aac_softc *sc;
 
-	debug_called(2);
-
 	sc = cm->cm_sc;
+	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 	ccb = cm->cm_private;
 	srbr = (struct aac_srb_response *)&cm->cm_fib->data[0];