svn commit: r213898 - in head/sys: dev/mps modules/mps

[Matthew D Fleming]

Author: mdf
Date: Fri Oct 15 15:24:59 2010
New Revision: 213898
URL: http://svn.freebsd.org/changeset/base/213898

Log:
  Currently only opt_compat.h is included by the mps(4) driver. Also
  enable /dev/mps0, which was missing from my previous patches enabling
  f/w upload and download.
  
  opt_compat.h issue noticed by scottl.

Modified:
  head/sys/dev/mps/mps.c
  head/sys/modules/mps/Makefile

Modified: head/sys/dev/mps/mps.c
==============================================================================
--- head/sys/dev/mps/mps.c	Fri Oct 15 15:23:34 2010	(r213897)
+++ head/sys/dev/mps/mps.c	Fri Oct 15 15:24:59 2010	(r213898)
@@ -924,7 +924,10 @@ mps_attach(struct mps_softc *sc)
 	/* Attach the subsystems so they can prepare their event masks. */
 	/* XXX Should be dynamic so that IM/IR and user modules can attach */
 	if (((error = mps_attach_log(sc)) != 0) ||
-	    ((error = mps_attach_sas(sc)) != 0)) {
+	    ((error = mps_attach_sas(sc)) != 0) ||
+	    ((error = mps_attach_user(sc)) != 0)) {
+		mps_printf(sc, "%s failed to attach all subsystems: error %d\n",
+		    __func__, error);
 		mps_free(sc);
 		return (error);
 	}

Modified: head/sys/modules/mps/Makefile
==============================================================================
--- head/sys/modules/mps/Makefile	Fri Oct 15 15:23:34 2010	(r213897)
+++ head/sys/modules/mps/Makefile	Fri Oct 15 15:24:59 2010	(r213898)
@@ -4,7 +4,7 @@
 
 KMOD=	mps
 SRCS=	mps_pci.c mps.c mps_sas.c mps_table.c mps_user.c
-SRCS+=	opt_mps.h opt_cam.h
+SRCS+=	opt_compat.h
 SRCS+=	device_if.h bus_if.h pci_if.h
 
 #CFLAGS += -DMPS_DEBUG