Hi folks,
I tried to compile the moko kernel, and make ended on a missing symbol
error (namely IPL_SERIAL). I went into sys/arch/moko/include/intr.h and
found out that splserial was still there, even if it seems to be
deprecated in favor of spltty(). I replaced all the occurences of
splserial() by spltty(), and the kernel compiled just fine. I can't tell
for sure if it boots, as I can't use the JTAG and TTY interfaces of the
debug board at the same time.
:r splserial_spltty.diff
--
Vincent / dermiste
Index: sys/arch/arm/s3c2xx0/sscom.c
===================================================================
RCS file: /cvs/src/sys/arch/arm/s3c2xx0/sscom.c,v
retrieving revision 1.15
diff -u -r1.15 sscom.c
--- sys/arch/arm/s3c2xx0/sscom.c 9 Nov 2009 17:53:38 -0000 1.15
+++ sys/arch/arm/s3c2xx0/sscom.c 31 Jan 2010 08:36:28 -0000
@@ -369,7 +369,7 @@
int s;
/* Turn on line break interrupt, set carrier. */
- s = splserial();
+ s = spltty();
SSCOM_LOCK(sc);
sc->sc_ucon = UCON_DEBUGPORT;
bus_space_write_4(sc->sc_iot, sc->sc_ioh, SSCOM_UCON, sc->sc_ucon);
@@ -543,7 +543,7 @@
struct sscom_softc *sc = (struct sscom_softc *)self;
int s, rv = 0;
- s = splserial();
+ s = spltty();
SSCOM_LOCK(sc);
switch (act) {
case DVACT_ACTIVATE:
@@ -575,7 +575,7 @@
struct tty *tp = sc->sc_tty;
int s;
- s = splserial();
+ s = spltty();
SSCOM_LOCK(sc);
/* If we were asserting flow control, then deassert it. */
@@ -596,7 +596,7 @@
splx(s);
/* XXX tsleep will only timeout */
(void) tsleep(sc, TTIPRI, ttclos, hz);
- s = splserial();
+ s = spltty();
SSCOM_LOCK(sc);
}
@@ -658,7 +658,7 @@
if (!ISSET(tp->t_state, TS_ISOPEN)) {
tp->t_dev = dev;
- s2 = splserial();
+ s2 = spltty();
SSCOM_LOCK(sc);
/* Fetch the current modem control status, needed later. */
@@ -698,7 +698,7 @@
ttychars(tp);
ttsetwater(tp);
- s2 = splserial();
+ s2 = spltty();
SSCOM_LOCK(sc);
sscom_loadchannelregs(sc);
@@ -1145,7 +1145,7 @@
lcr = cflag2lcr(t->c_cflag);
- s = splserial();
+ s = spltty();
SSCOM_LOCK(sc);
sc->sc_ulcon = lcr;
@@ -1304,7 +1304,7 @@
if (sc->sc_mcr_rts == 0)
return 0;
- s = splserial();
+ s = spltty();
SSCOM_LOCK(sc);
if (block) {
@@ -1404,7 +1404,7 @@
struct sscom_softc *sc = sscom_cd.cd_devs[DEVUNIT(tp->t_dev)];
int s;
- s = splserial();
+ s = spltty();
SSCOM_LOCK(sc);
if (ISSET(tp->t_state, TS_BUSY)) {
/* Stop transmitting at the next chunk. */
@@ -1425,7 +1425,7 @@
int overflows, floods;
int s;
- s = splserial();
+ s = spltty();
SSCOM_LOCK(sc);
overflows = sc->sc_overflows;
sc->sc_overflows = 0;
@@ -1517,7 +1517,7 @@
if (cc != scc) {
sc->sc_rbget = get;
- s = splserial();
+ s = spltty();
SSCOM_LOCK(sc);
cc = sc->sc_rbavail += scc - cc;
@@ -1547,7 +1547,7 @@
u_char msr, delta;
int s;
- s = splserial();
+ s = spltty();
SSCOM_LOCK(sc);
msr = sc->sc_msts;
delta = sc->sc_msr_delta;
@@ -2007,7 +2007,7 @@
int
sscomcngetc(dev_t dev)
{
- int s = splserial();
+ int s = spltty();
u_char stat, c;
/* got a character from reading things earlier */
@@ -2050,7 +2050,7 @@
void
sscomcnputc(dev_t dev, int c)
{
- int s = splserial();
+ int s = spltty();
int timo;
int cin, stat;
Index: sys/arch/gumstix/include/intr.h
===================================================================
RCS file: /cvs/src/sys/arch/gumstix/include/intr.h,v
retrieving revision 1.2
diff -u -r1.2 intr.h
--- sys/arch/gumstix/include/intr.h 14 Jan 2010 02:14:25 -0000 1.2
+++ sys/arch/gumstix/include/intr.h 31 Jan 2010 08:36:28 -0000
@@ -87,7 +87,6 @@
#define splaudio() _splraise(IPL_AUDIO)
#define splclock() _splraise(IPL_CLOCK)
#define splstatclock() _splraise(IPL_STATCLOCK)
-#define splserial() _splraise(IPL_SERIAL)
#define spl0() _spllower(IPL_NONE)
Index: sys/arch/moko/include/intr.h
===================================================================
RCS file: /cvs/src/sys/arch/moko/include/intr.h,v
retrieving revision 1.3
diff -u -r1.3 intr.h
--- sys/arch/moko/include/intr.h 14 Jan 2010 02:14:25 -0000 1.3
+++ sys/arch/moko/include/intr.h 31 Jan 2010 08:36:29 -0000
@@ -87,7 +87,6 @@
#define splaudio() _splraise(IPL_AUDIO)
#define splclock() _splraise(IPL_CLOCK)
#define splstatclock() _splraise(IPL_STATCLOCK)
-#define splserial() _splraise(IPL_SERIAL)
#define spl0() _spllower(IPL_NONE)
