From owner-svn-src-all@FreeBSD.ORG  Fri Oct 15 15:24:59 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 807B1106564A;
	Fri, 15 Oct 2010 15:24:59 +0000 (UTC) (envelope-from mdf@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6F3F38FC13;
	Fri, 15 Oct 2010 15:24:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9FFOxrW065705;
	Fri, 15 Oct 2010 15:24:59 GMT (envelope-from mdf@svn.freebsd.org)
Received: (from mdf@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9FFOxLl065702;
	Fri, 15 Oct 2010 15:24:59 GMT (envelope-from mdf@svn.freebsd.org)
Message-Id: <201010151524.o9FFOxLl065702@svn.freebsd.org>
From: Matthew D Fleming <mdf@FreeBSD.org>
Date: Fri, 15 Oct 2010 15:24:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213898 - in head/sys: dev/mps modules/mps
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Oct 2010 15:24:59 -0000

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