From owner-p4-projects Sat Oct 19 6:12:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AEFD37B404; Sat, 19 Oct 2002 06:12:20 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1A38937B401 for ; Sat, 19 Oct 2002 06:12:19 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC3AE43E97 for ; Sat, 19 Oct 2002 06:12:18 -0700 (PDT) (envelope-from tzukanov@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9JDC0mV047294 for ; Sat, 19 Oct 2002 06:12:00 -0700 (PDT) (envelope-from tzukanov@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9JDBx0r047291 for perforce@freebsd.org; Sat, 19 Oct 2002 06:11:59 -0700 (PDT) Date: Sat, 19 Oct 2002 06:11:59 -0700 (PDT) Message-Id: <200210191311.g9JDBx0r047291@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tzukanov@freebsd.org using -f From: Serguei Tzukanov Subject: PERFORCE change 19617 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=19617 Change 19617 by tzukanov@tzukanov_antares on 2002/10/19 06:11:35 Make it bootable into single user mode again. Affected files ... .. //depot/projects/s390/etc/etc.s390/ttys#2 edit .. //depot/projects/s390/sys/conf/options.s390#2 edit .. //depot/projects/s390/sys/s390/conf/GENERIC#2 edit .. //depot/projects/s390/sys/s390/s390/hhc.c#2 edit .. //depot/projects/s390/sys/s390/s390/hmcsc.c#3 edit .. //depot/projects/s390/sys/s390/s390/pmap.c#2 edit Differences ... ==== //depot/projects/s390/etc/etc.s390/ttys#2 (text+ko) ==== @@ -31,7 +31,8 @@ # If console is marked "insecure", then init will ask for the root password # when going to single-user mode. console none unknown off secure -hc "/usr/libexec/getty std.1200" vt100 on secure +hhc "/usr/libexec/getty std.1200" vt100 on secure +hmcsc "/usr/libexec/getty std.1200" vt100 on secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ttyd0 "/usr/libexec/getty std.9600" dialup off secure ==== //depot/projects/s390/sys/conf/options.s390#2 (text+ko) ==== @@ -7,3 +7,5 @@ SHOW_BUSYBUFS PANIC_REBOOT_WAIT_TIME opt_panic.h + +DEV_HMCSC opt_global.h ==== //depot/projects/s390/sys/s390/conf/GENERIC#2 (text+ko) ==== @@ -48,6 +48,8 @@ #options SMP +options NO_GEOM + options FFS # Berkeley Fast Filesystem options SOFTUPDATES options PROCFS # Process filesystem (requires PSEUDOFS) ==== //depot/projects/s390/sys/s390/s390/hhc.c#2 (text+ko) ==== @@ -61,7 +61,7 @@ } static __inline int -hcgc(void) +hhcgc(void) { int rv; @@ -75,7 +75,7 @@ } static __inline void -hcpc(int c) +hhcpc(int c) { __asm volatile ( " lr %%r1, %[c]\n" @@ -88,20 +88,20 @@ { int c; - while ((c = hcgc()) == -1); + while ((c = hhcgc()) == -1); return c; } static int hhc_cncheckc(dev_t dev) { - return hcgc(); + return hhcgc(); } static void hhc_cnputc(dev_t dev, int c) { - hcpc(c); + hhcpc(c); } CONS_DRIVER ==== //depot/projects/s390/sys/s390/s390/hmcsc.c#3 (text+ko) ==== @@ -94,7 +94,7 @@ inlen = HMCSC_BUF_LEN - 1; inbuf[inlen] = '\n'; - e2a_mem2mem(inbuf, edb->txtmsg, inlen); + e2a_mem2mem(edb->txtmsg, inbuf, inlen); inlen++; } } @@ -121,7 +121,7 @@ mcdbh->type = SCCB_MCDBH_TYPE_MESSAGE; mto->flag = SCCB_MTO_FLAG_DATA; mto->attr = SCCB_MTO_ATTR_NORMAL; - a2e_mem2mem(msgbuf, outbuf, outcur); + a2e_mem2mem(outbuf, msgbuf, outcur); servc(SCLP_WRITE_EVENT_DATA, sccb); outcur = 0; } ==== //depot/projects/s390/sys/s390/s390/pmap.c#2 (text+ko) ==== @@ -170,7 +170,7 @@ BOOTSTRAP_MAP_ENTRY(kstack0, KSTACK_PAGES + 1), BOOTSTRAP_MAP_ENTRY(devmempage, 1), BOOTSTRAP_MAP_ENTRY(msgbufp, atop(round_page(MSGBUF_SIZE))), -#ifdef DEV_HHC +#ifdef DEV_HMCSC BOOTSTRAP_MAP_ENTRY(sccb, 1), #endif BOOTSTRAP_MAP_ENTRY(crashdumpmap, MAXDUMPPGS), To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message