Module Name: src
Committed By: dyoung
Date: Sun Dec 6 21:35:05 UTC 2009
Modified Files:
src/sys/arch/arm/s3c2xx0: sscom.c
Log Message:
Simplify the device-activation hook. Move some of the device
deactivation to the detachment routine, where it belongs.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/arm/s3c2xx0/sscom.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/s3c2xx0/sscom.c
diff -u src/sys/arch/arm/s3c2xx0/sscom.c:1.30 src/sys/arch/arm/s3c2xx0/sscom.c:1.31
--- src/sys/arch/arm/s3c2xx0/sscom.c:1.30 Sat Nov 21 20:32:28 2009
+++ src/sys/arch/arm/s3c2xx0/sscom.c Sun Dec 6 21:35:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sscom.c,v 1.30 2009/11/21 20:32:28 rmind Exp $ */
+/* $NetBSD: sscom.c,v 1.31 2009/12/06 21:35:05 dyoung Exp $ */
/*
* Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -98,7 +98,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sscom.c,v 1.30 2009/11/21 20:32:28 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sscom.c,v 1.31 2009/12/06 21:35:05 dyoung Exp $");
#include "opt_sscom.h"
#include "opt_ddb.h"
@@ -509,41 +509,28 @@
}
int
-sscom_detach(struct device *self, int flags)
+sscom_detach(device_t self, int flags)
{
+ if (sc->sc_hwflags & (SSCOM_HW_CONSOLE|SSCOM_HW_KGDB))
+ return EBUSY;
+
return 0;
}
int
-sscom_activate(struct device *self, enum devact act)
+sscom_activate(device_t self, enum devact act)
{
-#ifdef notyet
- struct sscom_softc *sc = (struct sscom_softc *)self;
- int s, rv = 0;
+ struct sscom_softc *sc = device_private(self);
- s = splserial();
- SSCOM_LOCK(sc);
switch (act) {
- case DVACT_ACTIVATE:
- rv = EOPNOTSUPP;
- break;
-
case DVACT_DEACTIVATE:
- if (sc->sc_hwflags & (SSCOM_HW_CONSOLE|SSCOM_HW_KGDB)) {
- rv = EBUSY;
- break;
- }
-
+#ifdef notyet
sc->enabled = 0;
- break;
- }
-
- SSCOM_UNLOCK(sc);
- splx(s);
- return rv;
-#else
- return 0;
#endif
+ return 0;
+ default:
+ return EOPNOTSUPP;
+ }
}
void
