Various cleanups:

 - Move the command timeout check from a separate repeating timeout to the
   kthread since the kthread is already running periodically.
 - Move printing the hardware print buffer to the kthread.
 - Properly shut down the kernel thread on detach.
 - Detach the child array devices on detach.
 - Don't issue a controller halt command on detach.  Doing so requires a PCI
   reset to wake the controller back up.  The driver can now be unloaded as
   long as CAM support is not enabled.

1 files changed, 5 insertions, 5 deletions

diff --git a/sys/dev/aac/aac_cam.c b/sys/dev/aac/aac_cam.c
index 8ece0dd..92bb5e8 100644
--- a/sys/dev/aac/aac_cam.c
+++ b/sys/dev/aac/aac_cam.c
@@ -62,11 +62,10 @@
 #include <dev/aac/aacreg.h>
 #include <dev/aac/aac_ioctl.h>
 #include <dev/aac/aacvar.h>
-#include <dev/aac/aac_cam.h>
 
 struct aac_cam {
 	device_t		dev;
-	struct aac_cam_inf	*inf;
+	struct aac_sim		*inf;
 	struct cam_sim		*sim;
 	struct cam_path		*path;
 };
@@ -114,8 +113,9 @@ aac_cam_probe(device_t dev)
 static int
 aac_cam_detach(device_t dev)
 {
+	debug_called(2);
 
-	return (0);
+	return (EBUSY);
 }
 
 /*
@@ -128,12 +128,12 @@ aac_cam_attach(device_t dev)
 	struct cam_sim *sim;
 	struct cam_path *path;
 	struct aac_cam *camsc;
-	struct aac_cam_inf *inf;
+	struct aac_sim *inf;
 
 	debug_called(1);
 
 	camsc = (struct aac_cam *)device_get_softc(dev);
-	inf = (struct aac_cam_inf *)device_get_ivars(dev);
+	inf = (struct aac_sim *)device_get_ivars(dev);
 	camsc->inf = inf;
 
 	devq = cam_simq_alloc(inf->TargetsPerBus);