From 09631173bec409e4bbcb0b25fa3ae16f3a40775d Mon Sep 17 00:00:00 2001 From: Matthew D Fleming Date: Fri, 15 Oct 2010 15:24:59 +0000 Subject: [PATCH] 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. --- sys/dev/mps/mps.c | 5 ++++- sys/modules/mps/Makefile | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/dev/mps/mps.c b/sys/dev/mps/mps.c index f872611b451c..404b12e1e232 100644 --- a/sys/dev/mps/mps.c +++ b/sys/dev/mps/mps.c @@ -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); } diff --git a/sys/modules/mps/Makefile b/sys/modules/mps/Makefile index f8f520b6d7c8..5e91084fe731 100644 --- a/sys/modules/mps/Makefile +++ b/sys/modules/mps/Makefile @@ -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