svn commit: r363644 - in head: cddl/lib cddl/lib/libdtrace cddl/lib/libzpool etc/mtree release/sparc64 rescue/rescue sbin/init sys/kern sys/modules/esp sys/modules/uart usr.sbin/bsdinstall/partedit...
Author: nyan
Date: Tue Jul 28 10:58:37 2020
New Revision: 363644
URL: https://svnweb.freebsd.org/changeset/base/363644
Log:
- Cleanups related to sparc64 removal.
- Remove remains of sparc64 files.
Reviewed by: imp
Differential Revision:https://reviews.freebsd.org/D25831
Deleted:
head/release/sparc64/
head/sbin/init/ttys.sparc64
head/usr.sbin/bsdinstall/partedit/partedit_sparc64.c
head/usr.sbin/kldxref/ef_sparc64.c
Modified:
head/cddl/lib/Makefile
head/cddl/lib/libdtrace/Makefile
head/cddl/lib/libzpool/Makefile
head/etc/mtree/BSD.usr.dist
head/rescue/rescue/Makefile
head/sys/kern/kern_dump.c
head/sys/modules/esp/Makefile
head/sys/modules/uart/Makefile
Modified: head/cddl/lib/Makefile
==
--- head/cddl/lib/Makefile Tue Jul 28 10:45:29 2020(r363643)
+++ head/cddl/lib/Makefile Tue Jul 28 10:58:37 2020(r363644)
@@ -2,10 +2,10 @@
.include
-SUBDIR=${_drti} \
+SUBDIR=drti \
libavl \
libctf \
- ${_libdtrace} \
+ libdtrace \
libnvpair \
libumem \
libuutil \
@@ -21,11 +21,6 @@ _libzfs= libzfs
.if ${MK_LIBTHR} != "no"
_libzpool= libzpool
.endif
-.endif
-
-.if ${MACHINE_CPUARCH} != "sparc64"
-_drti= drti
-_libdtrace=libdtrace
.endif
SUBDIR_DEPEND_libdtrace= libctf
Modified: head/cddl/lib/libdtrace/Makefile
==
--- head/cddl/lib/libdtrace/MakefileTue Jul 28 10:45:29 2020
(r363643)
+++ head/cddl/lib/libdtrace/MakefileTue Jul 28 10:58:37 2020
(r363644)
@@ -103,9 +103,6 @@ CFLAGS+=-I${OPENSOLARIS_SYS_DISTDIR}/uts/powerpc
CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/riscv
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/riscv
.PATH: ${SRCTOP}/sys/cddl/dev/dtrace/riscv
-.elif ${MACHINE_CPUARCH} == "sparc64"
-CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc
-.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/sparc
.else
# temporary hack
CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
Modified: head/cddl/lib/libzpool/Makefile
==
--- head/cddl/lib/libzpool/Makefile Tue Jul 28 10:45:29 2020
(r363643)
+++ head/cddl/lib/libzpool/Makefile Tue Jul 28 10:58:37 2020
(r363644)
@@ -18,9 +18,7 @@
.if
exists(${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S)
.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
ATOMIC_SRCS= opensolaris_atomic.S
-.if ${MACHINE_ARCH} != "sparc64"
ACFLAGS+= -Wa,--noexecstack
-.endif
.else
.PATH: ${SRCTOP}/sys/cddl/compat/opensolaris/kern
ATOMIC_SRCS= opensolaris_atomic.c
Modified: head/etc/mtree/BSD.usr.dist
==
--- head/etc/mtree/BSD.usr.dist Tue Jul 28 10:45:29 2020(r363643)
+++ head/etc/mtree/BSD.usr.dist Tue Jul 28 10:58:37 2020(r363644)
@@ -864,8 +864,6 @@
..
powerpc
..
-sparc64
-..
..
man5
..
@@ -879,8 +877,6 @@
i386
..
powerpc
-..
-sparc64
..
..
man9
Modified: head/rescue/rescue/Makefile
==
--- head/rescue/rescue/Makefile Tue Jul 28 10:45:29 2020(r363643)
+++ head/rescue/rescue/Makefile Tue Jul 28 10:58:37 2020(r363644)
@@ -147,10 +147,6 @@ CRUNCH_ALIAS_bsdlabel= disklabel
#CRUNCH_LIBS+= -lsmb
.endif
-.if ${MACHINE_CPUARCH} == "sparc64"
-CRUNCH_PROGS_sbin+= bsdlabel sunlabel
-.endif
-
.if ${MACHINE_CPUARCH} == "amd64"
CRUNCH_PROGS_sbin+= bsdlabel fdisk
CRUNCH_ALIAS_bsdlabel= disklabel
Modified: head/sys/kern/kern_dump.c
==
--- head/sys/kern/kern_dump.c Tue Jul 28 10:45:29 2020(r363643)
+++ head/sys/kern/kern_dump.c Tue Jul 28 10:58:37 2020(r363644)
@@ -54,7 +54,7 @@ static size_t fragsz;
struct dump_pa dump_map[DUMPSYS_MD_PA_NPAIRS];
-#if !defined(__powerpc__) && !defined(__sparc__)
+#if !defined(__powerpc__)
void
dumpsys_gen_pa_init(void)
{
@@ -97,14 +97,12 @@ dumpsys_gen_unmap_chunk(vm_paddr_t pa __unused, size_t
}
-#if !defined(__sparc__)
int
dumpsys_gen_write_aux_headers(struct dumperinfo *di)
{
return (0);
}
-#endif
int
dumpsys_buf_seek(struct dumperinfo *di, size_t sz)
@@ -240,7 +238,6 @@ dumpsys_foreach_chunk(dumpsys_callback_t cb, void *arg
return (seqnr);
}
-#if !defined(__sparc__)
static off_t fileofs;
static int
@@ -387,4 +384,3 @@ du
svn commit: r359631 - head/usr.bin/ruptime
Author: nyan
Date: Sat Apr 4 12:07:36 2020
New Revision: 359631
URL: https://svnweb.freebsd.org/changeset/base/359631
Log:
Remove extra spaces for the load average of machines that are down.
PR: 245296
Submitted by: martin _at_ lispworks.com
MFC after:1 week
Modified:
head/usr.bin/ruptime/ruptime.c
Modified: head/usr.bin/ruptime/ruptime.c
==
--- head/usr.bin/ruptime/ruptime.c Sat Apr 4 11:11:27 2020
(r359630)
+++ head/usr.bin/ruptime/ruptime.c Sat Apr 4 12:07:36 2020
(r359631)
@@ -234,18 +234,21 @@ ruptime(const char *host, int aflg, int (*cmp)(const v
if (hostnamewidth < (int)strlen(wd->wd_hostname))
hostnamewidth = (int)strlen(wd->wd_hostname);
- for (i = 0; i < 3; i++) {
- w = iwidth(wd->wd_loadav[i] / 100) + 3;
- if (loadavwidth[i] < w)
- loadavwidth[i] = w;
+
+ if (!ISDOWN(hsp)) {
+ for (i = 0; i < 3; i++) {
+ w = iwidth(wd->wd_loadav[i] / 100) + 3;
+ if (loadavwidth[i] < w)
+ loadavwidth[i] = w;
+ }
+ for (hsp->hs_nusers = 0, we = &wd->wd_we[0];
+(char *)(we + 1) <= (char *)wd + cc; we++)
+ if (aflg || we->we_idle < 3600)
+ ++hsp->hs_nusers;
+ if (userswidth < iwidth(hsp->hs_nusers))
+ userswidth = iwidth(hsp->hs_nusers);
}
- for (hsp->hs_nusers = 0, we = &wd->wd_we[0];
- (char *)(we + 1) <= (char *)wd + cc; we++)
- if (aflg || we->we_idle < 3600)
- ++hsp->hs_nusers;
- if (userswidth < iwidth(hsp->hs_nusers))
- userswidth = iwidth(hsp->hs_nusers);
++hsp;
++nhosts;
}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r357043 - head/sys/conf
Author: nyan
Date: Thu Jan 23 13:56:12 2020
New Revision: 357043
URL: https://svnweb.freebsd.org/changeset/base/357043
Log:
Fix kernel-tags target.
- A depend-file is broken up into .depend.*.o files. [1]
- Fix an assembly file support.
PR: 241746
Submitted by: leres [1]
MFC after:1 week
Modified:
head/sys/conf/kern.post.mk
head/sys/conf/systags.sh
Modified: head/sys/conf/kern.post.mk
==
--- head/sys/conf/kern.post.mk Thu Jan 23 11:05:03 2020(r357042)
+++ head/sys/conf/kern.post.mk Thu Jan 23 13:56:12 2020(r357043)
@@ -389,7 +389,8 @@ kernel-cleandepend: .PHONY
rm -f .depend .depend.* ${_ILINKS}
kernel-tags:
- @[ -f .depend ] || { echo "you must make depend first"; exit 1; }
+ @ls .depend.* > /dev/null 2>&1 || \
+ { echo "you must make depend first"; exit 1; }
sh $S/conf/systags.sh
kernel-install: .PHONY
Modified: head/sys/conf/systags.sh
==
--- head/sys/conf/systags.shThu Jan 23 11:05:03 2020(r357042)
+++ head/sys/conf/systags.shThu Jan 23 13:56:12 2020(r357043)
@@ -39,14 +39,14 @@
rm -f tags tags.tmp tags.cfiles tags.sfiles tags.hfiles
sed -e "s, machine/, ../../include/,g" \
- -e 's,[a-z][^/]*/\.\./,,g' .depend | awk '{
+ -e 's,[a-z][^/]*/\.\./,,g' .depend.* | awk '{
for (i = 1; i <= NF; ++i) {
t = substr($i, length($i) - 1)
if (t == ".c")
cfiles[$i] = 1;
else if (t == ".h")
hfiles[$i] = 1;
- else if (t == ".s")
+ else if (t == ".s" || t == ".S")
sfiles[$i] = 1;
}
};
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r343011 - in head/kerberos5: lib/libasn1 lib/libgssapi_krb5 lib/libhdb lib/libheimntlm lib/libhx509 lib/libkadm5clnt lib/libkadm5srv lib/libkdc lib/libkrb5 lib/libwind libexec/digest-se...
Author: nyan
Date: Mon Jan 14 06:34:54 2019
New Revision: 343011
URL: https://svnweb.freebsd.org/changeset/base/343011
Log:
Use ${SRCTOP}/contrib/com_err/com_err.h instead of the installed com_err.h.
This fixes build when com_err.h is not installed.
PR: 234691
MFC after:1 week
Modified:
head/kerberos5/lib/libasn1/Makefile
head/kerberos5/lib/libgssapi_krb5/Makefile
head/kerberos5/lib/libhdb/Makefile
head/kerberos5/lib/libheimntlm/Makefile
head/kerberos5/lib/libhx509/Makefile
head/kerberos5/lib/libkadm5clnt/Makefile
head/kerberos5/lib/libkadm5srv/Makefile
head/kerberos5/lib/libkdc/Makefile
head/kerberos5/lib/libkrb5/Makefile
head/kerberos5/lib/libwind/Makefile
head/kerberos5/libexec/digest-service/Makefile
head/kerberos5/libexec/hprop/Makefile
head/kerberos5/libexec/hpropd/Makefile
head/kerberos5/libexec/kadmind/Makefile
head/kerberos5/libexec/kdc/Makefile
head/kerberos5/usr.bin/hxtool/Makefile
head/kerberos5/usr.bin/kadmin/Makefile
head/kerberos5/usr.bin/string2key/Makefile
head/kerberos5/usr.bin/verify_krb5_conf/Makefile
head/kerberos5/usr.sbin/kstash/Makefile
Modified: head/kerberos5/lib/libasn1/Makefile
==
--- head/kerberos5/lib/libasn1/Makefile Mon Jan 14 03:19:08 2019
(r343010)
+++ head/kerberos5/lib/libasn1/Makefile Mon Jan 14 06:34:54 2019
(r343011)
@@ -21,7 +21,8 @@ SRCS= asn1_err.c \
timegm.c \
${GEN:S/.x$/.c/:S/.hx$/.h/}
-CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I.
+CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
+ -I${SRCTOP}/contrib/com_err -I.
GEN_RFC2459= asn1_rfc2459_asn1.x rfc2459_asn1.hx rfc2459_asn1-priv.hx
GEN_CMS= asn1_cms_asn1.x cms_asn1.hx cms_asn1-priv.hx
Modified: head/kerberos5/lib/libgssapi_krb5/Makefile
==
--- head/kerberos5/lib/libgssapi_krb5/Makefile Mon Jan 14 03:19:08 2019
(r343010)
+++ head/kerberos5/lib/libgssapi_krb5/Makefile Mon Jan 14 06:34:54 2019
(r343011)
@@ -78,7 +78,9 @@ CFLAGS+=-I${KRB5DIR}/lib/gssapi/krb5
CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi
CFLAGS+=-I${KRB5DIR}/lib/krb5
CFLAGS+=-I${KRB5DIR}/lib/asn1
-CFLAGS+=-I${KRB5DIR}/lib/roken -I.
+CFLAGS+=-I${KRB5DIR}/lib/roken
+CFLAGS+=-I${SRCTOP}/contrib/com_err
+CFLAGS+=-I.
.include
Modified: head/kerberos5/lib/libhdb/Makefile
==
--- head/kerberos5/lib/libhdb/Makefile Mon Jan 14 03:19:08 2019
(r343010)
+++ head/kerberos5/lib/libhdb/Makefile Mon Jan 14 06:34:54 2019
(r343011)
@@ -59,6 +59,7 @@ SRCS= common.c \
CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/roken -I${SRCTOP}/contrib/sqlite3/ \
-I${KRB5DIR}/lib/krb5 \
+ -I${SRCTOP}/contrib/com_err \
-I. ${LDAPCFLAGS}
CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\""
Modified: head/kerberos5/lib/libheimntlm/Makefile
==
--- head/kerberos5/lib/libheimntlm/Makefile Mon Jan 14 03:19:08 2019
(r343010)
+++ head/kerberos5/lib/libheimntlm/Makefile Mon Jan 14 06:34:54 2019
(r343011)
@@ -5,7 +5,8 @@ LDFLAGS=-Wl,--no-undefined
LIBADD=crypto com_err krb5 roken
SRCS= ntlm.c ntlm_err.c ntlm_err.h
INCS= heimntlm.h heimntlm-protos.h ntlm_err.h
-CFLAGS+=-I${KRB5DIR}/lib/ntlm -I${KRB5DIR}/lib/roken
+CFLAGS+=-I${KRB5DIR}/lib/ntlm -I${KRB5DIR}/lib/roken \
+ -I${SRCTOP}/contrib/com_err
VERSION_MAP= ${KRB5DIR}/lib/ntlm/version-script.map
MAN= ntlm_buf.3 \
Modified: head/kerberos5/lib/libhx509/Makefile
==
--- head/kerberos5/lib/libhx509/MakefileMon Jan 14 03:19:08 2019
(r343010)
+++ head/kerberos5/lib/libhx509/MakefileMon Jan 14 06:34:54 2019
(r343011)
@@ -211,7 +211,9 @@ CFLAGS+=-I${KRB5DIR}/lib/hx509
CFLAGS+=-I${KRB5DIR}/lib/hx509/ref
CFLAGS+=-I${KRB5DIR}/lib/asn1
CFLAGS+=-I${KRB5DIR}/lib/wind
-CFLAGS+=-I${KRB5DIR}/lib/roken -I.
+CFLAGS+=-I${KRB5DIR}/lib/roken
+CFLAGS+=-I${SRCTOP}/contrib/com_err
+CFLAGS+=-I.
GEN_OCSP= \
asn1_OCSPBasicOCSPResponse.x \
Modified: head/kerberos5/lib/libkadm5clnt/Makefile
==
--- head/kerberos5/lib/libkadm5clnt/MakefileMon Jan 14 03:19:08 2019
(r343010)
+++ head/kerberos5/lib/libkadm5clnt/MakefileMon Jan 14 06:34:54 2019
(r343011)
@@ -34,7 +34,8 @@ SRCS= ad.c \
rename_c.c \
send_recv.c
-CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I.
+CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
+ -I${SRCTOP}/contrib/com_err -I.
.include
Modified: head/kerberos5/lib/libkadm5srv/Makefil
svn commit: r342965 - head/usr.bin/ruptime
Author: nyan
Date: Sat Jan 12 12:57:32 2019
New Revision: 342965
URL: https://svnweb.freebsd.org/changeset/base/342965
Log:
Fix indentation in ruptime command output for hosts in the "down" state.
PR: 234239
MFC after:1 week
Modified:
head/usr.bin/ruptime/ruptime.c
Modified: head/usr.bin/ruptime/ruptime.c
==
--- head/usr.bin/ruptime/ruptime.c Sat Jan 12 12:35:02 2019
(r342964)
+++ head/usr.bin/ruptime/ruptime.c Sat Jan 12 12:57:32 2019
(r342965)
@@ -264,7 +264,7 @@ ruptime(const char *host, int aflg, int (*cmp)(const v
hsp = &hs[i];
wd = &hsp->hs_wd;
if (ISDOWN(hsp)) {
- (void)printf("%-*.*s%s\n",
+ (void)printf("%-*.*s %s\n",
hostnamewidth, hostnamewidth, wd->wd_hostname,
interval(now - hsp->hs_wd.wd_recvtime, "down"));
continue;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r342964 - head/usr.bin/bc
Author: nyan
Date: Sat Jan 12 12:35:02 2019
New Revision: 342964
URL: https://svnweb.freebsd.org/changeset/base/342964
Log:
Sync with OpenBSD.
bc.y: Rev 1.50
- write parse errors to stderr, prompted by Martijn Dekker
- we're only interactive if stdout en stderr are a tty as well as stdin
PR: 234430
Obtained from:OpenBSD
MFC after:1 week
Modified:
head/usr.bin/bc/bc.y
Modified: head/usr.bin/bc/bc.y
==
--- head/usr.bin/bc/bc.ySat Jan 12 11:50:39 2019(r342963)
+++ head/usr.bin/bc/bc.ySat Jan 12 12:35:02 2019(r342964)
@@ -996,7 +996,7 @@ yyerror(const char *s)
putchar('\\');
putchar(*p);
}
- fputs("]pc\n", stdout);
+ fputs("]ec\n", stdout);
free(str);
}
@@ -1173,7 +1173,8 @@ main(int argc, char *argv[])
argc -= optind;
argv += optind;
- interactive = isatty(STDIN_FILENO);
+ interactive = isatty(STDIN_FILENO) && isatty(STDOUT_FILENO) &&
+ isatty(STDERR_FILENO);
for (i = 0; i < argc; i++)
sargv[sargc++] = argv[i];
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r325997 - in head/stand: fdt/dts libstand32 userboot/ficl userboot/libstand userboot/zfs
Author: nyan Date: Sun Nov 19 11:33:46 2017 New Revision: 325997 URL: https://svnweb.freebsd.org/changeset/base/325997 Log: Remove empty directories. Deleted: head/stand/fdt/dts/ head/stand/libstand32/ head/stand/userboot/ficl/ head/stand/userboot/libstand/ head/stand/userboot/zfs/ ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r321789 - head/usr.bin/calendar/calendars
Author: nyan Date: Mon Jul 31 14:53:03 2017 New Revision: 321789 URL: https://svnweb.freebsd.org/changeset/base/321789 Log: Add myself. Reminded by: mckusick Modified: head/usr.bin/calendar/calendars/calendar.freebsd Modified: head/usr.bin/calendar/calendars/calendar.freebsd == --- head/usr.bin/calendar/calendars/calendar.freebsdMon Jul 31 14:50:42 2017(r321788) +++ head/usr.bin/calendar/calendars/calendar.freebsdMon Jul 31 14:53:03 2017(r321789) @@ -53,6 +53,7 @@ 02/02 Michael W Lucas born in Detroit, Michigan, United States, 1967 02/02 Dmitry Chagin born in Stalingrad, USSR, 1976 02/02 Yoichi Nakayama born in Tsu, Mie, Japan, 1976 +02/02 Yoshihiro Takahashi born in Yokohama, Kanagawa, Japan, 1976 02/03 Jason Helfman born in Royal Oak, Michigan, United States, 1972 02/04 Eitan Adler born in West Hempstead, New York, United States, 1991 02/05 Frank Laszlo born in Howell, Michigan, United States, 1983 ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r317591 - head/sys/dev/drm2/radeon
In article <03e500d5-76b1-fd38-04c6-90d85a2dd...@freebsd.org> Andriy Gapon writes: > On 29/04/2017 12:47, Takahashi Yoshihiro wrote: >> Author: nyan >> Date: Sat Apr 29 09:47:15 2017 >> New Revision: 317591 >> URL: https://svnweb.freebsd.org/changeset/base/317591 >> >> Log: >> Add TUNABLE_INT to radeonkms driver parameters. >> They are required by PowerMac G5 DP. >> >> PR:217852 >> Submitted by: Hiroo Ono >> MFC after: 1 week > > I think that this solution that I had in my private tree is a little bit more > powerful: > https://people.freebsd.org/~avg/radeon_drv-knobs.diff > > The advantage is that it is less intrusive and also provides read-only sysctl > in > addition to the tunables. > Also, hw.drm.radeon seems like a better place for the knobs than just > drm.radeon. > > Do you mind if I commit this? Sorry for late. I don't mind that your suggestion. But if you will commit the patch, I think that you should apply the same way to the i915 driver. --- TAKAHASHI Yoshihiro ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r317591 - head/sys/dev/drm2/radeon
Author: nyan
Date: Sat Apr 29 09:47:15 2017
New Revision: 317591
URL: https://svnweb.freebsd.org/changeset/base/317591
Log:
Add TUNABLE_INT to radeonkms driver parameters.
They are required by PowerMac G5 DP.
PR: 217852
Submitted by: Hiroo Ono
MFC after:1 week
Modified:
head/sys/dev/drm2/radeon/radeon_drv.c
Modified: head/sys/dev/drm2/radeon/radeon_drv.c
==
--- head/sys/dev/drm2/radeon/radeon_drv.c Sat Apr 29 09:26:30 2017
(r317590)
+++ head/sys/dev/drm2/radeon/radeon_drv.c Sat Apr 29 09:47:15 2017
(r317591)
@@ -127,54 +127,71 @@ int radeon_pcie_gen2 = -1;
int radeon_msi = -1;
int radeon_lockup_timeout = 1;
+TUNABLE_INT("drm.radeon.no_wb", &radeon_no_wb);
MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers");
module_param_named(no_wb, radeon_no_wb, int, 0444);
+TUNABLE_INT("drm.radeon.modeset", &radeon_modeset);
MODULE_PARM_DESC(modeset, "Disable/Enable modesetting");
module_param_named(modeset, radeon_modeset, int, 0400);
+TUNABLE_INT("drm.radeon.dynclks", &radeon_dynclks);
MODULE_PARM_DESC(dynclks, "Disable/Enable dynamic clocks");
module_param_named(dynclks, radeon_dynclks, int, 0444);
+TUNABLE_INT("drm.radeon.r4xx_atom", &radeon_r4xx_atom);
MODULE_PARM_DESC(r4xx_atom, "Enable ATOMBIOS modesetting for R4xx");
module_param_named(r4xx_atom, radeon_r4xx_atom, int, 0444);
+TUNABLE_INT("drm.radeon.vramlimit", &radeon_vram_limit);
MODULE_PARM_DESC(vramlimit, "Restrict VRAM for testing");
module_param_named(vramlimit, radeon_vram_limit, int, 0600);
+TUNABLE_INT("drm.radeon.agpmode", &radeon_agpmode);
MODULE_PARM_DESC(agpmode, "AGP Mode (-1 == PCI)");
module_param_named(agpmode, radeon_agpmode, int, 0444);
+TUNABLE_INT("drm.radeon.gartsize", &radeon_gart_size);
MODULE_PARM_DESC(gartsize, "Size of PCIE/IGP gart to setup in megabytes (32,
64, etc)");
module_param_named(gartsize, radeon_gart_size, int, 0600);
+TUNABLE_INT("drm.radeon.benchmark", &radeon_benchmarking);
MODULE_PARM_DESC(benchmark, "Run benchmark");
module_param_named(benchmark, radeon_benchmarking, int, 0444);
+TUNABLE_INT("drm.radeon.test", &radeon_testing);
MODULE_PARM_DESC(test, "Run tests");
module_param_named(test, radeon_testing, int, 0444);
+TUNABLE_INT("drm.radeon.connector_table", &radeon_connector_table);
MODULE_PARM_DESC(connector_table, "Force connector table");
module_param_named(connector_table, radeon_connector_table, int, 0444);
+TUNABLE_INT("drm.radeon.tv", &radeon_tv);
MODULE_PARM_DESC(tv, "TV enable (0 = disable)");
module_param_named(tv, radeon_tv, int, 0444);
+TUNABLE_INT("drm.radeon.audio", &radeon_audio);
MODULE_PARM_DESC(audio, "Audio enable (1 = enable)");
module_param_named(audio, radeon_audio, int, 0444);
+TUNABLE_INT("drm.radeon.disp_priority", &radeon_disp_priority);
MODULE_PARM_DESC(disp_priority, "Display Priority (0 = auto, 1 = normal, 2 =
high)");
module_param_named(disp_priority, radeon_disp_priority, int, 0444);
+TUNABLE_INT("drm.radeon.hw_i2c", &radeon_hw_i2c);
MODULE_PARM_DESC(hw_i2c, "hw i2c engine enable (0 = disable)");
module_param_named(hw_i2c, radeon_hw_i2c, int, 0444);
+TUNABLE_INT("drm.radeon.pcie_gen2", &radeon_pcie_gen2);
MODULE_PARM_DESC(pcie_gen2, "PCIE Gen2 mode (-1 = auto, 0 = disable, 1 =
enable)");
module_param_named(pcie_gen2, radeon_pcie_gen2, int, 0444);
+TUNABLE_INT("drm.radeon.msi", &radeon_msi);
MODULE_PARM_DESC(msi, "MSI support (1 = enable, 0 = disable, -1 = auto)");
module_param_named(msi, radeon_msi, int, 0444);
+TUNABLE_INT("drm.radeon.lockup_timeout", &radeon_lockup_timeout);
MODULE_PARM_DESC(lockup_timeout, "GPU lockup timeout in ms (defaul 1 = 10
seconds, 0 = disable)");
module_param_named(lockup_timeout, radeon_lockup_timeout, int, 0444);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r314301 - head/sys/x86/x86
Author: nyan
Date: Sun Feb 26 13:25:56 2017
New Revision: 314301
URL: https://svnweb.freebsd.org/changeset/base/314301
Log:
Fix the acpi idle support on i386 which was broken by r312910.
The ifdefs were '#if !defined(__i386__) || !defined(PC98)' previously,
so cpu_idle_acpi was enabled both i386 and amd64 except PC98.
I was obfuscated by '#if !defined(__i386__)' condition.
Submitted by: bde
Reported by: bde
Modified:
head/sys/x86/x86/cpu_machdep.c
Modified: head/sys/x86/x86/cpu_machdep.c
==
--- head/sys/x86/x86/cpu_machdep.c Sun Feb 26 12:54:27 2017
(r314300)
+++ head/sys/x86/x86/cpu_machdep.c Sun Feb 26 13:25:56 2017
(r314301)
@@ -451,9 +451,7 @@ struct {
{ cpu_idle_spin, "spin" },
{ cpu_idle_mwait, "mwait" },
{ cpu_idle_hlt, "hlt" },
-#if !defined(__i386__)
{ cpu_idle_acpi, "acpi" },
-#endif
{ NULL, NULL }
};
@@ -470,11 +468,9 @@ idle_sysctl_available(SYSCTL_HANDLER_ARG
if (strstr(idle_tbl[i].id_name, "mwait") &&
(cpu_feature2 & CPUID2_MON) == 0)
continue;
-#if !defined(__i386__)
if (strcmp(idle_tbl[i].id_name, "acpi") == 0 &&
cpu_idle_hook == NULL)
continue;
-#endif
p += sprintf(p, "%s%s", p != avail ? ", " : "",
idle_tbl[i].id_name);
}
@@ -509,11 +505,9 @@ idle_sysctl(SYSCTL_HANDLER_ARGS)
if (strstr(idle_tbl[i].id_name, "mwait") &&
(cpu_feature2 & CPUID2_MON) == 0)
continue;
-#if !defined(__i386__)
if (strcmp(idle_tbl[i].id_name, "acpi") == 0 &&
cpu_idle_hook == NULL)
continue;
-#endif
if (strcmp(idle_tbl[i].id_name, buf))
continue;
cpu_idle_fn = idle_tbl[i].id_fn;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r314149 - head/etc
Author: nyan
Date: Thu Feb 23 16:42:48 2017
New Revision: 314149
URL: https://svnweb.freebsd.org/changeset/base/314149
Log:
The ct driver was removed by r312910.
Modified:
head/etc/devd.conf
Modified: head/etc/devd.conf
==
--- head/etc/devd.conf Thu Feb 23 16:31:04 2017(r314148)
+++ head/etc/devd.conf Thu Feb 23 16:42:48 2017(r314149)
@@ -19,7 +19,7 @@ options {
# Setup some shorthand for regex that we use later in the file.
#XXX Yes, these are gross -- imp
set scsi-controller-regex
- "(aac|adv|adw|aha|ahc|ahd|aic|amr|bt|ciss|ct|dpt|\
+ "(aac|adv|adw|aha|ahc|ahd|aic|amr|bt|ciss|dpt|\
esp|ida|iir|ips|isp|mlx|mly|mpt|ncr|ncv|nsp|stg|sym|trm)\
[0-9]+";
set wifi-driver-regex
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r312910 - in head: . etc/etc.pc98 etc/rc.d lib/libsysdecode libexec release release/doc release/doc/en_US.ISO8859-1/hardware release/doc/en_US.ISO8859-1/readme release/doc/share/exampl
I have decided to remove pc98 support on stable/11 as well after 2 weeks to reduce conflicts between head and stable/11. In article <201701280222.v0s2mfsr022...@repo.freebsd.org> Takahashi Yoshihiro writes: > Author: nyan > Date: Sat Jan 28 02:22:15 2017 > New Revision: 312910 > URL: https://svnweb.freebsd.org/changeset/base/312910 > > Log: > Remove pc98 support completely. > I thank all developers and contributors for pc98. > > Relnotes: yes > > Deleted: > head/etc/etc.pc98/ > head/libexec/Makefile.pc98 > head/release/pc98/ > head/sbin/Makefile.pc98 > head/sbin/fdisk_pc98/ > head/share/man/man4/man4.i386/ct.4 > head/share/man/man4/man4.i386/snc.4 > head/share/syscons/keymaps/jp.pc98.iso.kbd > head/share/syscons/keymaps/jp.pc98.kbd > head/share/vt/keymaps/jp.pc98.iso.kbd > head/share/vt/keymaps/jp.pc98.kbd > head/sys/boot/Makefile.pc98 > head/sys/boot/pc98/ > head/sys/conf/Makefile.pc98 > head/sys/conf/files.pc98 > head/sys/conf/options.pc98 > head/sys/dev/aic/aic_cbus.c > head/sys/dev/ata/ata-cbus.c > head/sys/dev/ct/ > head/sys/dev/ed/if_ed98.h > head/sys/dev/ed/if_ed_cbus.c > head/sys/dev/fdc/fdc_cbus.c > head/sys/dev/fe/if_fe_cbus.c > head/sys/dev/ic/i8251.h > head/sys/dev/ic/wd33c93reg.h > head/sys/dev/le/if_le_cbus.c > head/sys/dev/mse/mse_cbus.c > head/sys/dev/snc/ > head/sys/dev/uart/uart_cpu_pc98.c > head/sys/geom/geom_pc98.c > head/sys/geom/geom_pc98_enc.c > head/sys/geom/part/g_part_pc98.c > head/sys/modules/canbepm/ > head/sys/modules/canbus/ > head/sys/modules/ct/ > head/sys/modules/geom/geom_part/geom_part_pc98/ > head/sys/modules/geom/geom_pc98/ > head/sys/modules/pmc/ > head/sys/modules/snc/ > head/sys/pc98/ > head/sys/sys/disk/pc98.h > head/sys/sys/diskpc98.h > head/usr.bin/mkimg/pc98.c > head/usr.bin/mkimg/tests/img-1x1-4096-pc98.qcow.gz.uu > head/usr.bin/mkimg/tests/img-1x1-4096-pc98.qcow2.gz.uu > head/usr.bin/mkimg/tests/img-1x1-4096-pc98.raw.gz.uu > head/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhd.gz.uu > head/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhdf.gz.uu > head/usr.bin/mkimg/tests/img-1x1-4096-pc98.vmdk.gz.uu > head/usr.bin/mkimg/tests/img-1x1-512-pc98.qcow.gz.uu > head/usr.bin/mkimg/tests/img-1x1-512-pc98.qcow2.gz.uu > head/usr.bin/mkimg/tests/img-1x1-512-pc98.raw.gz.uu > head/usr.bin/mkimg/tests/img-1x1-512-pc98.vhd.gz.uu > head/usr.bin/mkimg/tests/img-1x1-512-pc98.vhdf.gz.uu > head/usr.bin/mkimg/tests/img-1x1-512-pc98.vmdk.gz.uu > head/usr.bin/mkimg/tests/img-63x255-4096-pc98.qcow.gz.uu > head/usr.bin/mkimg/tests/img-63x255-4096-pc98.qcow2.gz.uu > head/usr.bin/mkimg/tests/img-63x255-4096-pc98.raw.gz.uu > head/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhd.gz.uu > head/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu > head/usr.bin/mkimg/tests/img-63x255-4096-pc98.vmdk.gz.uu > head/usr.bin/mkimg/tests/img-63x255-512-pc98.qcow.gz.uu > head/usr.bin/mkimg/tests/img-63x255-512-pc98.qcow2.gz.uu > head/usr.bin/mkimg/tests/img-63x255-512-pc98.raw.gz.uu > head/usr.bin/mkimg/tests/img-63x255-512-pc98.vhd.gz.uu > head/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu > head/usr.bin/mkimg/tests/img-63x255-512-pc98.vmdk.gz.uu > head/usr.sbin/boot98cfg/ > head/usr.sbin/bsdinstall/partedit/partedit_pc98.c > Modified: > head/Makefile > head/Makefile.inc1 > head/ObsoleteFiles.inc > head/etc/rc.d/syscons > head/lib/libsysdecode/Makefile > head/lib/libsysdecode/mkioctls > head/release/doc/README > head/release/doc/en_US.ISO8859-1/hardware/article.xml > head/release/doc/en_US.ISO8859-1/readme/article.xml > head/release/doc/share/examples/Makefile.relnotesng > head/release/doc/share/misc/dev.archlist.txt > head/release/doc/share/xml/release.ent > head/release/rc.local > head/rescue/rescue/Makefile > head/sbin/bsdlabel/bsdlabel.8 > head/sbin/bsdlabel/bsdlabel.c > head/sbin/geom/class/part/gpart.8 > head/share/examples/bootforth/frames.4th > head/share/man/man4/adv.4 > head/share/man/man4/ahc.4 > head/share/man/man4/apic.4 > head/share/man/man4/ed.4 > head/share/man/man4/esp.4 > head/share/man/man4/fxp.4 > head/share/man/man4/geom.4 > head/share/man/man4/man4.i386/Makefile > head/share/man/man4/man4.i386/aic.4 > head/share/man/man4/ncr.4 > head/share/man/man4/ncv.4 > head/share/man/man4/sym.4 > head/share/mk/bsd.stand.mk > head/share/mk/local.meta.sys.mk > head/share/syscons/keymaps/INDEX.keymaps > head/share/syscons/keymaps/Makefile > head/share/vt/keymaps/INDEX.keymaps > head/share/vt/keymaps/Makefile > head/sys/Makefi
svn commit: r312944 - in head: . sys/dev/ic
Author: nyan Date: Sun Jan 29 03:34:49 2017 New Revision: 312944 URL: https://svnweb.freebsd.org/changeset/base/312944 Log: - Remove i8255.h because it's pc98 device. - rsa.h is for both RSA-DV/S ISA and RSA-98III CBUS, but there is no RSA-DV/S support. So it can be removed. Deleted: head/sys/dev/ic/i8255.h head/sys/dev/ic/rsa.h Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Sun Jan 29 02:17:52 2017(r312943) +++ head/ObsoleteFiles.inc Sun Jan 29 03:34:49 2017(r312944) @@ -40,6 +40,8 @@ # 20170128: remove pc98 support OLD_FILES+=usr/include/dev/ic/i8251.h +OLD_FILES+=usr/include/dev/ic/i8255.h +OLD_FILES+=usr/include/dev/ic/rsa.h OLD_FILES+=usr/include/dev/ic/wd33c93reg.h OLD_FILES+=usr/include/sys/disk/pc98.h OLD_FILES+=usr/include/sys/diskpc98.h ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r312917 - in head: share/man/man4 share/man/man4/man4.i386 sys/dev/pci sys/modules/ata/atacbus
In article Ngie Cooper writes: >> On Jan 28, 2017, at 01:58, Takahashi Yoshihiro wrote: >> >> Author: nyan >> Date: Sat Jan 28 09:58:00 2017 >> New Revision: 312917 >> URL: https://svnweb.freebsd.org/changeset/base/312917 >> >> Log: >> Remove more pc98 support. > > Hello Yoshiro-San, > Have appropriate man pages and files been added to ObsoleteFiles.inc? Yes. But I found that there are some pc98 related files even now. I'll remove them and add to ObsoleteFiles.inc. Thank you for your recent work for pc98 removal. --- TAKAHASHI Yoshihiro ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312917 - in head: share/man/man4 share/man/man4/man4.i386 sys/dev/pci sys/modules/ata/atacbus
Author: nyan Date: Sat Jan 28 09:58:00 2017 New Revision: 312917 URL: https://svnweb.freebsd.org/changeset/base/312917 Log: Remove more pc98 support. Deleted: head/sys/modules/ata/atacbus/ Modified: head/share/man/man4/ed.4 head/share/man/man4/le.4 head/share/man/man4/man4.i386/ep.4 head/sys/dev/pci/isa_pci.c Modified: head/share/man/man4/ed.4 == --- head/share/man/man4/ed.4Sat Jan 28 07:26:42 2017(r312916) +++ head/share/man/man4/ed.4Sat Jan 28 09:58:00 2017(r312917) @@ -257,7 +257,7 @@ Winbond W89C940 Winbond W89C940F .El .Pp -C-Bus, ISA, PCI and PC Card devices are supported. +ISA, PCI and PC Card devices are supported. .Pp The .Nm Modified: head/share/man/man4/le.4 == --- head/share/man/man4/le.4Sat Jan 28 07:26:42 2017(r312916) +++ head/share/man/man4/le.4Sat Jan 28 09:58:00 2017(r312917) @@ -57,13 +57,6 @@ module at boot time, place the following if_le_load="YES" .Ed .Pp -For C-Bus non-PnP adapters, the port address and the IRQ number have to be -specified in -.Pa /boot/device.hints : -.Cd hint.le.0.at="isa" -.Cd hint.le.0.port="0x03d0" -.Cd hint.le.0.irq="6" -.Pp For ISA non-PnP adapters, the port address as well as the IRQ and the DRQ numbers have to be specified in .Pa /boot/device.hints : Modified: head/share/man/man4/man4.i386/ep.4 == --- head/share/man/man4/man4.i386/ep.4 Sat Jan 28 07:26:42 2017 (r312916) +++ head/share/man/man4/man4.i386/ep.4 Sat Jan 28 09:58:00 2017 (r312917) @@ -99,8 +99,6 @@ driver supports Ethernet adapters based .It 3Com 3C562/3C563 PCMCIA .It -3Com 3C569B-J-TPO, 3C569B-J-COMBO CBUS -.It 3Com 3C574, 3C574TX, 3C574-TX, 3CCFE574BT, 3CXFE574BT, 3C3FE574BT PCMCIA .It 3Com 3C579-TP, 3C579-BNC EISA Modified: head/sys/dev/pci/isa_pci.c == --- head/sys/dev/pci/isa_pci.c Sat Jan 28 07:26:42 2017(r312916) +++ head/sys/dev/pci/isa_pci.c Sat Jan 28 09:58:00 2017(r312917) @@ -136,9 +136,6 @@ isab_pci_probe(device_t dev) case 0x1078:/* Cyrix Cx5510 */ case 0x01001078:/* Cyrix Cx5530 */ case 0xc7001045:/* OPTi 82C700 (FireStar) */ - case 0x00011033:/* NEC 0001 (C-bus) */ - case 0x002c1033:/* NEC 002C (C-bus) */ - case 0x003b1033:/* NEC 003B (C-bus) */ case 0x886a1060:/* UMC UM8886 ISA */ case 0x02001166:/* ServerWorks IB6566 PCI */ if (bootverbose) ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312912 - head/sys/i386/isa
Author: nyan
Date: Sat Jan 28 03:53:53 2017
New Revision: 312912
URL: https://svnweb.freebsd.org/changeset/base/312912
Log:
Garbage collect the FPU_ERROR_BROKEN option.
It is for pc98 only.
Modified:
head/sys/i386/isa/npx.c
Modified: head/sys/i386/isa/npx.c
==
--- head/sys/i386/isa/npx.c Sat Jan 28 02:25:33 2017(r312911)
+++ head/sys/i386/isa/npx.c Sat Jan 28 03:53:53 2017(r312912)
@@ -304,14 +304,6 @@ npx_probe(void)
*/
control &= ~(1 << 2); /* enable divide by 0 trap */
fldcw(control);
-#ifdef FPU_ERROR_BROKEN
- /*
-* FPU error signal doesn't work on some CPU
-* accelerator board.
-*/
- hw_float = 1;
- return (1);
-#endif
npx_traps_while_probing = 0;
fp_divide_by_0();
if (npx_traps_while_probing != 0) {
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312911 - head/share/man/man5
Author: nyan Date: Sat Jan 28 02:25:33 2017 New Revision: 312911 URL: https://svnweb.freebsd.org/changeset/base/312911 Log: Regen after r312910. Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 == --- head/share/man/man5/src.conf.5 Sat Jan 28 02:22:15 2017 (r312910) +++ head/share/man/man5/src.conf.5 Sat Jan 28 02:25:33 2017 (r312911) @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 306729 2016-10-05 20:12:00Z emaste .\" $FreeBSD$ -.Dd January 6, 2017 +.Dd January 28, 2017 .Dt SRC.CONF 5 .Os .Sh NAME @@ -177,7 +177,7 @@ Set to build and install binutils (as, l of the normal system build. .Pp It is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, pc98/i386, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITHOUT_BINUTILS_BOOTSTRAP .\" from FreeBSD: head/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP 295490 2016-02-10 23:57:09Z emaste Set to not build binutils (as, ld, objcopy and objdump) @@ -195,7 +195,7 @@ Set build binutils (as, ld, objcopy and as part of the bootstrap process. .Pp It is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, pc98/i386, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITHOUT_BLACKLIST .\" from FreeBSD: head/tools/build/options/WITHOUT_BLACKLIST 301554 2016-06-07 16:35:55Z lidl Set this if you do not want to build blacklistd / blacklistctl. @@ -352,7 +352,7 @@ When set, it also enforces the following Set to build the Clang C/C++ compiler during the normal phase of the build. .Pp It is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, pc98/i386, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe. .It Va WITHOUT_CLANG_BOOTSTRAP .\" from FreeBSD: head/tools/build/options/WITHOUT_CLANG_BOOTSTRAP 273177 2014-10-16 18:28:11Z skreuzer Set to not build the Clang C/C++ compiler during the bootstrap phase of the build. @@ -367,7 +367,7 @@ mips/mipsel, mips/mips, mips/mips64el, m Set to build the Clang C/C++ compiler during the bootstrap phase of the build. .Pp It is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386 and pc98/i386. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64 and i386/i386. .It Va WITH_CLANG_EXTRAS .\" from FreeBSD: head/tools/build/options/WITH_CLANG_EXTRAS 231057 2012-02-05 23:56:22Z dim Set to build additional clang and llvm tools, such as bugpoint. @@ -384,7 +384,7 @@ Set to build the ARCMigrate, Rewriter an Clang C/C++ compiler. .Pp It is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, pc98/i386, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe. .It Va WITHOUT_CLANG_IS_CC .\" from FreeBSD: head/tools/build/options/WITHOUT_CLANG_IS_CC 242629 2012-11-05 21:53:23Z brooks Set to install the GCC compiler as @@ -404,7 +404,7 @@ and .Pa /usr/bin/cpp . .Pp It is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386 and pc98/i386. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64 and i386/i386. .It Va WITHOUT_CPP .\" from FreeBSD: head/tools/build/options/WITHOUT_CPP 156932 2006-03-21 07:50:50Z ru Set to not build @@ -652,7 +652,7 @@ and .Xr efivar 8 . .Pp It is a default setting on -amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386 and pc98/i386. +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64 and i386/i386. .It Va WITH_EISA .\" from FreeBSD: head/tools/build/options/WITH_EISA 264654 2014-04-18 16:53:06Z imp Set to build EISA kernel modules. @@ -726,7 +726,7 @@ Set to not build games. Set to not build and install gcc and g++ as
svn commit: r312910 - in head: . etc/etc.pc98 etc/rc.d lib/libsysdecode libexec release release/doc release/doc/en_US.ISO8859-1/hardware release/doc/en_US.ISO8859-1/readme release/doc/share/example...
Author: nyan Date: Sat Jan 28 02:22:15 2017 New Revision: 312910 URL: https://svnweb.freebsd.org/changeset/base/312910 Log: Remove pc98 support completely. I thank all developers and contributors for pc98. Relnotes: yes Deleted: head/etc/etc.pc98/ head/libexec/Makefile.pc98 head/release/pc98/ head/sbin/Makefile.pc98 head/sbin/fdisk_pc98/ head/share/man/man4/man4.i386/ct.4 head/share/man/man4/man4.i386/snc.4 head/share/syscons/keymaps/jp.pc98.iso.kbd head/share/syscons/keymaps/jp.pc98.kbd head/share/vt/keymaps/jp.pc98.iso.kbd head/share/vt/keymaps/jp.pc98.kbd head/sys/boot/Makefile.pc98 head/sys/boot/pc98/ head/sys/conf/Makefile.pc98 head/sys/conf/files.pc98 head/sys/conf/options.pc98 head/sys/dev/aic/aic_cbus.c head/sys/dev/ata/ata-cbus.c head/sys/dev/ct/ head/sys/dev/ed/if_ed98.h head/sys/dev/ed/if_ed_cbus.c head/sys/dev/fdc/fdc_cbus.c head/sys/dev/fe/if_fe_cbus.c head/sys/dev/ic/i8251.h head/sys/dev/ic/wd33c93reg.h head/sys/dev/le/if_le_cbus.c head/sys/dev/mse/mse_cbus.c head/sys/dev/snc/ head/sys/dev/uart/uart_cpu_pc98.c head/sys/geom/geom_pc98.c head/sys/geom/geom_pc98_enc.c head/sys/geom/part/g_part_pc98.c head/sys/modules/canbepm/ head/sys/modules/canbus/ head/sys/modules/ct/ head/sys/modules/geom/geom_part/geom_part_pc98/ head/sys/modules/geom/geom_pc98/ head/sys/modules/pmc/ head/sys/modules/snc/ head/sys/pc98/ head/sys/sys/disk/pc98.h head/sys/sys/diskpc98.h head/usr.bin/mkimg/pc98.c head/usr.bin/mkimg/tests/img-1x1-4096-pc98.qcow.gz.uu head/usr.bin/mkimg/tests/img-1x1-4096-pc98.qcow2.gz.uu head/usr.bin/mkimg/tests/img-1x1-4096-pc98.raw.gz.uu head/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhd.gz.uu head/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-4096-pc98.vmdk.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-pc98.qcow.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-pc98.qcow2.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-pc98.raw.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-pc98.vhd.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-pc98.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-pc98.vmdk.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-pc98.qcow.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-pc98.qcow2.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-pc98.raw.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhd.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-pc98.vmdk.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-pc98.qcow.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-pc98.qcow2.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-pc98.raw.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-pc98.vhd.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-pc98.vmdk.gz.uu head/usr.sbin/boot98cfg/ head/usr.sbin/bsdinstall/partedit/partedit_pc98.c Modified: head/Makefile head/Makefile.inc1 head/ObsoleteFiles.inc head/etc/rc.d/syscons head/lib/libsysdecode/Makefile head/lib/libsysdecode/mkioctls head/release/doc/README head/release/doc/en_US.ISO8859-1/hardware/article.xml head/release/doc/en_US.ISO8859-1/readme/article.xml head/release/doc/share/examples/Makefile.relnotesng head/release/doc/share/misc/dev.archlist.txt head/release/doc/share/xml/release.ent head/release/rc.local head/rescue/rescue/Makefile head/sbin/bsdlabel/bsdlabel.8 head/sbin/bsdlabel/bsdlabel.c head/sbin/geom/class/part/gpart.8 head/share/examples/bootforth/frames.4th head/share/man/man4/adv.4 head/share/man/man4/ahc.4 head/share/man/man4/apic.4 head/share/man/man4/ed.4 head/share/man/man4/esp.4 head/share/man/man4/fxp.4 head/share/man/man4/geom.4 head/share/man/man4/man4.i386/Makefile head/share/man/man4/man4.i386/aic.4 head/share/man/man4/ncr.4 head/share/man/man4/ncv.4 head/share/man/man4/sym.4 head/share/mk/bsd.stand.mk head/share/mk/local.meta.sys.mk head/share/syscons/keymaps/INDEX.keymaps head/share/syscons/keymaps/Makefile head/share/vt/keymaps/INDEX.keymaps head/share/vt/keymaps/Makefile head/sys/Makefile head/sys/boot/common/Makefile.inc head/sys/boot/common/isapnp.h head/sys/boot/ficl/loader.c head/sys/boot/forth/frames.4th head/sys/cam/cam_xpt.c head/sys/conf/NOTES head/sys/conf/config.mk head/sys/conf/files head/sys/conf/files.amd64 head/sys/conf/files.i386 head/sys/conf/options head/sys/crypto/aesni/aesni.h head/sys/crypto/via/padlock.c head/sys/crypto/via/padlock_hash.c head/sys/dev/ata/ata-all.h head/sys/dev/ep/if_ep_isa.c head/sys/dev/exca/excareg.h head/sys/dev/fb/fb.c head/sys/dev/fb/splash_bmp.c head/sys/dev/fdc/fdc.c head/sys/dev/fdc/fdcvar.h head/sys/dev/fe/if_fe.c head/sys/dev/fe/if_fereg.h head/sys/dev/kbd/kbd.c head/sys/dev/le/am79900.c head/sys/dev/mse/msevar.h head/sys/dev/pccbb/pccbb_isa.c head/sys/dev/pci/vga_pci.c head/
svn commit: r284886 - head/sys/dev/fe
Author: nyan
Date: Sat Jun 27 09:01:49 2015
New Revision: 284886
URL: https://svnweb.freebsd.org/changeset/base/284886
Log:
MFi386: r278165
Silence a coverity warning about ignoring a return value.
Modified:
head/sys/dev/fe/if_fe_cbus.c
Modified: head/sys/dev/fe/if_fe_cbus.c
==
--- head/sys/dev/fe/if_fe_cbus.cSat Jun 27 08:49:41 2015
(r284885)
+++ head/sys/dev/fe/if_fe_cbus.cSat Jun 27 09:01:49 2015
(r284886)
@@ -157,10 +157,21 @@ static int
fe_isa_attach(device_t dev)
{
struct fe_softc *sc = device_get_softc(dev);
+ int error = 0;
- if (sc->port_used)
- fe98_alloc_port(dev, sc->type);
- fe_alloc_irq(dev, 0);
+ /*
+* Note: these routines aren't expected to fail since we also call
+* them in the probe routine. But coverity complains, so we'll honor
+* that complaint since the intention here was never to ignore them..
+*/
+ if (sc->port_used) {
+ error = fe98_alloc_port(dev, sc->type);
+ if (error != 0)
+ return (error);
+ }
+ error = fe_alloc_irq(dev, 0);
+ if (error != 0)
+ return (error);
return fe_attach(dev);
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r284885 - head/sys/boot/pc98/boot2
Author: nyan
Date: Sat Jun 27 08:49:41 2015
New Revision: 284885
URL: https://svnweb.freebsd.org/changeset/base/284885
Log:
MFi386: r284878
Reduce warnings:
- Add prototype for boot2 main()
- Don't make assignment within if statement, split it into two.
Modified:
head/sys/boot/pc98/boot2/boot2.c
Modified: head/sys/boot/pc98/boot2/boot2.c
==
--- head/sys/boot/pc98/boot2/boot2.cSat Jun 27 05:18:08 2015
(r284884)
+++ head/sys/boot/pc98/boot2/boot2.cSat Jun 27 08:49:41 2015
(r284885)
@@ -152,6 +152,7 @@ static int comspeed = SIOSPD;
static uint8_t ioctrl = IO_KEYBOARD;
#endif
+int main(void);
void exit(int);
static void load(void);
static int parse(void);
@@ -620,7 +621,8 @@ parse()
dsk.daua = dsk.disk | dsk.unit;
dsk_meta = 0;
}
- if (k = ep - arg) {
+ k = ep - arg;
+ if (k > 0) {
if (k >= sizeof(knamebuf))
return -1;
memcpy(knamebuf, arg, k + 1);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r283569 - head/sys/conf
Author: nyan
Date: Tue May 26 14:08:32 2015
New Revision: 283569
URL: https://svnweb.freebsd.org/changeset/base/283569
Log:
MFi386: r283407
Implement vdso - virtual dynamic shared object.
MFi386: r283474
Rework signal code to allow using it by other modules, like linprocfs.
MFi386: r283506
For objcopy, use --input-target and --output-target.
This fixes pc98 build.
Modified:
head/sys/conf/files.pc98
Modified: head/sys/conf/files.pc98
==
--- head/sys/conf/files.pc98Tue May 26 13:19:05 2015(r283568)
+++ head/sys/conf/files.pc98Tue May 26 14:08:32 2015(r283569)
@@ -21,6 +21,18 @@ linux_assym.hoptional
compat_linux\
no-obj no-implicit-rule before-depend \
clean "linux_assym.h"
#
+linux_locore.o optionalcompat_linux\
+ dependency "linux_assym.h $S/i386/linux/linux_locore.s"\
+ compile-with"${CC} -x assembler-with-cpp -DLOCORE -shared -s -pipe
-I. -I$S -Werror -Wall -fno-common -nostdinc -nostdlib
-Wl,-T$S/i386/linux/linux_vdso.lds.s
-Wl,-soname=linux_vdso.so,--eh-frame-hdr,-fPIC,-warn-common ${.IMPSRC} -o
${.TARGET}" \
+ no-obj no-implicit-rule \
+ clean "linux_locore.o"
+#
+linux_vdso.so optionalcompat_linux\
+ dependency "linux_locore.o"\
+ compile-with"${OBJCOPY} --input-target binary --output-target
elf32-i386-freebsd --binary-architecture i386 linux_locore.o ${.TARGET}" \
+ no-implicit-rule\
+ clean "linux_vdso.so"
+#
svr4_genassym.ooptionalcompat_svr4
\
dependency "$S/i386/svr4/svr4_genassym.c" \
compile-with"${CC} ${CFLAGS:N-fno-common} -c ${.IMPSRC}"\
@@ -59,6 +71,8 @@ compat/linux/linux_time.c optional compa
compat/linux/linux_timer.c optional compat_linux
compat/linux/linux_uid16.c optional compat_linux
compat/linux/linux_util.c optional compat_linux
+compat/linux/linux_vdso.c optional compat_linux
+compat/linux/linux.c optional compat_linux
compat/svr4/imgact_svr4.c optional compat_svr4
compat/svr4/svr4_fcntl.c optional compat_svr4
compat/svr4/svr4_filio.c optional compat_svr4
@@ -193,8 +207,6 @@ i386/isa/pmtimer.c optional pmtimer
i386/isa/prof_machdep.coptional profiling-routine
i386/linux/imgact_linux.c optional compat_linux
i386/linux/linux_dummy.c optional compat_linux
-i386/linux/linux_locore.s optional compat_linux \
- dependency "linux_assym.h"
i386/linux/linux_machdep.c optional compat_linux
i386/linux/linux_ptrace.c optional compat_linux
i386/linux/linux_support.s optional compat_linux \
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r276801 - head/sys/i386/i386
In article <201501080039.t080df3o011...@svn.freebsd.org> Warner Losh writes: > Author: imp > Date: Thu Jan 8 00:39:40 2015 > New Revision: 276801 > URL: https://svnweb.freebsd.org/changeset/base/276801 > > Log: > Don't call the SSE routines when they aren't enabled (or even compiled > into the kernel). > > +#if !defined(CPU_DISABLE_SSE) && defined(I686_CPU) > +#define CPU_ENABLE_SSE > +#endif % grep CPU_DISABLE_SSE options.* options.i386:CPU_DISABLE_SSEopt_cpu.h options.pc98:CPU_DISABLE_SSEopt_cpu.h So including opt_cpu.h is required. --- TAKAHASHI Yoshihiro ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r275411 - head/sys/boot/pc98/boot2
Author: nyan
Date: Tue Dec 2 14:48:21 2014
New Revision: 275411
URL: https://svnweb.freebsd.org/changeset/base/275411
Log:
MFi386: r275305 (by rdivacky)
Unbreak the code for non-digits below '0' by casting the expression
to unsigned int.
Modified:
head/sys/boot/pc98/boot2/boot2.c
Modified: head/sys/boot/pc98/boot2/boot2.c
==
--- head/sys/boot/pc98/boot2/boot2.cTue Dec 2 14:21:06 2014
(r275410)
+++ head/sys/boot/pc98/boot2/boot2.cTue Dec 2 14:48:21 2014
(r275411)
@@ -557,7 +557,7 @@ parse()
#if SERIAL
} else if (c == 'S') {
j = 0;
- while ((i = *arg++ - '0') <= 9)
+ while ((unsigned int)(i = *arg++ - '0') <= 9)
j = j * 10 + i;
if (j > 0 && i == -'0') {
comspeed = j;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r275241 - head/sys/boot/pc98/boot2
Author: nyan
Date: Sat Nov 29 12:22:31 2014
New Revision: 275241
URL: https://svnweb.freebsd.org/changeset/base/275241
Log:
MFi386: r275059, r275061, r275062 and r275191 (by rdivacky)
Shrink boot2 by a couple more bytes.
Modified:
head/sys/boot/pc98/boot2/boot2.c
Modified: head/sys/boot/pc98/boot2/boot2.c
==
--- head/sys/boot/pc98/boot2/boot2.cSat Nov 29 11:50:19 2014
(r275240)
+++ head/sys/boot/pc98/boot2/boot2.cSat Nov 29 12:22:31 2014
(r275241)
@@ -462,7 +462,8 @@ load(void)
caddr_t p;
ufs_ino_t ino;
uint32_t addr;
-int i, j;
+int k;
+uint8_t i, j;
if (!(ino = lookup(kname))) {
if (!ls)
@@ -483,7 +484,7 @@ load(void)
return;
} else if (IS_ELF(hdr.eh)) {
fs_off = hdr.eh.e_phoff;
- for (j = i = 0; i < hdr.eh.e_phnum && j < 2; i++) {
+ for (j = k = 0; k < hdr.eh.e_phnum && j < 2; k++) {
if (xfsread(ino, ep + j, sizeof(ep[0])))
return;
if (ep[j].p_type == PT_LOAD)
@@ -533,6 +534,7 @@ parse()
const char *cp;
unsigned int drv;
int c, i, j;
+size_t k;
while ((c = *arg++)) {
if (c == ' ' || c == '\t' || c == '\n')
@@ -555,7 +557,7 @@ parse()
#if SERIAL
} else if (c == 'S') {
j = 0;
- while ((unsigned int)(i = *arg++ - '0') <= 9)
+ while ((i = *arg++ - '0') <= 9)
j = j * 10 + i;
if (j > 0 && i == -'0') {
comspeed = j;
@@ -618,10 +620,10 @@ parse()
dsk.daua = dsk.disk | dsk.unit;
dsk_meta = 0;
}
- if ((i = ep - arg)) {
- if ((size_t)i >= sizeof(knamebuf))
+ if (k = ep - arg) {
+ if (k >= sizeof(knamebuf))
return -1;
- memcpy(knamebuf, arg, i + 1);
+ memcpy(knamebuf, arg, k + 1);
kname = knamebuf;
}
}
@@ -754,8 +756,10 @@ drvread(void *buf, unsigned lba)
head = x / dsk.sec;
sec = x % dsk.sec;
-if (!OPT_CHECK(RBX_QUIET))
- printf("%c\b", c = c << 8 | c >> 24);
+if (!OPT_CHECK(RBX_QUIET)) {
+ xputc(c = c << 8 | c >> 24);
+ xputc('\b');
+}
v86.ctl = V86_ADDR | V86_CALLF | V86_FLAGS;
v86.addr = READORG;/* call to read in boot1 */
v86.ecx = cyl;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r275239 - head/sys/boot/pc98/boot2
Author: nyan
Date: Sat Nov 29 09:27:18 2014
New Revision: 275239
URL: https://svnweb.freebsd.org/changeset/base/275239
Log:
MFi386: r275237 (by rdivacky)
Shrink boot2 a bit more by factoring out common pattern
of printf();return(-1);
Modified:
head/sys/boot/pc98/boot2/boot2.c
Modified: head/sys/boot/pc98/boot2/boot2.c
==
--- head/sys/boot/pc98/boot2/boot2.cSat Nov 29 09:09:54 2014
(r275238)
+++ head/sys/boot/pc98/boot2/boot2.cSat Nov 29 09:27:18 2014
(r275239)
@@ -639,6 +639,7 @@ dskread(void *buf, unsigned lba, unsigne
unsigned i;
uint8_t sl;
u_char *p;
+const char *reason;
if (!dsk_meta) {
sec = dmadat->secbuf;
@@ -660,8 +661,8 @@ dskread(void *buf, unsigned lba, unsigne
if (sl != WHOLE_DISK_SLICE) {
dp += sl - BASE_SLICE;
if (dp->dp_mid != DOSMID_386BSD) {
- printf("Invalid %s\n", "slice");
- return -1;
+ reason = "slice";
+ goto error;
}
dsk.start = dp->dp_scyl * dsk.head * dsk.sec +
dp->dp_shd * dsk.sec + dp->dp_ssect;
@@ -671,14 +672,14 @@ dskread(void *buf, unsigned lba, unsigne
d = (void *)(sec + LABELOFFSET);
if (d->d_magic != DISKMAGIC || d->d_magic2 != DISKMAGIC) {
if (dsk.part != RAW_PART) {
- printf("Invalid %s\n", "label");
- return -1;
+ reason = "label";
+ goto error;
}
} else {
if (dsk.part >= d->d_npartitions ||
!d->d_partitions[dsk.part].p_size) {
- printf("Invalid %s\n", "partition");
- return -1;
+ reason = "partition";
+ goto error;
}
dsk.start += d->d_partitions[dsk.part].p_offset;
dsk.start -= d->d_partitions[RAW_PART].p_offset;
@@ -690,6 +691,9 @@ dskread(void *buf, unsigned lba, unsigne
return i;
}
return 0;
+error:
+printf("Invalid %s\n", reason);
+return -1;
}
static void
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r274537 - head/sys/boot/pc98/loader
Author: nyan
Date: Sat Nov 15 03:34:34 2014
New Revision: 274537
URL: https://svnweb.freebsd.org/changeset/base/274537
Log:
MFi386: r274398
Move NFS and TFTP filesystems before the synthetic filesystems (bzip,
gzip, and split).
Modified:
head/sys/boot/pc98/loader/conf.c
Modified: head/sys/boot/pc98/loader/conf.c
==
--- head/sys/boot/pc98/loader/conf.cSat Nov 15 02:58:17 2014
(r274536)
+++ head/sys/boot/pc98/loader/conf.cSat Nov 15 03:34:34 2014
(r274537)
@@ -61,19 +61,19 @@ struct fs_ops *file_system[] = {
&ext2fs_fsops,
&dosfs_fsops,
&cd9660_fsops,
-&splitfs_fsops,
-#ifdef LOADER_GZIP_SUPPORT
-&gzipfs_fsops,
-#endif
-#ifdef LOADER_BZIP2_SUPPORT
-&bzipfs_fsops,
-#endif
#ifdef LOADER_NFS_SUPPORT
&nfs_fsops,
#endif
#ifdef LOADER_TFTP_SUPPORT
&tftp_fsops,
#endif
+#ifdef LOADER_GZIP_SUPPORT
+&gzipfs_fsops,
+#endif
+#ifdef LOADER_BZIP2_SUPPORT
+&bzipfs_fsops,
+#endif
+&splitfs_fsops,
NULL
};
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r273249 - head/usr.sbin
Author: nyan
Date: Sat Oct 18 08:07:17 2014
New Revision: 273249
URL: https://svnweb.freebsd.org/changeset/base/273249
Log:
Disable hyperv on pc98.
Modified:
head/usr.sbin/Makefile.i386
Modified: head/usr.sbin/Makefile.i386
==
--- head/usr.sbin/Makefile.i386 Sat Oct 18 07:40:38 2014(r273248)
+++ head/usr.sbin/Makefile.i386 Sat Oct 18 08:07:17 2014(r273249)
@@ -9,9 +9,6 @@ SUBDIR+=asf
SUBDIR+= btxld
.endif
SUBDIR+= cpucontrol
-.if ${MK_HYPERV} != "no"
-SUBDIR+= hyperv
-.endif
SUBDIR+= kgmon
SUBDIR+= kgzip
SUBDIR+= lptcontrol
@@ -31,6 +28,9 @@ SUBDIR+= zzz
SUBDIR+= acpi
.endif
SUBDIR+= boot0cfg
+.if ${MK_HYPERV} != "no"
+SUBDIR+= hyperv
+.endif
.if ${MK_WIRELESS} != "no"
SUBDIR+= wlconfig
.endif
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r273155 - in head: etc/devd libexec share/mk
In article <201410160033.s9g0x6w1063...@svn.freebsd.org> Warner Losh writes: > Log: > HYPERV isn't available on all architectures, but just on by default > for i386/amd64. Rather, it only works on i386/amd64 and should only be > built there. Rather than change the default based on which > architecutre, do things more directly by only building it on > i386/amd64 and having it always on. This is how we handle other > options that are relevant only for a few architectures. > > Added: > head/libexec/Makefile.amd64 (contents, props changed) > head/libexec/Makefile.i386 (contents, props changed) We need a dummy Makefile.pc98 to avoid including Makefile.i386 on pc98. --- TAKAHASHI Yoshihiro ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r272561 - head/sys/modules
Author: nyan
Date: Sun Oct 5 07:27:05 2014
New Revision: 272561
URL: https://svnweb.freebsd.org/changeset/base/272561
Log:
- Refactor defining variables.
- Merge common modules both i386 and amd64 into one if-endif.
- Sort.
- There are no functional changes.
Modified:
head/sys/modules/Makefile
Modified: head/sys/modules/Makefile
==
--- head/sys/modules/Makefile Sun Oct 5 07:21:41 2014(r272560)
+++ head/sys/modules/Makefile Sun Oct 5 07:27:05 2014(r272561)
@@ -384,32 +384,7 @@ SUBDIR=\
${_xe} \
xl \
${_zfs} \
- zlib \
-
-.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
-_filemon= filemon
-_vmware= vmware
-.endif
-
-.if ${MACHINE_CPUARCH} != "powerpc" && ${MACHINE_CPUARCH} != "arm" && \
- ${MACHINE_CPUARCH} != "mips"
-_syscons= syscons
-_vpo= vpo
-.endif
-
-.if ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
-# no BUS_SPACE_UNSPECIFIED
-# No barrier instruction support (specific to this driver)
-_sym= sym
-# intr_disable() is a macro, causes problems
-.if ${MK_SOURCELESS_UCODE} != "no"
-_cxgb= cxgb
-.endif
-.endif
-
-.if ${MK_SOURCELESS_UCODE} != "no"
-_cxgbe=cxgbe
-.endif
+ zlib
.if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
.if exists(${.CURDIR}/../opencrypto)
@@ -423,23 +398,20 @@ _random= random
.if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \
defined(ALL_MODULES)
-_carp= carp
+_carp= carp
_toecore= toecore
.endif
.if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES)
_if_gre= if_gre
+_ipdivert= ipdivert
+_ipfw= ipfw
.endif
.if ${MK_IPFILTER} != "no" || defined(ALL_MODULES)
_ipfilter= ipfilter
.endif
-.if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES)
-_ipdivert= ipdivert
-_ipfw= ipfw
-.endif
-
.if ${MK_NAND} != "no" || defined(ALL_MODULES)
_nandfs= nandfs
_nandsim= nandsim
@@ -460,6 +432,7 @@ _pfsync=pfsync
.if ${MK_SOURCELESS_UCODE} != "no"
_bce= bce
+_cxgbe=cxgbe
_fatm= fatm
_fxp= fxp
_ispfw=ispfw
@@ -471,31 +444,33 @@ _ti= ti
_txp= txp
.endif
-.if ${MACHINE_CPUARCH} == "i386"
-# XXX some of these can move to the general case when de-i386'ed
-# XXX some of these can move now, but are untested on other architectures.
-_3dfx= 3dfx
-_3dfx_linux= 3dfx_linux
+
+.if ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" && \
+ ${MACHINE_CPUARCH} != "powerpc"
+_syscons= syscons
+_vpo= vpo
+.endif
+
+.if ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
+# no BUS_SPACE_UNSPECIFIED
+# No barrier instruction support (specific to this driver)
+_sym= sym
+# intr_disable() is a macro, causes problems
+.if ${MK_SOURCELESS_UCODE} != "no"
+_cxgb= cxgb
+.endif
+.endif
+
+.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
_agp= agp
-_aic= aic
_an= an
_aout= aout
-_apm= apm
-_arcnet= arcnet
_bktr= bktr
_bxe= bxe
_cardbus= cardbus
_cbb= cbb
-.if ${MK_SOURCELESS_UCODE} != "no"
-_ce= ce
-.endif
-_coff= coff
-.if ${MK_SOURCELESS_UCODE} != "no"
-_cp= cp
-.endif
_cpuctl= cpuctl
_cpufreq= cpufreq
-_cs= cs
.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
_cyclic= cyclic
.endif
@@ -506,21 +481,15 @@ _drm2=drm2
_dtrace= dtrace
.endif
_ed= ed
-_elink=elink
_em= em
-_ep= ep
_et= et
_exca= exca
_ext2fs= ext2fs
-_fe= fe
-_glxiic= glxiic
-_glxsb=glxsb
+_filemon= filemon
_i2c= i2c
.if ${MK_OFED} != "no" || defined(ALL_MODULES)
_ibcore=ibcore
.endif
-_ibcs2=ibcs2
-_ie= ie
_if_ndis= if_ndis
_igb= igb
_io= io
@@ -530,28 +499,15 @@ _ipoib= ipoib
_linprocfs=linprocfs
_linsysfs= linsysfs
_linux=linux
-_mse= mse
-.if ${MK_OFED} != "no" || defined(ALL_MODULES)
-_mlx4= mlx4
-_mlx4ib= mlx4ib
-_mlxen=mlxen
-_mthca=mthca
-.endif
-_ncr= ncr
-_ncv= ncv
_ndis= ndis
-_nsp= nsp
.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
_opensolaris= opensolaris
.endif
_pccard= pccard
-_pcfclock= pcfclock
-_pst= pst
.if ${MK_OFED} != "no" || defined(ALL_MODULES)
_rdma= rdma
.endif
_safe= safe
-_sbni= sbni
_scsi_low= scsi_low
_si= si
_smbfs=smbfs
@@ -559,42 +515,27 @@ _sound= sound
_speaker= speaker
_splash= splash
_sppp= sppp
-_stg= stg
-_streams=
svn commit: r272492 - in head/sys: conf i386/i386 pc98/pc98
Author: nyan
Date: Sat Oct 4 06:01:30 2014
New Revision: 272492
URL: https://svnweb.freebsd.org/changeset/base/272492
Log:
Merge pc98's machdep.c into i386/i386/machdep.c.
Deleted:
head/sys/pc98/pc98/machdep.c
Modified:
head/sys/conf/files.pc98
head/sys/i386/i386/machdep.c
Modified: head/sys/conf/files.pc98
==
--- head/sys/conf/files.pc98Sat Oct 4 05:03:39 2014(r272491)
+++ head/sys/conf/files.pc98Sat Oct 4 06:01:30 2014(r272492)
@@ -149,6 +149,7 @@ i386/i386/initcpu.c standard
i386/i386/io.c optional io
i386/i386/k6_mem.c optional mem
i386/i386/locore.s standardno-obj
+i386/i386/machdep.cstandard
i386/i386/mem.coptional mem
i386/i386/minidump_machdep.c standard
i386/i386/mp_clock.c optional smp
@@ -237,7 +238,6 @@ pc98/pc98/busiosubr.c standard
pc98/pc98/canbepm.coptional canbepm
pc98/pc98/canbus.c optional canbus
pc98/pc98/canbus_if.m optional canbus
-pc98/pc98/machdep.cstandard
pc98/pc98/pc98_machdep.c standard
#
# x86 shared code between IA32, AMD64 and PC98 architectures
Modified: head/sys/i386/i386/machdep.c
==
--- head/sys/i386/i386/machdep.cSat Oct 4 05:03:39 2014
(r272491)
+++ head/sys/i386/i386/machdep.cSat Oct 4 06:01:30 2014
(r272492)
@@ -109,7 +109,11 @@ __FBSDID("$FreeBSD$");
#include
#endif
+#ifdef PC98
+#include
+#else
#include
+#endif
#include
@@ -204,6 +208,14 @@ SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST,
int_udatasel, _ucodesel;
u_int basemem;
+#ifdef PC98
+intneed_pre_dma_flush; /* If 1, use wbinvd befor DMA transfer. */
+intneed_post_dma_flush;/* If 1, use invd after DMA transfer. */
+
+static int ispc98 = 1;
+SYSCTL_INT(_machdep, OID_AUTO, ispc98, CTLFLAG_RD, &ispc98, 0, "");
+#endif
+
int cold = 1;
#ifdef COMPAT_43
@@ -259,7 +271,8 @@ cpu_startup(dummy)
{
uintmax_t memsize;
char *sysenv;
-
+
+#ifndef PC98
/*
* On MacBooks, we need to disallow the legacy USB circuit to
* generate an SMI# because this can cause several problems,
@@ -285,6 +298,7 @@ cpu_startup(dummy)
}
freeenv(sysenv);
}
+#endif /* !PC98 */
/*
* Good {morning,afternoon,evening,night}.
@@ -1235,6 +1249,7 @@ SYSCTL_INT(_machdep, OID_AUTO, idle_mwai
#defineSTATE_MWAIT 0x1
#defineSTATE_SLEEPING 0x2
+#ifndef PC98
static void
cpu_idle_acpi(sbintime_t sbt)
{
@@ -1253,6 +1268,7 @@ cpu_idle_acpi(sbintime_t sbt)
__asm __volatile("sti; hlt");
*state = STATE_RUNNING;
}
+#endif /* !PC98 */
#ifndef XEN
static void
@@ -1370,7 +1386,7 @@ cpu_probe_amdc1e(void)
}
}
-#ifdef XEN
+#if defined(PC98) || defined(XEN)
void (*cpu_idle_fn)(sbintime_t) = cpu_idle_hlt;
#else
void (*cpu_idle_fn)(sbintime_t) = cpu_idle_acpi;
@@ -1458,7 +1474,9 @@ struct {
{ cpu_idle_spin, "spin" },
{ cpu_idle_mwait, "mwait" },
{ cpu_idle_hlt, "hlt" },
+#ifndef PC98
{ cpu_idle_acpi, "acpi" },
+#endif
{ NULL, NULL }
};
@@ -1475,9 +1493,11 @@ idle_sysctl_available(SYSCTL_HANDLER_ARG
if (strstr(idle_tbl[i].id_name, "mwait") &&
(cpu_feature2 & CPUID2_MON) == 0)
continue;
+#ifndef PC98
if (strcmp(idle_tbl[i].id_name, "acpi") == 0 &&
cpu_idle_hook == NULL)
continue;
+#endif
p += sprintf(p, "%s%s", p != avail ? ", " : "",
idle_tbl[i].id_name);
}
@@ -1512,9 +1532,11 @@ idle_sysctl(SYSCTL_HANDLER_ARGS)
if (strstr(idle_tbl[i].id_name, "mwait") &&
(cpu_feature2 & CPUID2_MON) == 0)
continue;
+#ifndef PC98
if (strcmp(idle_tbl[i].id_name, "acpi") == 0 &&
cpu_idle_hook == NULL)
continue;
+#endif
if (strcmp(idle_tbl[i].id_name, buf))
continue;
cpu_idle_fn = idle_tbl[i].id_fn;
@@ -2000,7 +2022,7 @@ sdtossd(sd, ssd)
ssd->ssd_gran = sd->sd_gran;
}
-#ifndef XEN
+#if !defined(PC98) && !defined(XEN)
static int
add_physmap_entry(uint64_t base, uint64_t length, vm_paddr_t *physmap,
int *physmap_idxp)
@@ -2107,7 +2129,9 @@ add_smap_entries(struct bios_smap *smapb
if (!add_smap_entry(smap, physmap, physmap_idxp))
break;
}
+#endif /* !PC98 && !XEN */
+#ifndef XEN
static void
basemem_setup(void)
{
@@ -2155,7 +2179,7 @@ basemem_setup(void)
for (i = basemem / 4; i < 160; i++)
pte[i] = (i << PAGE_SHIFT) | PG_V | PG
svn commit: r272491 - head/sys/conf
Author: nyan Date: Sat Oct 4 05:03:39 2014 New Revision: 272491 URL: https://svnweb.freebsd.org/changeset/base/272491 Log: Reduce diffs against i386. Modified: head/sys/conf/options.pc98 Modified: head/sys/conf/options.pc98 == --- head/sys/conf/options.pc98 Sat Oct 4 05:01:57 2014(r272490) +++ head/sys/conf/options.pc98 Sat Oct 4 05:03:39 2014(r272491) @@ -31,12 +31,6 @@ KVA_PAGESopt_global.h TIMER_FREQ opt_clock.h -# options for serial support -COM_ESPopt_sio.h -COM_MULTIPORT opt_sio.h -CONSPEED opt_sio.h -GDBSPEED opt_sio.h - CPU_BLUELIGHTNING_3X opt_cpu.h CPU_BLUELIGHTNING_FPU_OP_CACHE opt_cpu.h CPU_BTB_EN opt_cpu.h @@ -67,8 +61,17 @@ I486_CPU opt_global.h I586_CPU opt_global.h I686_CPU opt_global.h +# options for serial support +COM_ESPopt_sio.h +COM_MULTIPORT opt_sio.h +CONSPEED opt_sio.h +GDBSPEED opt_sio.h + GDC +# AGP debugging support +AGP_DEBUG opt_agp.h + # Video spigot SPIGOT_UNSECUREopt_spigot.h @@ -96,7 +99,6 @@ DEV_NPX opt_npx.h # Debugging NPX_DEBUG opt_npx.h -AGP_DEBUG opt_agp.h # BPF just-in-time compiler BPF_JITTER opt_bpf.h ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r272490 - head/sys/conf
Author: nyan
Date: Sat Oct 4 05:01:57 2014
New Revision: 272490
URL: https://svnweb.freebsd.org/changeset/base/272490
Log:
- MFi386: Add compile-with option for tau32-ddk.c.
- Whitespace change.
- Remove duplicate line.
Modified:
head/sys/conf/files.pc98
Modified: head/sys/conf/files.pc98
==
--- head/sys/conf/files.pc98Sat Oct 4 02:34:30 2014(r272489)
+++ head/sys/conf/files.pc98Sat Oct 4 05:01:57 2014(r272490)
@@ -89,7 +89,8 @@ dev/agp/agp_via.c optional agp
dev/aic/aic_cbus.c optional aic isa
dev/ce/ceddk.c optional ce
dev/ce/if_ce.c optional ce
-dev/ce/tau32-ddk.c optional ce
+dev/ce/tau32-ddk.c optional ce \
+ compile-with "${NORMAL_C} ${NO_WCONSTANT_CONVERSION}"
dev/cp/cpddk.c optional cp
dev/cp/if_cp.c optional cp
dev/ct/bshw_machdep.c optional ct
@@ -241,7 +242,7 @@ pc98/pc98/pc98_machdep.cstandard
#
# x86 shared code between IA32, AMD64 and PC98 architectures
#
-x86/isa/atpic.coptional atpic
+x86/isa/atpic.coptional atpic
x86/isa/clock.cstandard
x86/isa/isa.c optional isa
x86/pci/pci_bus.c optional pci
@@ -259,5 +260,4 @@ x86/x86/mptable_pci.c optional apic pci
x86/x86/msi.c optional apic pci
x86/x86/nexus.cstandard
x86/x86/tsc.c standard
-x86/x86/tsc.c standard
x86/x86/delay.cstandard
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r272259 - head/sys/pc98/conf
Author: nyan Date: Sun Sep 28 14:39:11 2014 New Revision: 272259 URL: http://svnweb.freebsd.org/changeset/base/272259 Log: MFi386: Enable QUOTA, PRINTF_BUFR_SIZE and puc. Modified: head/sys/pc98/conf/GENERIC Modified: head/sys/pc98/conf/GENERIC == --- head/sys/pc98/conf/GENERIC Sun Sep 28 14:25:46 2014(r272258) +++ head/sys/pc98/conf/GENERIC Sun Sep 28 14:39:11 2014(r272259) @@ -35,6 +35,7 @@ options SOFTUPDATES # Enable FFS soft optionsUFS_ACL # Support for access control lists optionsUFS_DIRHASH # Improve performance on big directories optionsUFS_GJOURNAL# Enable gjournal-based UFS journaling +optionsQUOTA # Enable disk quotas for UFS optionsMD_ROOT # MD is a potential root device optionsNFSCL # New Network Filesystem Client optionsNFSD# New Network Filesystem Server @@ -60,6 +61,7 @@ options SYSVSHM # SYSV-style shared m optionsSYSVMSG # SYSV-style message queues optionsSYSVSEM # SYSV-style semaphores options_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions +optionsPRINTF_BUFR_SIZE=128# Prevent printf output being interspersed. optionsKBD_INSTALL_CDEV# install a CDEV entry in /dev optionsHWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) optionsAUDIT # Security event auditing @@ -112,6 +114,7 @@ device sa # Sequential Access (tape e device cd # CD device pass# Passthrough device (direct ATA/SCSI access) device ses # Enclosure Services (SES and SAF-TE) +#devicectl # CAM Target Layer # keyboard driver device pckbd # PC98 keyboard @@ -157,6 +160,8 @@ device ppi # Parallel port interface # OLD Parallel port #deviceolpt +device puc # Multi I/O cards and multi-channel UARTs + # PCI Ethernet NICs. device de # DEC/Intel DC21x4x (``Tulip'') #deviceem # Intel PRO/1000 Gigabit Ethernet Family ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r272258 - head/sys/pc98/conf
Author: nyan Date: Sun Sep 28 14:25:46 2014 New Revision: 272258 URL: http://svnweb.freebsd.org/changeset/base/272258 Log: - Cosmetic changes. - Reduce diffs against i386. Modified: head/sys/pc98/conf/GENERIC Modified: head/sys/pc98/conf/GENERIC == --- head/sys/pc98/conf/GENERIC Sun Sep 28 14:05:18 2014(r272257) +++ head/sys/pc98/conf/GENERIC Sun Sep 28 14:25:46 2014(r272258) @@ -66,9 +66,11 @@ options AUDIT # Security event auditi optionsCAPABILITY_MODE # Capsicum capability mode optionsCAPABILITIES# Capsicum capabilities optionsMAC # TrustedBSD MAC Framework -optionsINCLUDE_CONFIG_FILE # Include this file in kernel -optionsKDB # Kernel debugger related code -optionsKDB_TRACE # Print a stack trace for a panic +optionsINCLUDE_CONFIG_FILE # Include this file in kernel + +# Debugging support. Always need this: +optionsKDB # Enable kernel debugger support. +optionsKDB_TRACE # Print a stack trace for a panic. # To make an SMP kernel, the next two lines are needed #options SMP # Symmetric MultiProcessor Kernel @@ -81,47 +83,47 @@ device pci device fdc # ATA controllers -device ahci# AHCI-compatible SATA controllers -device ata # Legacy ATA/SATA controllers -optionsATA_STATIC_ID # Static device numbering -device mvs # Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA -device siis# SiliconImage SiI3124/SiI3132/SiI3531 SATA +device ahci# AHCI-compatible SATA controllers +device ata # Legacy ATA/SATA controllers +optionsATA_STATIC_ID # Static device numbering +device mvs # Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA +device siis# SiliconImage SiI3124/SiI3132/SiI3531 SATA # SCSI Controllers -device adv # Advansys SCSI adapters -device ahc # AHA2940 and onboard AIC7xxx devices -device esp # AMD Am53C974 (Tekram DC-390(T)) -device isp # Qlogic family -#devicencr # NCR/Symbios Logic -device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') - -device aic # PC-9801-100 -device ct # host adapter using WD33C93[ABC] chip (C bus) - -device ncv # NCR 53C500 -device nsp # Workbit Ninja SCSI-3 -device stg # TMC 18C30/18C50 +device ahc # AHA2940 and onboard AIC7xxx devices +device esp # AMD Am53C974 (Tekram DC-390(T)) +device isp # Qlogic family +#devicencr # NCR/Symbios Logic +device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') + +device adv # Advansys SCSI adapters +device aic # PC-9801-100 +device ct # host adapter using WD33C93[ABC] chip + +device ncv # NCR 53C500 +device nsp # Workbit Ninja SCSI-3 +device stg # TMC 18C30/18C50 # ATA/SCSI peripherals -device scbus # SCSI bus (required for ATA/SCSI) -device ch # SCSI media changers -device da # Direct Access (disks) -device sa # Sequential Access (tape etc) -device cd # CD -device pass# Passthrough device (direct ATA/SCSI access) -device ses # Enclosure Services (SES and SAF-TE) +device scbus # SCSI bus (required for ATA/SCSI) +device ch # SCSI media changers +device da # Direct Access (disks) +device sa # Sequential Access (tape etc) +device cd # CD +device pass# Passthrough device (direct ATA/SCSI access) +device ses # Enclosure Services (SES and SAF-TE) # keyboard driver -device pckbd # PC98 keyboard +device pckbd # PC98 keyboard -device gdc # GDC screen +device gdc # GDC screen -device splash # Splash screen and screen saver support +device splash # Splash screen and screen saver support # syscons is the default console driver, resembling an SCO console
svn commit: r272256 - in head/sys/boot: . pc98/loader
Author: nyan
Date: Sun Sep 28 13:34:43 2014
New Revision: 272256
URL: http://svnweb.freebsd.org/changeset/base/272256
Log:
MFi386: r261567
Switch from lib/libstand to sys/boot/libstand32.
Modified:
head/sys/boot/Makefile.pc98
head/sys/boot/pc98/loader/Makefile
Modified: head/sys/boot/Makefile.pc98
==
--- head/sys/boot/Makefile.pc98 Sun Sep 28 13:13:18 2014(r272255)
+++ head/sys/boot/Makefile.pc98 Sun Sep 28 13:34:43 2014(r272256)
@@ -1,4 +1,3 @@
# $FreeBSD$
-# Blank, to override Makefile.i386 since Makefile.$MACHINE is included before
-# Makefile.$MACHINE_ARCH
+SUBDIR+= libstand32
Modified: head/sys/boot/pc98/loader/Makefile
==
--- head/sys/boot/pc98/loader/Makefile Sun Sep 28 13:13:18 2014
(r272255)
+++ head/sys/boot/pc98/loader/Makefile Sun Sep 28 13:34:43 2014
(r272256)
@@ -56,6 +56,8 @@ LDFLAGS= -static -Ttext 0x0
LIBPC98= ${.OBJDIR}/../libpc98/libpc98.a
CFLAGS+= -I${.CURDIR}/..
+LIBSTAND= ${.OBJDIR}/../../libstand32/libstand.a
+
# BTX components
CFLAGS+= -I${.CURDIR}/../btx/lib
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r272255 - head/sys/boot/pc98/libpc98
Author: nyan
Date: Sun Sep 28 13:13:18 2014
New Revision: 272255
URL: http://svnweb.freebsd.org/changeset/base/272255
Log:
MFi386: r268974
Supress clang warning for FreeBSD printf %b and %D formats.
Modified:
head/sys/boot/pc98/libpc98/Makefile
Modified: head/sys/boot/pc98/libpc98/Makefile
==
--- head/sys/boot/pc98/libpc98/Makefile Sun Sep 28 12:55:13 2014
(r272254)
+++ head/sys/boot/pc98/libpc98/Makefile Sun Sep 28 13:13:18 2014
(r272255)
@@ -44,4 +44,7 @@ CFLAGS+= -I${.CURDIR}/../../common \
# the location of libstand
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
+# Suppress warning from clang for FreeBSD %b and %D formats
+CFLAGS+= -fformat-extensions
+
.include
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r272252 - head/sys/boot/pc98/cdboot
Author: nyan Date: Sun Sep 28 12:25:27 2014 New Revision: 272252 URL: http://svnweb.freebsd.org/changeset/base/272252 Log: MFi386: r261520 Drop the 3rd clause from all 3 clause BSD licenses. Modified: head/sys/boot/pc98/cdboot/cdboot.S Modified: head/sys/boot/pc98/cdboot/cdboot.S == --- head/sys/boot/pc98/cdboot/cdboot.S Sun Sep 28 12:18:21 2014 (r272251) +++ head/sys/boot/pc98/cdboot/cdboot.S Sun Sep 28 12:25:27 2014 (r272252) @@ -11,9 +11,6 @@ # 2. Redistributions in binary form must reproduce the above copyright #notice, this list of conditions and the following disclaimer in the #documentation and/or other materials provided with the distribution. -# 3. Neither the name of the author nor the names of any co-contributors -#may be used to endorse or promote products derived from this software -#without specific prior written permission. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r272250 - head/sys/boot/pc98/boot2
Author: nyan
Date: Sun Sep 28 12:13:51 2014
New Revision: 272250
URL: http://svnweb.freebsd.org/changeset/base/272250
Log:
Reduce diffs against i386.
Modified:
head/sys/boot/pc98/boot2/Makefile
Modified: head/sys/boot/pc98/boot2/Makefile
==
--- head/sys/boot/pc98/boot2/Makefile Sun Sep 28 12:12:54 2014
(r272249)
+++ head/sys/boot/pc98/boot2/Makefile Sun Sep 28 12:13:51 2014
(r272250)
@@ -2,10 +2,6 @@
.include
-# XXX: clang can compile the boot code just fine, but boot2 gets too big
-#CC:= gcc
-#COMPILER_TYPE:= gcc
-
FILES= boot boot1 boot2
NM?= nm
@@ -114,4 +110,5 @@ boot2.h: boot1.out
.include
# XXX: clang integrated-as doesn't grok .codeNN directives yet
-CFLAGS+= ${CLANG_NO_IAS}
+CFLAGS.boot1.S=${CLANG_NO_IAS}
+CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r272249 - head/sys/boot/i386/boot2
Author: nyan Date: Sun Sep 28 12:12:54 2014 New Revision: 272249 URL: http://svnweb.freebsd.org/changeset/base/272249 Log: Remove extra '\'. Modified: head/sys/boot/i386/boot2/Makefile Modified: head/sys/boot/i386/boot2/Makefile == --- head/sys/boot/i386/boot2/Makefile Sun Sep 28 11:32:46 2014 (r272248) +++ head/sys/boot/i386/boot2/Makefile Sun Sep 28 12:12:54 2014 (r272249) @@ -37,7 +37,7 @@ CFLAGS= -Os \ -Wall -Waggregate-return -Wbad-function-cast -Wcast-align \ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ - -Winline \ + -Winline CFLAGS.gcc+= -fno-guess-branch-probability \ -fno-unit-at-a-time \ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r272248 - in head: sys/sys usr.sbin/fdread
Author: nyan
Date: Sun Sep 28 11:32:46 2014
New Revision: 272248
URL: http://svnweb.freebsd.org/changeset/base/272248
Log:
- Cleanups pc98 code.
- Remove unworked formats.
Modified:
head/sys/sys/fdcio.h
head/usr.sbin/fdread/fdutil.c
Modified: head/sys/sys/fdcio.h
==
--- head/sys/sys/fdcio.hSun Sep 28 11:10:37 2014(r272247)
+++ head/sys/sys/fdcio.hSun Sep 28 11:32:46 2014(r272248)
@@ -181,27 +181,17 @@ enum fd_drivetype {
* XXX: should have been done 20 years ago to make sense.
*/
#ifdef PC98
-#define FDF_3_1722 21,2,0xFF,0x04,82,0,2,2,0x0C,2,0,FL_MFM
-#define FDF_3_1476 18,2,0xFF,0x1B,82,0,2,2,0x54,1,0,FL_MFM
#define FDF_3_1440 18,2,0xFF,0x1B,80,0,2,2,0x54,1,0,FL_MFM
#define FDF_3_1200 15,2,0xFF,0x1B,80,0,0,2,0x54,1,0,FL_MFM
-#define FDF_3_820 10,2,0xFF,0x10,82,0,1,2,0x30,1,0,FL_MFM
-#define FDF_3_800 10,2,0xFF,0x10,80,0,1,2,0x30,1,0,FL_MFM
#define FDF_3_720 9,2,0xFF,0x20,80,0,1,2,0x50,1,0,FL_MFM
#define FDF_3_360 9,2,0xFF,0x20,40,0,1,2,0x50,1,0,FL_MFM|FL_2STEP
#define FDF_3_640 8,2,0xFF,0x2A,80,0,1,2,0x50,1,0,FL_MFM
#define FDF_3_1230 8,3,0xFF,0x35,77,0,0,2,0x74,1,0,FL_MFM
-#define FDF_3_1280 8,3,0xFF,0x35,80,0,0,2,0x74,1,0,FL_MFM
-#define FDF_3_1480 9,3,0xFF,0x35,82,0,0,2,0x47,1,0,FL_MFM
-#define FDF_3_1640 10,3,0xFF,0x1B,82,0,2,2,0x54,1,0,FL_MFM
#define FDF_5_1200 15,2,0xFF,0x1B,80,0,0,2,0x54,1,0,FL_MFM
-#define FDF_5_820 10,2,0xFF,0x10,82,0,1,2,0x30,1,0,FL_MFM
-#define FDF_5_800 10,2,0xFF,0x10,80,0,1,2,0x30,1,0,FL_MFM
#define FDF_5_720 9,2,0xFF,0x20,80,0,1,2,0x50,1,0,FL_MFM
#define FDF_5_360 9,2,0xFF,0x20,40,0,1,2,0x50,1,0,FL_MFM|FL_2STEP
#define FDF_5_640 8,2,0xFF,0x2A,80,0,1,2,0x50,1,0,FL_MFM
#define FDF_5_1230 8,3,0xFF,0x35,77,0,0,2,0x74,1,0,FL_MFM
-#define FDF_5_1280 8,3,0xFF,0x35,80,0,0,2,0x74,1,0,FL_MFM
#else /* PC98 */
#define FDF_3_2880 36,2,0xFF,0x1B,80,0,FDC_1MBPS,002,0x4C,1,1,FL_MFM|FL_PERPND
#define FDF_3_1722 21,2,0xFF,0x04,82,0,FDC_500KBPS,2,0x0C,2,0,FL_MFM
Modified: head/usr.sbin/fdread/fdutil.c
==
--- head/usr.sbin/fdread/fdutil.c Sun Sep 28 11:10:37 2014
(r272247)
+++ head/usr.sbin/fdread/fdutil.c Sun Sep 28 11:32:46 2014
(r272248)
@@ -92,6 +92,7 @@ static struct fd_type fd_types_auto[1] =
static struct fd_type fd_types_288m[] = {
+#ifndef PC98
#if 0
{ FDF_3_2880 },
#endif
@@ -102,30 +103,18 @@ static struct fd_type fd_types_288m[] =
{ FDF_3_820 },
{ FDF_3_800 },
{ FDF_3_720 },
+#endif /* !PC98 */
{ 0,0,0,0,0,0,0,0,0,0,0,0 }
};
static struct fd_type fd_types_144m[] = {
#ifdef PC98
-#if 0
- { FDF_3_1722 },
- { FDF_3_1476 },
-#endif
{ FDF_3_1440 },
{ FDF_3_1200 },
-#if 0
- { FDF_3_820 },
- { FDF_3_800 },
-#endif
{ FDF_3_720 },
{ FDF_3_360 },
{ FDF_3_640 },
{ FDF_3_1230 },
-#if 0
- { FDF_3_1280 },
- { FDF_3_1480 },
- { FDF_3_1640 },
-#endif
{ 0,0,0,0,0,0,0,0,0,0,0,0 }
#else
{ FDF_3_1722 },
@@ -142,17 +131,10 @@ static struct fd_type fd_types_144m[] =
static struct fd_type fd_types_12m[] = {
#ifdef PC98
{ FDF_5_1200 },
-#if 0
- { FDF_5_820 },
- { FDF_5_800 },
-#endif
{ FDF_5_720 },
{ FDF_5_360 },
{ FDF_5_640 },
{ FDF_5_1230 },
-#if 0
- { FDF_5_1280 },
-#endif
{ 0,0,0,0,0,0,0,0,0,0,0,0 }
#else
{ FDF_5_1200 },
@@ -170,13 +152,17 @@ static struct fd_type fd_types_12m[] = {
static struct fd_type fd_types_720k[] =
{
+#ifndef PC98
{ FDF_3_720 },
+#endif
{ 0,0,0,0,0,0,0,0,0,0,0,0 }
};
static struct fd_type fd_types_360k[] =
{
+#ifndef PC98
{ FDF_5_360 },
+#endif
{ 0,0,0,0,0,0,0,0,0,0,0,0 }
};
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r272245 - head/rescue/rescue
Author: nyan
Date: Sun Sep 28 08:59:38 2014
New Revision: 272245
URL: http://svnweb.freebsd.org/changeset/base/272245
Log:
Remove duplicate prog.
Modified:
head/rescue/rescue/Makefile
Modified: head/rescue/rescue/Makefile
==
--- head/rescue/rescue/Makefile Sun Sep 28 08:57:07 2014(r272244)
+++ head/rescue/rescue/Makefile Sun Sep 28 08:59:38 2014(r272245)
@@ -137,7 +137,6 @@ CRUNCH_ALIAS_bsdlabel= disklabel
.endif
.if ${MACHINE} == "pc98"
-CRUNCH_PROGS_sbin+= bsdlabel
CRUNCH_SRCDIR_fdisk= $(.CURDIR)/../../sbin/fdisk_pc98
.endif
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r272243 - head/sbin/fdisk_pc98
Author: nyan
Date: Sun Sep 28 08:23:26 2014
New Revision: 272243
URL: http://svnweb.freebsd.org/changeset/base/272243
Log:
Merged from r183296.
Add missing library dependencies.
Modified:
head/sbin/fdisk_pc98/Makefile
Modified: head/sbin/fdisk_pc98/Makefile
==
--- head/sbin/fdisk_pc98/Makefile Sun Sep 28 07:43:38 2014
(r272242)
+++ head/sbin/fdisk_pc98/Makefile Sun Sep 28 08:23:26 2014
(r272243)
@@ -7,7 +7,7 @@ MAN=fdisk.8
.PATH: ${.CURDIR}/../../sys/geom
-DPADD += ${LIBGEOM}
-LDADD += -lgeom
+DPADD+=${LIBGEOM} ${LIBBSDXML} ${LIBSBUF}
+LDADD+=-lgeom -lbsdxml -lsbuf
.include
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r270516 - head/sys/dev/drm2/i915
In article "Bjoern A. Zeeb" writes: >> i915 driver - enable opregion handle; program CADL. > > This broke pc98: > > @/contrib/dev/acpica/include/platform/acfreebsd.h:75:10: fatal error: > 'machine/acpica_machdep.h' file not found The devices supported by drm2 don't work for pc98 so we can disable simply building the module on pc98. --- TAKAHASHI Yoshihiro ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r270229 - head/share/vt/keymaps
In article <201408201700.s7kh0lrh005...@svn.freebsd.org> Stefan Esser writes: > Log: > Another rpund of fixes, after checking keymaps for plausibility and with > several updates to the converter tools. There is now support for hybrid > source keymaps, which e.g. use ISO8859-1 (not -15) but still provide an > Euro key (on the "E" key). ISO8859-1 currency symbols on other keys are > still converted to that character, not the Euro sign. A similar hack was > applied to the Japanese keyboards to add the Yen key, that could not be > expressed in SYSCONS. PC98 keyboards don't have a backslash key, so we use the Yen key instead. Please back it out of pc98 part. --- TAKAHASHI Yoshihiro ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r264687 - head/sys/pc98/pc98
Author: nyan Date: Sun Apr 20 05:40:13 2014 New Revision: 264687 URL: http://svnweb.freebsd.org/changeset/base/264687 Log: MFi386: r257858 (by kib) Fix signal delivery for the iBCS2 binaries. Modified: head/sys/pc98/pc98/machdep.c Modified: head/sys/pc98/pc98/machdep.c == --- head/sys/pc98/pc98/machdep.cSun Apr 20 03:27:38 2014 (r264686) +++ head/sys/pc98/pc98/machdep.cSun Apr 20 05:40:13 2014 (r264687) @@ -694,6 +694,8 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, regs->tf_esp = (int)sfp; regs->tf_eip = p->p_sysent->sv_sigcode_base; + if (regs->tf_eip == 0) + regs->tf_eip = p->p_sysent->sv_psstrings - szsigcode; regs->tf_eflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucodesel; regs->tf_ds = _udatasel; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r261492 - head/sys/conf
In article <201402041824.s14ioqpu093...@svn.freebsd.org> Warner Losh writes: > Author: imp > Date: Tue Feb 4 18:24:25 2014 > New Revision: 261492 > URL: http://svnweb.freebsd.org/changeset/base/261492 > > Log: > Bump the version of config to the latest (3 year old, so upgrade > worries are long past). Also remove redundant MACHINE= declarations > and passing MACHINE/MACHINE_ARCH to module builds. That's now done in > common code. This broke cross-building with legacy method. See: http://svnweb.freebsd.org/base?view=revision&revision=69817 --- TAKAHASHI Yoshihiro ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257329 - head
Author: nyan
Date: Tue Oct 29 12:34:11 2013
New Revision: 257329
URL: http://svnweb.freebsd.org/changeset/base/257329
Log:
Fix build. Both clang and gcc are required on pc98.
X-MFC with: r256915
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Tue Oct 29 12:25:22 2013(r257328)
+++ head/Makefile.inc1 Tue Oct 29 12:34:11 2013(r257329)
@@ -1388,12 +1388,17 @@ _binutils= gnu/usr.bin/binutils
# If an full path to an external cross compiler is given, don't build
# a cross compiler.
.if ${XCC:M/*} == "" && ${MK_CROSS_COMPILER} != "no"
-.if (${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang") && ${TARGET} !=
"pc98"
+.if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang"
_clang=usr.bin/clang
_clang_libs= lib/clang
.else
_cc= gnu/usr.bin/cc
.endif
+
+# The boot2 for pc98 requires gcc.
+.if ${TARGET} == "pc98"
+_cc= gnu/usr.bin/cc
+.endif
.endif
cross-tools: .MAKE
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r251223 - head/sys/boot/pc98/libpc98
Author: nyan
Date: Sat Jun 1 12:27:48 2013
New Revision: 251223
URL: http://svnweb.freebsd.org/changeset/base/251223
Log:
MFi386: revision 245848
Always update the hw.uart.console hint.
Modified:
head/sys/boot/pc98/libpc98/comconsole.c
Modified: head/sys/boot/pc98/libpc98/comconsole.c
==
--- head/sys/boot/pc98/libpc98/comconsole.c Sat Jun 1 12:21:59 2013
(r251222)
+++ head/sys/boot/pc98/libpc98/comconsole.c Sat Jun 1 12:27:48 2013
(r251223)
@@ -50,7 +50,6 @@ static intcomc_init(int arg);
static voidcomc_putchar(int c);
static int comc_getchar(void);
static int comc_getspeed(void);
-static voidset_hw_console_hint(void);
static int comc_ischar(void);
static int comc_parseint(const char *string);
static uint32_t comc_parse_pcidev(const char *string);
@@ -202,27 +201,14 @@ comc_port_set(struct env_var *ev, int fl
}
if ((comconsole.c_flags & (C_ACTIVEIN | C_ACTIVEOUT)) != 0 &&
- comc_port != port) {
+ comc_port != port)
comc_setup(comc_curspeed, port);
- set_hw_console_hint();
-}
env_setenv(ev->ev_name, flags | EV_NOHOOK, value, NULL, NULL);
return (CMD_OK);
}
-static void
-set_hw_console_hint(void)
-{
- char intbuf[64];
-
- unsetenv("hw.uart.console");
- sprintf(intbuf, "io:%d,br:%d", comc_port, comc_curspeed);
- env_setenv("hw.uart.console", EV_VOLATILE, intbuf,
- env_noset, env_nounset);
-}
-
/*
* Input: bus:dev:func[:bar]. If bar is not specified, it is 0x10.
* Output: bar[24:16] bus[15:8] dev[7:3] func[2:0]
@@ -288,7 +274,6 @@ comc_pcidev_handle(uint32_t locator)
comc_port_set, env_nounset);
comc_setup(comc_curspeed, port);
- set_hw_console_hint();
comc_locator = locator;
return (CMD_OK);
@@ -318,8 +303,10 @@ static void
comc_setup(int speed, int port)
{
static int TRY_COUNT = 100;
+char intbuf[64];
int tries;
+unsetenv("hw.uart.console");
comc_curspeed = speed;
comc_port = port;
@@ -334,9 +321,11 @@ comc_setup(int speed, int port)
inb(comc_port + com_data);
while (inb(comc_port + com_lsr) & LSR_RXRDY && ++tries < TRY_COUNT);
-if (tries < TRY_COUNT)
+if (tries < TRY_COUNT) {
comconsole.c_flags |= (C_PRESENTIN | C_PRESENTOUT);
-else
+ sprintf(intbuf, "io:%d,br:%d", comc_port, comc_curspeed);
+ env_setenv("hw.uart.console", EV_VOLATILE, intbuf, NULL, NULL);
+} else
comconsole.c_flags &= ~(C_PRESENTIN | C_PRESENTOUT);
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r251222 - head/sys/pc98/pc98
Author: nyan Date: Sat Jun 1 12:21:59 2013 New Revision: 251222 URL: http://svnweb.freebsd.org/changeset/base/251222 Log: MFi386: revision 251039 Use slightly more idiomatic expression to get the address of array. Modified: head/sys/pc98/pc98/machdep.c Modified: head/sys/pc98/pc98/machdep.c == --- head/sys/pc98/pc98/machdep.cSat Jun 1 11:42:47 2013 (r251221) +++ head/sys/pc98/pc98/machdep.cSat Jun 1 12:21:59 2013 (r251222) @@ -2789,7 +2789,7 @@ get_fpcontext(struct thread *td, mcontex bzero(mcp->mc_fpstate, sizeof(mcp->mc_fpstate)); #else mcp->mc_ownedfp = npxgetregs(td); - bcopy(&td->td_pcb->pcb_user_save, &mcp->mc_fpstate, + bcopy(&td->td_pcb->pcb_user_save, &mcp->mc_fpstate[0], sizeof(mcp->mc_fpstate)); mcp->mc_fpformat = npxformat(); #endif ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r249765 - in head/sys: dev/uart modules/uart
Author: nyan
Date: Mon Apr 22 13:02:41 2013
New Revision: 249765
URL: http://svnweb.freebsd.org/changeset/base/249765
Log:
Build uart_dev_lpc.c on arm only. This fixes pc98 build.
Modified:
head/sys/dev/uart/uart_subr.c
head/sys/modules/uart/Makefile
Modified: head/sys/dev/uart/uart_subr.c
==
--- head/sys/dev/uart/uart_subr.c Mon Apr 22 09:18:50 2013
(r249764)
+++ head/sys/dev/uart/uart_subr.c Mon Apr 22 13:02:41 2013
(r249765)
@@ -52,7 +52,9 @@ static struct uart_class *uart_classes[]
&uart_ns8250_class,
&uart_sab82532_class,
&uart_z8530_class,
+#if defined(__arm__)
&uart_lpc_class,
+#endif
};
static size_t uart_nclasses = sizeof(uart_classes) / sizeof(uart_classes[0]);
Modified: head/sys/modules/uart/Makefile
==
--- head/sys/modules/uart/Makefile Mon Apr 22 09:18:50 2013
(r249764)
+++ head/sys/modules/uart/Makefile Mon Apr 22 13:02:41 2013
(r249765)
@@ -6,6 +6,10 @@
uart_bus_ebus= uart_bus_ebus.c
.endif
+.if ${MACHINE_CPUARCH} == "arm"
+uart_dev_lpc= uart_dev_lpc.c
+.endif
+
.if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "sparc64"
ofw_bus_if=ofw_bus_if.h
.endif
@@ -23,7 +27,7 @@ KMOD= uart
SRCS= uart_bus_acpi.c ${uart_bus_ebus} uart_bus_isa.c uart_bus_pccard.c \
uart_bus_pci.c uart_bus_puc.c uart_bus_scc.c \
uart_core.c ${uart_cpu_machine} uart_dbg.c \
- uart_dev_lpc.c uart_dev_ns8250.c uart_dev_quicc.c uart_dev_sab82532.c \
+ ${uart_dev_lpc} uart_dev_ns8250.c uart_dev_quicc.c uart_dev_sab82532.c \
uart_dev_z8530.c \
uart_if.c uart_if.h uart_subr.c uart_tty.c
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r245035 - head/sys/pc98/conf
In article <201301040952.r049q9ix000...@svn.freebsd.org> Takahashi Yoshihiro writes: > Author: nyan > Date: Fri Jan 4 09:52:09 2013 > New Revision: 245035 > URL: http://svnweb.freebsd.org/changeset/base/245035 > > Log: > MFi386: r232521 > > Exclude USB drivers (except umass and ukbd) from main kernel image. It is also merging r244992 completely that removes the firewire drivers. --- TAKAHASHI Yoshihiro ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r245035 - head/sys/pc98/conf
Author: nyan Date: Fri Jan 4 09:52:09 2013 New Revision: 245035 URL: http://svnweb.freebsd.org/changeset/base/245035 Log: MFi386: r232521 Exclude USB drivers (except umass and ukbd) from main kernel image. Modified: head/sys/pc98/conf/GENERIC Modified: head/sys/pc98/conf/GENERIC == --- head/sys/pc98/conf/GENERIC Fri Jan 4 09:15:59 2013(r245034) +++ head/sys/pc98/conf/GENERIC Fri Jan 4 09:52:09 2013(r245035) @@ -238,44 +238,11 @@ devicebpf # Berkeley packet filter #deviceohci# OHCI PCI->USB interface #deviceehci# EHCI PCI->USB interface (USB 2.0) #deviceusb # USB Bus (required) -#deviceudbp# USB Double Bulk Pipe devices (needs netgraph) -#deviceuhid# "Human Interface Devices" #deviceukbd# Keyboard -#deviceulpt# Printer #deviceumass # Disks/Mass storage - Requires scbus and da -#deviceums # Mouse -#deviceurio# Diamond Rio 500 MP3 player -# USB Serial devices -#deviceuark# Technologies ARK3116 based serial adapters -#deviceubsa# Belkin F5U103 and compatible serial adapters -#deviceubser # BWCT console serial adapters -#deviceuftdi # For FTDI usb serial adapters -#deviceuipaq # Some WinCE based devices -#deviceuplcom # Prolific PL-2303 serial adapters -#deviceuslcom # SI Labs CP2101/CP2102 serial adapters -#deviceuvisor # Visor and Palm devices -#deviceuvscom # USB serial support for DDI pocket's PHS -# USB Ethernet, requires miibus -#deviceaue # ADMtek USB Ethernet -#deviceaxe # ASIX Electronics USB Ethernet -#devicecdce# Generic USB over Ethernet -#devicecue # CATC USB Ethernet -#devicekue # Kawasaki LSI USB Ethernet -#devicerue # RealTek RTL8150 USB Ethernet -#deviceudav# Davicom DM9601E USB -# USB Wireless -#devicerum # Ralink Technology RT2501USB wireless NICs -#deviceuath# Atheros AR5523 wireless NICs -#deviceural# Ralink Technology RT2500USB wireless NICs -#devicezyd # ZyDAS zd1211/zd1211b wireless NICs - -# FireWire support -#devicesbp # SCSI over FireWire (Requires scbus and da) -#devicefwe # Ethernet over FireWire (non-standard!) # Sound support #devicesound # Generic sound driver (required) #devicesnd_mss # Microsoft Sound System #device"snd_sb16" # Sound Blaster 16 #devicesnd_sbc # Sound Blaster -#devicesnd_uaudio # USB Audio ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r242871 - in head/sys/dev: ct snc
Author: nyan
Date: Sat Nov 10 14:58:06 2012
New Revision: 242871
URL: http://svnweb.freebsd.org/changeset/base/242871
Log:
Use ANSI prototype to fix build with clang.
MFC after:1 week
Modified:
head/sys/dev/ct/bshw_machdep.c
head/sys/dev/ct/ct.c
head/sys/dev/ct/ct_isa.c
head/sys/dev/ct/ct_machdep.h
head/sys/dev/snc/dp83932.c
head/sys/dev/snc/dp83932subr.c
head/sys/dev/snc/if_snc.c
head/sys/dev/snc/if_snc_cbus.c
Modified: head/sys/dev/ct/bshw_machdep.c
==
--- head/sys/dev/ct/bshw_machdep.c Sat Nov 10 14:56:35 2012
(r242870)
+++ head/sys/dev/ct/bshw_machdep.c Sat Nov 10 14:58:06 2012
(r242871)
@@ -78,9 +78,7 @@ typedef unsigned long vaddr_t;
* GENERIC MACHDEP FUNCTIONS
*/
void
-bshw_synch_setup(ct, ti)
- struct ct_softc *ct;
- struct targ_info *ti;
+bshw_synch_setup(struct ct_softc *ct, struct targ_info *ti)
{
struct ct_bus_access_handle *chp = &ct->sc_ch;
struct ct_targ_info *cti = (void *) ti;
@@ -99,8 +97,7 @@ bshw_synch_setup(ct, ti)
}
void
-bshw_bus_reset(ct)
- struct ct_softc *ct;
+bshw_bus_reset(struct ct_softc *ct)
{
struct scsi_low_softc *slp = &ct->sc_sclow;
struct ct_bus_access_handle *chp = &ct->sc_ch;
@@ -149,9 +146,7 @@ bshw_bus_reset(ct)
/* probe */
int
-bshw_read_settings(chp, bs)
- struct ct_bus_access_handle *chp;
- struct bshw_softc *bs;
+bshw_read_settings(struct ct_bus_access_handle *chp, struct bshw_softc *bs)
{
static int irq_tbl[] = { 3, 5, 6, 9, 12, 13 };
@@ -183,8 +178,7 @@ static __inline void bshw_lc_smit_stop(s
static int bshw_lc_smit_fstat(struct ct_softc *, int, int);
static __inline void
-bshw_lc_smit_stop(ct)
- struct ct_softc *ct;
+bshw_lc_smit_stop(struct ct_softc *ct)
{
struct ct_bus_access_handle *chp = &ct->sc_ch;
@@ -193,10 +187,7 @@ bshw_lc_smit_stop(ct)
}
static __inline void
-bshw_lc_smit_start(ct, count, direction)
- struct ct_softc *ct;
- int count;
- u_int direction;
+bshw_lc_smit_start(struct ct_softc *ct, int count, u_int direction)
{
struct ct_bus_access_handle *chp = &ct->sc_ch;
u_int8_t pval, val;
@@ -212,9 +203,7 @@ bshw_lc_smit_start(ct, count, direction)
}
static int
-bshw_lc_smit_fstat(ct, wc, read)
- struct ct_softc *ct;
- int wc, read;
+bshw_lc_smit_fstat(struct ct_softc *ct, int wc, int read)
{
struct ct_bus_access_handle *chp = &ct->sc_ch;
u_int8_t stat;
@@ -244,8 +233,7 @@ bshw_lc_smit_fstat(ct, wc, read)
}
void
-bshw_smit_xfer_stop(ct)
- struct ct_softc *ct;
+bshw_smit_xfer_stop(struct ct_softc *ct)
{
struct scsi_low_softc *slp = &ct->sc_sclow;
struct bshw_softc *bs = ct->ct_hw;
@@ -292,8 +280,7 @@ bad:
}
int
-bshw_smit_xfer_start(ct)
- struct ct_softc *ct;
+bshw_smit_xfer_start(struct ct_softc *ct)
{
struct scsi_low_softc *slp = &ct->sc_sclow;
struct ct_bus_access_handle *chp = &ct->sc_ch;
@@ -396,8 +383,7 @@ static void bshw_dmastart(struct ct_soft
static void bshw_dmadone(struct ct_softc *);
int
-bshw_dma_xfer_start(ct)
- struct ct_softc *ct;
+bshw_dma_xfer_start(struct ct_softc *ct)
{
struct scsi_low_softc *slp = &ct->sc_sclow;
struct sc_p *sp = &slp->sl_scp;
@@ -458,8 +444,7 @@ bshw_dma_xfer_start(ct)
}
void
-bshw_dma_xfer_stop(ct)
- struct ct_softc *ct;
+bshw_dma_xfer_stop(struct ct_softc *ct)
{
struct scsi_low_softc *slp = &ct->sc_sclow;
struct sc_p *sp = &slp->sl_scp;
@@ -523,10 +508,8 @@ bshw_dma_xfer_stop(ct)
static bus_addr_t dmapageport[4] = { 0x27, 0x21, 0x23, 0x25 };
static __inline void
-bshw_dma_write_1(chp, port, val)
- struct ct_bus_access_handle *chp;
- bus_addr_t port;
- u_int8_t val;
+bshw_dma_write_1(struct ct_bus_access_handle *chp, bus_addr_t port,
+u_int8_t val)
{
CT_BUS_WEIGHT(chp);
@@ -534,8 +517,7 @@ bshw_dma_write_1(chp, port, val)
}
static void
-bshw_dmastart(ct)
- struct ct_softc *ct;
+bshw_dmastart(struct ct_softc *ct)
{
struct scsi_low_softc *slp = &ct->sc_sclow;
struct bshw_softc *bs = ct->ct_hw;
@@ -581,8 +563,7 @@ bshw_dmastart(ct)
}
static void
-bshw_dmadone(ct)
- struct ct_softc *ct;
+bshw_dmadone(struct ct_softc *ct)
{
struct bshw_softc *bs = ct->ct_hw;
struct ct_bus_access_handle *chp = &ct->sc_ch;
@@ -609,8 +590,7 @@ static void bshw_dma_start_elecom(struct
static void bshw_dma_stop_elecom(struct ct_softc *);
static int
-bshw_dma_init_texa(ct)
- struct ct_softc *ct;
+bshw_dma_init_texa(struct ct_softc *ct)
{
struct ct_bus_access_handle *chp = &ct->sc_ch;
u_int8_t regval;
@@ -625,8 +605,7 @@ bshw_dma_init_texa(ct)
}
static int
-bshw_dma_init_sc98(ct)
- struct ct_softc *ct;
+bshw_dma_init_sc98(struct ct_softc
svn commit: r242870 - head/sys/conf
Author: nyan
Date: Sat Nov 10 14:56:35 2012
New Revision: 242870
URL: http://svnweb.freebsd.org/changeset/base/242870
Log:
MFi386: r232263
Fix build mpboot.s with clang.
Modified:
head/sys/conf/Makefile.pc98
Modified: head/sys/conf/Makefile.pc98
==
--- head/sys/conf/Makefile.pc98 Sat Nov 10 13:48:41 2012(r242869)
+++ head/sys/conf/Makefile.pc98 Sat Nov 10 14:56:35 2012(r242870)
@@ -34,6 +34,10 @@ MACHINE=pc98
MKMODULESENV+= MACHINE=${MACHINE}
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+ASM_CFLAGS.mpboot.s= ${CLANG_NO_IAS}
+ASM_CFLAGS+= ${ASM_CFLAGS.${.IMPSRC:T}}
+
%BEFORE_DEPEND
%OBJS
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r242869 - head/sys/pc98/pc98
Author: nyan Date: Sat Nov 10 13:48:41 2012 New Revision: 242869 URL: http://svnweb.freebsd.org/changeset/base/242869 Log: Reduce diffs against i386. Modified: head/sys/pc98/pc98/machdep.c Modified: head/sys/pc98/pc98/machdep.c == --- head/sys/pc98/pc98/machdep.cSat Nov 10 13:41:25 2012 (r242868) +++ head/sys/pc98/pc98/machdep.cSat Nov 10 13:48:41 2012 (r242869) @@ -1237,7 +1237,7 @@ cpu_idle(int busy) CTR2(KTR_SPARE2, "cpu_idle(%d) at %d", busy, curcpu); -#ifdef MP_WATCHDOG +#if defined(MP_WATCHDOG) ap_watchdog(PCPU_GET(cpuid)); #endif /* If we are busy - try to use fast methods. */ @@ -2157,6 +2157,8 @@ do_next: for (off = 0; off < round_page(msgbufsize); off += PAGE_SIZE) pmap_kenter((vm_offset_t)msgbufp + off, phys_avail[pa_indx] + off); + + PT_UPDATES_FLUSH(); } void ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r242868 - head/sys/pc98/pc98
Author: nyan
Date: Sat Nov 10 13:41:25 2012
New Revision: 242868
URL: http://svnweb.freebsd.org/changeset/base/242868
Log:
Fix some KASSERTs.
They are missing changes from r208833, r227394 and r227442.
Modified:
head/sys/pc98/pc98/machdep.c
Modified: head/sys/pc98/pc98/machdep.c
==
--- head/sys/pc98/pc98/machdep.cSat Nov 10 13:25:46 2012
(r242867)
+++ head/sys/pc98/pc98/machdep.cSat Nov 10 13:41:25 2012
(r242868)
@@ -2652,7 +2652,8 @@ int
fill_fpregs(struct thread *td, struct fpreg *fpregs)
{
- KASSERT(td == curthread || TD_IS_SUSPENDED(td),
+ KASSERT(td == curthread || TD_IS_SUSPENDED(td) ||
+ P_SHOULDSTOP(td->td_proc),
("not suspended thread %p", td));
#ifdef DEV_NPX
npxgetregs(td);
@@ -2821,6 +2822,7 @@ static void
fpstate_drop(struct thread *td)
{
+ KASSERT(PCB_USER_FPU(td->td_pcb), ("fpstate_drop: kernel-owned fpu"));
critical_enter();
#ifdef DEV_NPX
if (PCPU_GET(fpcurthread) == td)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r242867 - head/sys/pc98/pc98
Author: nyan
Date: Sat Nov 10 13:25:46 2012
New Revision: 242867
URL: http://svnweb.freebsd.org/changeset/base/242867
Log:
MFi386: r211924
Register an interrupt vector for DTrace return probes.
Modified:
head/sys/pc98/pc98/machdep.c
Modified: head/sys/pc98/pc98/machdep.c
==
--- head/sys/pc98/pc98/machdep.cSat Nov 10 13:24:33 2012
(r242866)
+++ head/sys/pc98/pc98/machdep.cSat Nov 10 13:25:46 2012
(r242867)
@@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
#include "opt_mp_watchdog.h"
#include "opt_npx.h"
#include "opt_perfmon.h"
+#include "opt_kdtrace.h"
#include
#include
@@ -1772,7 +1773,11 @@ extern inthand_t
IDTVEC(bnd), IDTVEC(ill), IDTVEC(dna), IDTVEC(fpusegm),
IDTVEC(tss), IDTVEC(missing), IDTVEC(stk), IDTVEC(prot),
IDTVEC(page), IDTVEC(mchk), IDTVEC(rsvd), IDTVEC(fpu), IDTVEC(align),
- IDTVEC(xmm), IDTVEC(lcall_syscall), IDTVEC(int0x80_syscall);
+ IDTVEC(xmm),
+#ifdef KDTRACE_HOOKS
+ IDTVEC(dtrace_ret),
+#endif
+ IDTVEC(lcall_syscall), IDTVEC(int0x80_syscall);
#ifdef DDB
/*
@@ -2291,6 +2296,10 @@ init386(first)
GSEL(GCODE_SEL, SEL_KPL));
setidt(IDT_SYSCALL, &IDTVEC(int0x80_syscall), SDT_SYS386TGT, SEL_UPL,
GSEL(GCODE_SEL, SEL_KPL));
+#ifdef KDTRACE_HOOKS
+ setidt(IDT_DTRACE_RET, &IDTVEC(dtrace_ret), SDT_SYS386TGT, SEL_UPL,
+ GSEL(GCODE_SEL, SEL_KPL));
+#endif
r_idt.rd_limit = sizeof(idt0) - 1;
r_idt.rd_base = (int) idt;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r242866 - head/sys/pc98/include
Author: nyan
Date: Sat Nov 10 13:24:33 2012
New Revision: 242866
URL: http://svnweb.freebsd.org/changeset/base/242866
Log:
Use ANSI prototype to fix build with clang.
MFC after:1 week
Modified:
head/sys/pc98/include/bus.h
Modified: head/sys/pc98/include/bus.h
==
--- head/sys/pc98/include/bus.h Sat Nov 10 12:42:28 2012(r242865)
+++ head/sys/pc98/include/bus.h Sat Nov 10 13:24:33 2012(r242866)
@@ -317,24 +317,22 @@ _BUS_ACCESS_METHODS_PROTO(u_int32_t,4)
/*
* read methods
*/
-#define_BUS_SPACE_READ(TYPE,BWN) \
-static __inline TYPE \
-bus_space_read_##BWN (tag, bsh, offset)\
- bus_space_tag_t tag;\
- bus_space_handle_t bsh; \
- bus_size_t offset; \
-{ \
- register TYPE result; \
- \
- __asm __volatile("call *%2" \
- :"=a" (result), \
-"=d" (offset) \
- :"o" (bsh->bsh_bam.bs_read_##BWN), \
-"b" (bsh), \
-"1" (offset) \
- ); \
- \
- return result; \
+#define_BUS_SPACE_READ(TYPE,BWN)
\
+static __inline TYPE \
+bus_space_read_##BWN (bus_space_tag_t tag, bus_space_handle_t bsh, \
+ bus_size_t offset) \
+{ \
+ register TYPE result; \
+ \
+ __asm __volatile("call *%2" \
+ :"=a" (result), \
+"=d" (offset) \
+ :"o" (bsh->bsh_bam.bs_read_##BWN), \
+"b" (bsh), \
+"1" (offset) \
+ ); \
+ \
+ return result; \
}
_BUS_SPACE_READ(u_int8_t,1)
@@ -344,22 +342,19 @@ _BUS_SPACE_READ(u_int32_t,4)
/*
* write methods
*/
-#define_BUS_SPACE_WRITE(TYPE,BWN) \
-static __inline void \
-bus_space_write_##BWN (tag, bsh, offset, val) \
- bus_space_tag_t tag;\
- bus_space_handle_t bsh; \
- bus_size_t offset; \
- TYPE val; \
-{ \
- \
- __asm __volatile("call *%1" \
- :"=d" (offset) \
- :"o" (bsh->bsh_bam.bs_write_##BWN), \
-"a" (val), \
-"b" (bsh), \
-"0" (offset) \
- ); \
+#define_BUS_SPACE_WRITE(TYPE,BWN)
\
+static __inline void \
+bus_space_write_##BWN (bus_space_tag_t tag, bus_space_handle_t bsh,\
+ bus_size_t offset, TYPE val) \
+{ \
+ \
+ __asm __volatile("call *%1" \
+ :"=d" (offset) \
+ :"o" (bsh->bsh_bam.bs_write_##BWN), \
+"a" (val), \
+"b" (bsh), \
+
svn commit: r242865 - head/sys/boot/pc98
Author: nyan Date: Sat Nov 10 12:42:28 2012 New Revision: 242865 URL: http://svnweb.freebsd.org/changeset/base/242865 Log: cosmetic changes to reduce diffs against i386. Modified: head/sys/boot/pc98/Makefile.inc Modified: head/sys/boot/pc98/Makefile.inc == --- head/sys/boot/pc98/Makefile.inc Sat Nov 10 12:38:06 2012 (r242864) +++ head/sys/boot/pc98/Makefile.inc Sat Nov 10 12:42:28 2012 (r242865) @@ -6,8 +6,8 @@ BINDIR?=/boot LOADER_ADDRESS?=0x20 CFLAGS+= -march=i386 -ffreestanding -mpreferred-stack-boundary=2 \ - -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float \ - -Os -DPC98 + -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float +CFLAGS+= -Os -DPC98 LDFLAGS+= -nostdlib # BTX components ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r242864 - head/sys/boot/pc98/libpc98
Author: nyan
Date: Sat Nov 10 12:38:06 2012
New Revision: 242864
URL: http://svnweb.freebsd.org/changeset/base/242864
Log:
MFi386: r241300
i386 comconsole: don't loop forever if hardware doesn't respond
- clear capability flags when hw timeouts
- retire comc_started status variable and directly use c_flags to see
if comconsole is selected for use
Modified:
head/sys/boot/pc98/libpc98/comconsole.c
Modified: head/sys/boot/pc98/libpc98/comconsole.c
==
--- head/sys/boot/pc98/libpc98/comconsole.c Sat Nov 10 12:25:27 2012
(r242863)
+++ head/sys/boot/pc98/libpc98/comconsole.c Sat Nov 10 12:38:06 2012
(r242864)
@@ -63,7 +63,6 @@ static void comc_setup(int speed, int po
static int comc_speed_set(struct env_var *ev, int flags,
const void *value);
-static int comc_started;
static int comc_curspeed;
static int comc_port = COMPORT;
static uint32_tcomc_locator;
@@ -87,9 +86,6 @@ comc_probe(struct console *cp)
int speed, port;
uint32_t locator;
-/* XXX check the BIOS equipment list? */
-cp->c_flags |= (C_PRESENTIN | C_PRESENTOUT);
-
if (comc_curspeed == 0) {
comc_curspeed = COMSPEED;
/*
@@ -137,18 +133,19 @@ comc_probe(struct console *cp)
env_setenv("comconsole_pcidev", EV_VOLATILE, env, comc_pcidev_set,
env_nounset);
}
+comc_setup(comc_curspeed, comc_port);
}
static int
comc_init(int arg)
{
-if (comc_started && arg == 0)
- return 0;
-comc_started = 1;
comc_setup(comc_curspeed, comc_port);
-return(0);
+if ((comconsole.c_flags & (C_PRESENTIN | C_PRESENTOUT)) ==
+ (C_PRESENTIN | C_PRESENTOUT))
+ return (CMD_OK);
+return (CMD_ERROR);
}
static void
@@ -166,13 +163,13 @@ comc_putchar(int c)
static int
comc_getchar(void)
{
-return(comc_ischar() ? inb(comc_port + com_data) : -1);
+return (comc_ischar() ? inb(comc_port + com_data) : -1);
}
static int
comc_ischar(void)
{
-return(inb(comc_port + com_lsr) & LSR_RXRDY);
+return (inb(comc_port + com_lsr) & LSR_RXRDY);
}
static int
@@ -185,7 +182,8 @@ comc_speed_set(struct env_var *ev, int f
return (CMD_ERROR);
}
-if (comc_started && comc_curspeed != speed)
+if ((comconsole.c_flags & (C_ACTIVEIN | C_ACTIVEOUT)) != 0 &&
+ comc_curspeed != speed)
comc_setup(speed, comc_port);
env_setenv(ev->ev_name, flags | EV_NOHOOK, value, NULL, NULL);
@@ -203,7 +201,8 @@ comc_port_set(struct env_var *ev, int fl
return (CMD_ERROR);
}
-if (comc_started && comc_port != port) {
+if ((comconsole.c_flags & (C_ACTIVEIN | C_ACTIVEOUT)) != 0 &&
+ comc_port != port) {
comc_setup(comc_curspeed, port);
set_hw_console_hint();
}
@@ -305,7 +304,8 @@ comc_pcidev_set(struct env_var *ev, int
printf("Invalid pcidev\n");
return (CMD_ERROR);
}
- if (comc_started && comc_locator != locator) {
+ if ((comconsole.c_flags & (C_ACTIVEIN | C_ACTIVEOUT)) != 0 &&
+ comc_locator != locator) {
error = comc_pcidev_handle(locator);
if (error != CMD_OK)
return (error);
@@ -317,6 +317,8 @@ comc_pcidev_set(struct env_var *ev, int
static void
comc_setup(int speed, int port)
{
+static int TRY_COUNT = 100;
+int tries;
comc_curspeed = speed;
comc_port = port;
@@ -327,9 +329,15 @@ comc_setup(int speed, int port)
outb(comc_port + com_cfcr, COMC_FMT);
outb(comc_port + com_mcr, MCR_RTS | MCR_DTR);
+tries = 0;
do
inb(comc_port + com_data);
-while (inb(comc_port + com_lsr) & LSR_RXRDY);
+while (inb(comc_port + com_lsr) & LSR_RXRDY && ++tries < TRY_COUNT);
+
+if (tries < TRY_COUNT)
+ comconsole.c_flags |= (C_PRESENTIN | C_PRESENTOUT);
+else
+ comconsole.c_flags &= ~(C_PRESENTIN | C_PRESENTOUT);
}
static int
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r242863 - in head/sys/boot/pc98: boot2 btx/btx
Author: nyan
Date: Sat Nov 10 12:25:27 2012
New Revision: 242863
URL: http://svnweb.freebsd.org/changeset/base/242863
Log:
MFi386: r241301
add detection of serial console presence to btx and boot2-like blocks
Modified:
head/sys/boot/pc98/boot2/boot2.c
head/sys/boot/pc98/btx/btx/btx.S
Modified: head/sys/boot/pc98/boot2/boot2.c
==
--- head/sys/boot/pc98/boot2/boot2.cSat Nov 10 12:22:26 2012
(r242862)
+++ head/sys/boot/pc98/boot2/boot2.cSat Nov 10 12:25:27 2012
(r242863)
@@ -554,8 +554,10 @@ parse()
}
ioctrl = OPT_CHECK(RBX_DUAL) ? (IO_SERIAL|IO_KEYBOARD) :
OPT_CHECK(RBX_SERIAL) ? IO_SERIAL : IO_KEYBOARD;
- if (ioctrl & IO_SERIAL)
- sio_init(115200 / comspeed);
+ if (ioctrl & IO_SERIAL) {
+ if (sio_init(115200 / comspeed) != 0)
+ ioctrl &= ~IO_SERIAL;
+ }
} else {
for (q = arg--; *q && *q != '('; q++);
if (*q) {
Modified: head/sys/boot/pc98/btx/btx/btx.S
==
--- head/sys/boot/pc98/btx/btx/btx.SSat Nov 10 12:22:26 2012
(r242862)
+++ head/sys/boot/pc98/btx/btx/btx.SSat Nov 10 12:25:27 2012
(r242863)
@@ -840,7 +840,7 @@ putstr: lodsb # Load char
.set SIO_DIV,(115200/SIOSPD)# 115200 / SPD
/*
- * void sio_init(void)
+ * int sio_init(void)
*/
sio_init: movw $SIO_PRT+0x3,%dx # Data format reg
movb $SIO_FMT|0x80,%al # Set format
@@ -856,14 +856,19 @@ sio_init: movw $SIO_PRT+0x3,%dx # Data
movb $0x3,%al # Set RTS,
outb %al,(%dx) # DTR
incl %edx # Line status reg
+ call sio_getc.1 # Get character
/*
- * void sio_flush(void)
+ * int sio_flush(void)
*/
-sio_flush.0: call sio_getc.1 # Get character
-sio_flush: call sio_ischar # Check for character
- jnz sio_flush.0 # Till none
- ret # To caller
+sio_flush: xorl %eax,%eax # Return value
+ xorl %ecx,%ecx # Timeout
+ movb $0x80,%ch # counter
+sio_flush.1: call sio_ischar # Check for character
+ jz sio_flush.2 # Till none
+ loop sio_flush.1# or counter is zero
+ movb $1, %al# Exhausted all tries
+sio_flush.2: ret # To caller
/*
* void sio_putc(int c)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r242855 - head/sys/boot/pc98
Author: nyan Date: Sat Nov 10 11:55:52 2012 New Revision: 242855 URL: http://svnweb.freebsd.org/changeset/base/242855 Log: MFi386: r241785 boot: use -march=i386 for both i386 and amd64 builds Modified: head/sys/boot/pc98/Makefile.inc Modified: head/sys/boot/pc98/Makefile.inc == --- head/sys/boot/pc98/Makefile.inc Sat Nov 10 10:41:00 2012 (r242854) +++ head/sys/boot/pc98/Makefile.inc Sat Nov 10 11:55:52 2012 (r242855) @@ -5,7 +5,7 @@ BINDIR?= /boot LOADER_ADDRESS?=0x20 -CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 \ +CFLAGS+= -march=i386 -ffreestanding -mpreferred-stack-boundary=2 \ -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float \ -Os -DPC98 LDFLAGS+= -nostdlib ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r240855 - head/sys/pc98/pc98
Author: nyan
Date: Sun Sep 23 09:13:57 2012
New Revision: 240855
URL: http://svn.freebsd.org/changeset/base/240855
Log:
MFi386: revision 237445
Commit changes missed from r237435. Properly calculate the signal
trampoline addresses after the shared page is enabled. Handle FreeBSD
ABIs without shared page support too.
MFi386: revision 238792
Introduce curpcb magic variable.
Modified:
head/sys/pc98/pc98/machdep.c
Modified: head/sys/pc98/pc98/machdep.c
==
--- head/sys/pc98/pc98/machdep.cSun Sep 23 08:50:54 2012
(r240854)
+++ head/sys/pc98/pc98/machdep.cSun Sep 23 09:13:57 2012
(r240855)
@@ -407,7 +407,13 @@ osendsig(sig_t catcher, ksiginfo_t *ksi,
}
regs->tf_esp = (int)fp;
- regs->tf_eip = PS_STRINGS - szosigcode;
+ if (p->p_sysent->sv_sigcode_base != 0) {
+ regs->tf_eip = p->p_sysent->sv_sigcode_base + szsigcode -
+ szosigcode;
+ } else {
+ /* a.out sysentvec does not use shared page */
+ regs->tf_eip = p->p_sysent->sv_psstrings - szosigcode;
+ }
regs->tf_eflags &= ~(PSL_T | PSL_D);
regs->tf_cs = _ucodesel;
regs->tf_ds = _udatasel;
@@ -534,7 +540,8 @@ freebsd4_sendsig(sig_t catcher, ksiginfo
}
regs->tf_esp = (int)sfp;
- regs->tf_eip = PS_STRINGS - szfreebsd4_sigcode;
+ regs->tf_eip = p->p_sysent->sv_sigcode_base + szsigcode -
+ szfreebsd4_sigcode;
regs->tf_eflags &= ~(PSL_T | PSL_D);
regs->tf_cs = _ucodesel;
regs->tf_ds = _udatasel;
@@ -685,7 +692,7 @@ sendsig(sig_t catcher, ksiginfo_t *ksi,
}
regs->tf_esp = (int)sfp;
- regs->tf_eip = PS_STRINGS - *(p->p_sysent->sv_szsigcode);
+ regs->tf_eip = p->p_sysent->sv_sigcode_base;
regs->tf_eflags &= ~(PSL_T | PSL_D);
regs->tf_cs = _ucodesel;
regs->tf_ds = _udatasel;
@@ -1412,7 +1419,7 @@ exec_setregs(struct thread *td, struct i
pcb->pcb_dr3 = 0;
pcb->pcb_dr6 = 0;
pcb->pcb_dr7 = 0;
-if (pcb == PCPU_GET(curpcb)) {
+if (pcb == curpcb) {
/*
* Clear the debug registers on the running
* CPU, otherwise they will end up affecting
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r240854 - head/sys/boot/pc98/loader
Author: nyan
Date: Sun Sep 23 08:50:54 2012
New Revision: 240854
URL: http://svn.freebsd.org/changeset/base/240854
Log:
MFi386: revision 240637
loader/i386: replace ugly inb/outb re-implementations with cpufunc.h
Modified:
head/sys/boot/pc98/loader/main.c
Modified: head/sys/boot/pc98/loader/main.c
==
--- head/sys/boot/pc98/loader/main.cSun Sep 23 08:49:41 2012
(r240853)
+++ head/sys/boot/pc98/loader/main.cSun Sep 23 08:50:54 2012
(r240854)
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
@@ -307,32 +308,17 @@ command_heap(int argc, char *argv[])
return(CMD_OK);
}
-/* ISA bus access functions for PnP, derived from */
+/* ISA bus access functions for PnP. */
static int
isa_inb(int port)
{
-u_char data;
-
-if (__builtin_constant_p(port) &&
- (((port) & 0x) < 0x100) &&
- ((port) < 0x1)) {
- __asm __volatile("inb %1,%0" : "=a" (data) : "id" ((u_short)(port)));
-} else {
- __asm __volatile("inb %%dx,%0" : "=a" (data) : "d" (port));
-}
-return(data);
+
+return (inb(port));
}
static void
isa_outb(int port, int value)
{
-u_char al = value;
-
-if (__builtin_constant_p(port) &&
- (((port) & 0x) < 0x100) &&
- ((port) < 0x1)) {
- __asm __volatile("outb %0,%1" : : "a" (al), "id" ((u_short)(port)));
-} else {
-__asm __volatile("outb %0,%%dx" : : "a" (al), "d" (port));
-}
+
+outb(port, value);
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r240852 - head/sys/boot/pc98/loader
Author: nyan
Date: Sun Sep 23 08:46:44 2012
New Revision: 240852
URL: http://svn.freebsd.org/changeset/base/240852
Log:
Cosmetic changes.
Modified:
head/sys/boot/pc98/loader/main.c
Modified: head/sys/boot/pc98/loader/main.c
==
--- head/sys/boot/pc98/loader/main.cSun Sep 23 08:44:12 2012
(r240851)
+++ head/sys/boot/pc98/loader/main.cSun Sep 23 08:46:44 2012
(r240852)
@@ -207,9 +207,9 @@ main(void)
static void
extract_currdev(void)
{
-struct i386_devdescnew_currdev;
-intmajor;
-intbiosdev = -1;
+struct i386_devdescnew_currdev;
+intmajor;
+intbiosdev = -1;
/* Assume we are booting from a BIOS disk by default */
new_currdev.d_dev = &biosdisk;
@@ -255,7 +255,7 @@ extract_currdev(void)
}
}
new_currdev.d_type = new_currdev.d_dev->dv_type;
-
+
/*
* If we are booting off of a BIOS disk and we didn't succeed in
determining
* which one we booted off of, just use disk0: as a reasonable default.
@@ -266,6 +266,7 @@ extract_currdev(void)
"Guessed BIOS device 0x%x not found by probes, defaulting to
disk0:\n", biosdev);
new_currdev.d_unit = 0;
}
+
env_setenv("currdev", EV_VOLATILE, i386_fmtdev(&new_currdev),
i386_setcurrdev, env_nounset);
env_setenv("loaddev", EV_VOLATILE, i386_fmtdev(&new_currdev), env_noset,
@@ -307,7 +308,7 @@ command_heap(int argc, char *argv[])
}
/* ISA bus access functions for PnP, derived from */
-static int
+static int
isa_inb(int port)
{
u_char data;
@@ -335,4 +336,3 @@ isa_outb(int port, int value)
__asm __volatile("outb %0,%%dx" : : "a" (al), "d" (port));
}
}
-
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r239069 - in head/sys/boot/pc98: cdboot libpc98
Author: nyan
Date: Sun Aug 5 14:48:55 2012
New Revision: 239069
URL: http://svn.freebsd.org/changeset/base/239069
Log:
Reduce diffs against i386.
Modified:
head/sys/boot/pc98/cdboot/cdboot.S
head/sys/boot/pc98/libpc98/Makefile
Modified: head/sys/boot/pc98/cdboot/cdboot.S
==
--- head/sys/boot/pc98/cdboot/cdboot.S Sun Aug 5 14:48:28 2012
(r239068)
+++ head/sys/boot/pc98/cdboot/cdboot.S Sun Aug 5 14:48:55 2012
(r239069)
@@ -30,14 +30,14 @@
# $FreeBSD$
-#include
-
#
# Basically, we first create a set of boot arguments to pass to the loaded
# binary. Then we attempt to load /boot/loader from the CD we were booted
# off of.
#
+#include
+
#
# Memory locations.
#
Modified: head/sys/boot/pc98/libpc98/Makefile
==
--- head/sys/boot/pc98/libpc98/Makefile Sun Aug 5 14:48:28 2012
(r239068)
+++ head/sys/boot/pc98/libpc98/Makefile Sun Aug 5 14:48:55 2012
(r239069)
@@ -37,7 +37,8 @@ CFLAGS+= -DTERM_EMU
# XXX: make alloca() useable
CFLAGS+= -Dalloca=__builtin_alloca
-CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \
+CFLAGS+= -I${.CURDIR}/../../common \
+ -I${.CURDIR}/../btx/lib \
-I${.CURDIR}/../../i386/libi386 \
-I${.CURDIR}/../../.. -I.
# the location of libstand
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r239064 - in head/sys/boot/pc98/btx: btxldr lib
Author: nyan Date: Sun Aug 5 14:11:07 2012 New Revision: 239064 URL: http://svn.freebsd.org/changeset/base/239064 Log: Reduce diffs against i386. Modified: head/sys/boot/pc98/btx/btxldr/btxldr.S head/sys/boot/pc98/btx/lib/btxcsu.S Modified: head/sys/boot/pc98/btx/btxldr/btxldr.S == --- head/sys/boot/pc98/btx/btxldr/btxldr.S Sun Aug 5 14:05:11 2012 (r239063) +++ head/sys/boot/pc98/btx/btxldr/btxldr.S Sun Aug 5 14:11:07 2012 (r239064) @@ -15,13 +15,13 @@ * $FreeBSD$ */ +#include + /* * Prototype BTX loader program, written in a couple of hours. The * real thing should probably be more flexible, and in C. */ -#include - /* * Memory locations. */ Modified: head/sys/boot/pc98/btx/lib/btxcsu.S == --- head/sys/boot/pc98/btx/lib/btxcsu.S Sun Aug 5 14:05:11 2012 (r239063) +++ head/sys/boot/pc98/btx/lib/btxcsu.S Sun Aug 5 14:11:07 2012 (r239064) @@ -15,12 +15,12 @@ # $FreeBSD$ +#include + # # BTX C startup code (ELF). # -#include - # # Globals. # ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r239063 - head/sys/boot/pc98/boot2
Author: nyan
Date: Sun Aug 5 14:05:11 2012
New Revision: 239063
URL: http://svn.freebsd.org/changeset/base/239063
Log:
MFi386: the part of r219452 and r236405.
- bunch of variables are turned into uint8_t.
- Remove unnecessary initializations.
Modified:
head/sys/boot/pc98/boot2/boot2.c
Modified: head/sys/boot/pc98/boot2/boot2.c
==
--- head/sys/boot/pc98/boot2/boot2.cSun Aug 5 13:40:35 2012
(r239062)
+++ head/sys/boot/pc98/boot2/boot2.cSun Aug 5 14:05:11 2012
(r239063)
@@ -126,13 +126,13 @@ static struct dsk {
unsigned unit;
unsigned head;
unsigned sec;
-unsigned slice;
-unsigned part;
+uint8_t slice;
+uint8_t part;
unsigned start;
} dsk;
static char cmd[512], cmddup[512], knamebuf[1024];
-static const char *kname = NULL;
-static uint32_t opts = 0;
+static const char *kname;
+static uint32_t opts;
static int comspeed = SIOSPD;
static struct bootinfo bootinfo;
static uint8_t ioctrl = IO_KEYBOARD;
@@ -615,7 +615,8 @@ dskread(void *buf, unsigned lba, unsigne
struct pc98_partition *dp;
struct disklabel *d;
char *sec;
-unsigned sl, i;
+unsigned i;
+uint8_t sl;
u_char *p;
if (!dsk_meta) {
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r234564 - head/sys/pc98/pc98
Author: nyan Date: Sun Apr 22 04:36:25 2012 New Revision: 234564 URL: http://svn.freebsd.org/changeset/base/234564 Log: MFi386: revisions 234074 and 234105 - Adding the BSP as an interrupt target directly in cpu_startup(). Modified: head/sys/pc98/pc98/machdep.c Modified: head/sys/pc98/pc98/machdep.c == --- head/sys/pc98/pc98/machdep.cSun Apr 22 03:57:33 2012 (r234563) +++ head/sys/pc98/pc98/machdep.cSun Apr 22 04:36:25 2012 (r234564) @@ -271,6 +271,13 @@ cpu_startup(dummy) bufinit(); vm_pager_bufferinit(); cpu_setregs(); + +#ifdef SMP + /* +* Add BSP as an interrupt target. +*/ + intr_add_cpu(0); +#endif } /* ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r233031 - in head/sys: conf i386/i386 pc98/pc98 x86/isa x86/x86
Author: nyan
Date: Fri Mar 16 12:13:44 2012
New Revision: 233031
URL: http://svn.freebsd.org/changeset/base/233031
Log:
- Fix to build a native i386 kernel without the SMP and atpic.
- Merge r232744 changes to pc98.
(Allow a kernel to be built with 'nodevice atpic'.)
- Move ICU related defines from x86/isa/atpic.c to x86/isa/icu.h and
use them in x86/x86/intr_machdep.c.
Reviewed by: jhb
Modified:
head/sys/conf/files.pc98
head/sys/i386/i386/machdep.c
head/sys/pc98/pc98/machdep.c
head/sys/x86/isa/atpic.c
head/sys/x86/isa/icu.h
head/sys/x86/x86/intr_machdep.c
Modified: head/sys/conf/files.pc98
==
--- head/sys/conf/files.pc98Fri Mar 16 11:17:36 2012(r233030)
+++ head/sys/conf/files.pc98Fri Mar 16 12:13:44 2012(r233031)
@@ -226,7 +226,7 @@ pc98/cbus/gdc.c optional gdc
pc98/cbus/nmi.cstandard
pc98/cbus/olpt.c optional olpt
pc98/cbus/pckbd.c optional pckbd
-pc98/cbus/pcrtc.c optional atpic
+pc98/cbus/pcrtc.c standard
pc98/cbus/pmc.coptional pmc
pc98/cbus/scgdcrndr.c optional sc gdc
pc98/cbus/scterm-sck.c optional sc
Modified: head/sys/i386/i386/machdep.c
==
--- head/sys/i386/i386/machdep.cFri Mar 16 11:17:36 2012
(r233030)
+++ head/sys/i386/i386/machdep.cFri Mar 16 12:13:44 2012
(r233031)
@@ -40,6 +40,7 @@
#include
__FBSDID("$FreeBSD$");
+#include "opt_apic.h"
#include "opt_atalk.h"
#include "opt_atpic.h"
#include "opt_compat.h"
@@ -136,6 +137,10 @@ __FBSDID("$FreeBSD$");
#include
#endif
+#ifdef DEV_APIC
+#include
+#endif
+
#ifdef DEV_ISA
#include
#endif
Modified: head/sys/pc98/pc98/machdep.c
==
--- head/sys/pc98/pc98/machdep.cFri Mar 16 11:17:36 2012
(r233030)
+++ head/sys/pc98/pc98/machdep.cFri Mar 16 12:13:44 2012
(r233031)
@@ -40,7 +40,9 @@
#include
__FBSDID("$FreeBSD$");
+#include "opt_apic.h"
#include "opt_atalk.h"
+#include "opt_atpic.h"
#include "opt_compat.h"
#include "opt_cpu.h"
#include "opt_ddb.h"
@@ -132,6 +134,10 @@ __FBSDID("$FreeBSD$");
#include
#endif
+#ifdef DEV_APIC
+#include
+#endif
+
#ifdef DEV_ISA
#include
#endif
@@ -2296,7 +2302,21 @@ init386(first)
printf("WARNING: loader(8) metadata is missing!\n");
#ifdef DEV_ISA
+#ifdef DEV_ATPIC
atpic_startup();
+#else
+ /* Reset and mask the atpics and leave them shut down. */
+ atpic_reset();
+
+ /*
+* Point the ICU spurious interrupt vectors at the APIC spurious
+* interrupt handler.
+*/
+ setidt(IDT_IO_INTS + 7, IDTVEC(spuriousint), SDT_SYS386IGT, SEL_KPL,
+ GSEL(GCODE_SEL, SEL_KPL));
+ setidt(IDT_IO_INTS + 15, IDTVEC(spuriousint), SDT_SYS386IGT, SEL_KPL,
+ GSEL(GCODE_SEL, SEL_KPL));
+#endif
#endif
#ifdef DDB
Modified: head/sys/x86/isa/atpic.c
==
--- head/sys/x86/isa/atpic.cFri Mar 16 11:17:36 2012(r233030)
+++ head/sys/x86/isa/atpic.cFri Mar 16 12:13:44 2012(r233031)
@@ -72,48 +72,6 @@ __FBSDID("$FreeBSD$");
#defineMASTER 0
#defineSLAVE 1
-/*
- * PC-98 machines wire the slave 8259A to pin 7 on the master PIC, and
- * PC-AT machines wire the slave PIC to pin 2 on the master PIC.
- */
-#ifdef PC98
-#defineICU_SLAVEID 7
-#else
-#defineICU_SLAVEID 2
-#endif
-
-/*
- * Determine the base master and slave modes not including auto EOI support.
- * All machines that FreeBSD supports use 8086 mode.
- */
-#ifdef PC98
-/*
- * PC-98 machines do not support auto EOI on the second PIC. Also, it
- * seems that PC-98 machine PICs use buffered mode, and the master PIC
- * uses special fully nested mode.
- */
-#defineBASE_MASTER_MODE(ICW4_SFNM | ICW4_BUF | ICW4_MS |
ICW4_8086)
-#defineBASE_SLAVE_MODE (ICW4_BUF | ICW4_8086)
-#else
-#defineBASE_MASTER_MODEICW4_8086
-#defineBASE_SLAVE_MODE ICW4_8086
-#endif
-
-/* Enable automatic EOI if requested. */
-#ifdef AUTO_EOI_1
-#defineMASTER_MODE (BASE_MASTER_MODE | ICW4_AEOI)
-#else
-#defineMASTER_MODE BASE_MASTER_MODE
-#endif
-#ifdef AUTO_EOI_2
-#defineSLAVE_MODE (BASE_SLAVE_MODE | ICW4_AEOI)
-#else
-#defineSLAVE_MODE BASE_SLAVE_MODE
-#endif
-
-#defineIRQ_MASK(irq) (1 << (irq))
-#defineIMEN_MASK(ai) (IRQ_MASK((ai)->at_irq))
-
#defineNUM_ISA_IRQS16
static voidatpic_init(void *dummy);
Modified: head/sys/x86/isa/icu.h
=
Re: svn commit: r232744 - in head/sys: conf i386/i386 i386/include
In article <201203091942.q29jgmj1022...@svn.freebsd.org>
John Baldwin writes:
> Author: jhb
> Date: Fri Mar 9 19:42:48 2012
> New Revision: 232744
> URL: http://svn.freebsd.org/changeset/base/232744
>
> Log:
> Allow a native i386 kernel to be built with 'nodevice atpic'. Just as on
> amd64, if 'device isa' is present quiesce the 8259A's during boot and
> resume from suspend.
This change broke a kernel without the SMP and atpic. The attached
patch fixes the problem and includes changes for pc98.
Please review it.
---
TAKAHASHI Yoshihiro
Index: conf/files.pc98
===
RCS file: /home/ncvs/src/sys/conf/files.pc98,v
retrieving revision 1.399
diff -u -r1.399 files.pc98
--- conf/files.pc98 9 Mar 2012 20:43:29 - 1.399
+++ conf/files.pc98 10 Mar 2012 12:47:46 -
@@ -226,7 +226,7 @@
pc98/cbus/nmi.c standard
pc98/cbus/olpt.c optional olpt
pc98/cbus/pckbd.c optional pckbd
-pc98/cbus/pcrtc.c optional atpic
+pc98/cbus/pcrtc.c standard
pc98/cbus/pmc.c optional pmc
pc98/cbus/scgdcrndr.c optional sc gdc
pc98/cbus/scterm-sck.c optional sc
Index: i386/i386/machdep.c
===
RCS file: /home/ncvs/src/sys/i386/i386/machdep.c,v
retrieving revision 1.742
diff -u -r1.742 machdep.c
--- i386/i386/machdep.c 9 Mar 2012 19:42:48 - 1.742
+++ i386/i386/machdep.c 10 Mar 2012 15:51:40 -
@@ -41,6 +41,7 @@
__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.742 2012/03/09 19:42:48 jhb Exp $");
#include "opt_atalk.h"
+#include "opt_apic.h"
#include "opt_atpic.h"
#include "opt_compat.h"
#include "opt_cpu.h"
@@ -136,6 +137,10 @@
#include
#endif
+#ifdef DEV_APIC
+#include
+#endif
+
#ifdef DEV_ISA
#include
#endif
Index: pc98/pc98/machdep.c
===
RCS file: /home/ncvs/src/sys/pc98/pc98/machdep.c,v
retrieving revision 1.452
diff -u -r1.452 machdep.c
--- pc98/pc98/machdep.c 21 Jan 2012 17:45:27 - 1.452
+++ pc98/pc98/machdep.c 10 Mar 2012 15:51:55 -
@@ -41,6 +41,8 @@
__FBSDID("$FreeBSD: src/sys/pc98/pc98/machdep.c,v 1.452 2012/01/21 17:45:27 kib Exp $");
#include "opt_atalk.h"
+#include "opt_apic.h"
+#include "opt_atpic.h"
#include "opt_compat.h"
#include "opt_cpu.h"
#include "opt_ddb.h"
@@ -132,6 +134,10 @@
#include
#endif
+#ifdef DEV_APIC
+#include
+#endif
+
#ifdef DEV_ISA
#include
#endif
@@ -2296,7 +2302,21 @@
printf("WARNING: loader(8) metadata is missing!\n");
#ifdef DEV_ISA
+#ifdef DEV_ATPIC
atpic_startup();
+#else
+ /* Reset and mask the atpics and leave them shut down. */
+ atpic_reset();
+
+ /*
+ * Point the ICU spurious interrupt vectors at the APIC spurious
+ * interrupt handler.
+ */
+ setidt(IDT_IO_INTS + 7, IDTVEC(spuriousint), SDT_SYS386IGT, SEL_KPL,
+ GSEL(GCODE_SEL, SEL_KPL));
+ setidt(IDT_IO_INTS + 15, IDTVEC(spuriousint), SDT_SYS386IGT, SEL_KPL,
+ GSEL(GCODE_SEL, SEL_KPL));
+#endif
#endif
#ifdef DDB
Index: x86/isa/atpic.c
===
RCS file: /home/ncvs/src/sys/x86/isa/atpic.c,v
retrieving revision 1.1
diff -u -r1.1 atpic.c
--- x86/isa/atpic.c 25 Feb 2010 14:13:39 - 1.1
+++ x86/isa/atpic.c 10 Mar 2012 12:48:03 -
@@ -72,48 +72,6 @@
#define MASTER 0
#define SLAVE 1
-/*
- * PC-98 machines wire the slave 8259A to pin 7 on the master PIC, and
- * PC-AT machines wire the slave PIC to pin 2 on the master PIC.
- */
-#ifdef PC98
-#define ICU_SLAVEID 7
-#else
-#define ICU_SLAVEID 2
-#endif
-
-/*
- * Determine the base master and slave modes not including auto EOI support.
- * All machines that FreeBSD supports use 8086 mode.
- */
-#ifdef PC98
-/*
- * PC-98 machines do not support auto EOI on the second PIC. Also, it
- * seems that PC-98 machine PICs use buffered mode, and the master PIC
- * uses special fully nested mode.
- */
-#define BASE_MASTER_MODE (ICW4_SFNM | ICW4_BUF | ICW4_MS | ICW4_8086)
-#define BASE_SLAVE_MODE (ICW4_BUF | ICW4_8086)
-#else
-#define BASE_MASTER_MODE ICW4_8086
-#define BASE_SLAVE_MODE ICW4_8086
-#endif
-
-/* Enable automatic EOI if requested. */
-#ifdef AUTO_EOI_1
-#define MASTER_MODE (BASE_MASTER_MODE | ICW4_AEOI)
-#else
-#define MASTER_MODE BASE_MASTER_MODE
-#endif
-#ifdef AUTO_EOI_2
-#define SLAVE_MODE (BASE_SLAVE_MODE | ICW4_AEOI)
-#else
-#define SLAVE_MODE BASE_SLAVE_MODE
-#endif
-
-#define IRQ_MASK(irq) (1 << (irq))
-#define IMEN_MASK(ai) (IRQ_MASK((ai)->at_irq))
-
#define NUM_ISA_IRQS 16
static void atpic_init(void *dummy);
Index: x86/isa/icu.h
===
RCS file: /home/ncvs/src/sys/x86/isa/icu.h,v
retrieving revision 1.1
diff -u -r1.1 icu.h
--- x86/isa/icu.h 25 Feb 2010 14:13:
svn commit: r232784 - head/sys/boot/pc98/boot2
Author: nyan
Date: Sat Mar 10 15:08:37 2012
New Revision: 232784
URL: http://svn.freebsd.org/changeset/base/232784
Log:
MFi386: revisions 232570 and 232754
Fix boot2 to handle boot config files that only contain a custom path to
a loader or kernel.
Modified:
head/sys/boot/pc98/boot2/boot2.c
Modified: head/sys/boot/pc98/boot2/boot2.c
==
--- head/sys/boot/pc98/boot2/boot2.cSat Mar 10 14:57:21 2012
(r232783)
+++ head/sys/boot/pc98/boot2/boot2.cSat Mar 10 15:08:37 2012
(r232784)
@@ -130,9 +130,9 @@ static struct dsk {
unsigned part;
unsigned start;
} dsk;
-static char cmd[512], cmddup[512];
+static char cmd[512], cmddup[512], knamebuf[1024];
static const char *kname = NULL;
-static uint32_t opts;
+static uint32_t opts = 0;
static int comspeed = SIOSPD;
static struct bootinfo bootinfo;
static uint8_t ioctrl = IO_KEYBOARD;
@@ -352,6 +352,7 @@ main(void)
#endif
uint8_t autoboot;
ino_t ino;
+size_t nbyte;
dmadat = (void *)(roundup2(__base + (int32_t)&_end, 0x1) - __base);
v86.ctl = V86_FLAGS;
@@ -378,8 +379,10 @@ main(void)
autoboot = 1;
if ((ino = lookup(PATH_CONFIG)) ||
-(ino = lookup(PATH_DOTCONFIG)))
- fsread(ino, cmd, sizeof(cmd));
+(ino = lookup(PATH_DOTCONFIG))) {
+ nbyte = fsread(ino, cmd, sizeof(cmd) - 1);
+ cmd[nbyte] = '\0';
+}
if (*cmd) {
memcpy(cmddup, cmd, sizeof(cmd));
@@ -396,9 +399,9 @@ main(void)
* or in case of failure, try to load a kernel directly instead.
*/
-if (autoboot && !kname) {
+if (!kname) {
kname = PATH_BOOT3;
- if (!keyhit(3*SECOND)) {
+ if (autoboot && !keyhit(3*SECOND)) {
load();
kname = PATH_KERNEL;
}
@@ -595,7 +598,12 @@ parse()
dsk.daua = dsk.disk | dsk.unit;
dsk_meta = 0;
}
-kname = arg;
+ if ((i = ep - arg)) {
+ if ((size_t)i >= sizeof(knamebuf))
+ return -1;
+ memcpy(knamebuf, arg, i + 1);
+ kname = knamebuf;
+ }
}
arg = p;
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r231387 - head/sys/boot/pc98/loader
Author: nyan
Date: Fri Feb 10 15:34:36 2012
New Revision: 231387
URL: http://svn.freebsd.org/changeset/base/231387
Log:
Reduce diffs against i386.
MFC after:1 week
Modified:
head/sys/boot/pc98/loader/Makefile
Modified: head/sys/boot/pc98/loader/Makefile
==
--- head/sys/boot/pc98/loader/Makefile Fri Feb 10 14:55:47 2012
(r231386)
+++ head/sys/boot/pc98/loader/Makefile Fri Feb 10 15:34:36 2012
(r231387)
@@ -3,7 +3,8 @@
.include
MK_SSP=no
-PROG= loader.sym
+LOADER?= loader
+PROG= ${LOADER}.sym
INTERNALPROG=
NEWVERSWHAT= "bootstrap loader" pc98
@@ -39,14 +40,14 @@ CFLAGS+=-DLOADER_BZIP2_SUPPORT
CFLAGS+= -DLOADER_GZIP_SUPPORT
.endif
-# Always add MI sources
+# Always add MI sources
.PATH: ${.CURDIR}/../../common
.include "${.CURDIR}/../../common/Makefile.inc"
CFLAGS+= -I${.CURDIR}/../../common
CFLAGS+= -I${.CURDIR}/../../i386
CFLAGS+= -I.
-CLEANFILES=vers.c loader loader.bin loader.help
+CLEANFILES=vers.c ${LOADER} ${LOADER}.bin loader.help
CFLAGS+= -Wall
LDFLAGS= -static -Ttext 0x0
@@ -68,36 +69,37 @@ CFLAGS+=-I${.CURDIR}/../btx/lib
vers.c:${.CURDIR}/../../common/newvers.sh
${.CURDIR}/../../i386/loader/version
sh ${.CURDIR}/../../common/newvers.sh
${.CURDIR}/../../i386/loader/version ${NEWVERSWHAT}
-loader: loader.bin ${BTXLDR} ${BTXKERN}
+${LOADER}: ${LOADER}.bin ${BTXLDR} ${BTXKERN}
btxld -v -f aout -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \
- -b ${BTXKERN} loader.bin
+ -b ${BTXKERN} ${LOADER}.bin
-loader.bin: loader.sym
+${LOADER}.bin: ${LOADER}.sym
cp ${.ALLSRC} ${.TARGET}
strip -R .comment -R .note ${.TARGET}
loader.help: help.common help.pc98
cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk >
${.TARGET}
-.PATH: ${.CURDIR}/../../forth
-FILES= loader loader.help loader.4th support.4th loader.conf
+FILES= ${LOADER}
+# XXX INSTALLFLAGS_loader= -b
+FILESMODE_${LOADER}= ${BINMODE} -b
+
+.PATH: ${.CURDIR}/../../forth
+FILES+=loader.help loader.4th support.4th loader.conf
FILES+= screen.4th frames.4th beastie.4th
FILES+= brand.4th check-password.4th color.4th delay.4th
FILES+= menu.4th menu-commands.4th shortcuts.4th version.4th
-# XXX INSTALLFLAGS_loader= -b
-FILESMODE_loader= ${BINMODE} -b
FILESDIR_loader.conf= /boot/defaults
.if !exists(${DESTDIR}/boot/loader.rc)
FILES+=${.CURDIR}/../../i386/loader/loader.rc
.endif
-
.if !exists(${DESTDIR}/boot/menu.rc)
FILES+= menu.rc
.endif
# XXX crt0.o needs to be first for pxeboot(8) to work
-OBJS= ${BTXCRT}
+OBJS= ${BTXCRT}
DPADD= ${LIBFICL} ${LIBPC98} ${LIBSTAND}
LDADD= ${LIBFICL} ${LIBPC98} ${LIBSTAND}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r231276 - head/sys/pc98/conf
Author: nyan Date: Thu Feb 9 14:15:56 2012 New Revision: 231276 URL: http://svn.freebsd.org/changeset/base/231276 Log: Remove full debugger options and enable KDB_TRACE option instead to decrease kernel size and increase performance. Modified: head/sys/pc98/conf/GENERIC Modified: head/sys/pc98/conf/GENERIC == --- head/sys/pc98/conf/GENERIC Thu Feb 9 14:15:20 2012(r231275) +++ head/sys/pc98/conf/GENERIC Thu Feb 9 14:15:56 2012(r231276) @@ -67,20 +67,8 @@ options CAPABILITY_MODE # Capsicum cap optionsCAPABILITIES# Capsicum capabilities optionsMAC # TrustedBSD MAC Framework optionsINCLUDE_CONFIG_FILE # Include this file in kernel - -# Debugging support. Always need this: -optionsKDB # Enable kernel debugger support. -# For minimum debugger support (stable branch) use: -#options KDB_TRACE # Print a stack trace for a panic. -# For full debugger support use this instead: -optionsDDB # Support DDB. -optionsGDB # Support remote GDB. -optionsDEADLKRES # Enable the deadlock resolver -optionsINVARIANTS # Enable calls of extra sanity checking -optionsINVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -optionsWITNESS # Enable checks to detect deadlocks and cycles -optionsWITNESS_SKIPSPIN# Don't run witness on spinlocks for speed -optionsMALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones +optionsKDB # Kernel debugger related code +optionsKDB_TRACE # Print a stack trace for a panic # To make an SMP kernel, the next two lines are needed #options SMP # Symmetric MultiProcessor Kernel ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r231273 - head/sys/pc98/conf
Author: nyan Date: Thu Feb 9 14:00:49 2012 New Revision: 231273 URL: http://svn.freebsd.org/changeset/base/231273 Log: - Disable the olpt driver. Because it conflicts with the ppc/lpt driver. - Remove obsolete comment. MFC after:3 days Modified: head/sys/pc98/conf/GENERIC Modified: head/sys/pc98/conf/GENERIC == --- head/sys/pc98/conf/GENERIC Thu Feb 9 13:23:44 2012(r231272) +++ head/sys/pc98/conf/GENERIC Thu Feb 9 14:00:49 2012(r231273) @@ -167,8 +167,7 @@ device plip# TCP/IP over parallel device ppi # Parallel port interface device #devicevpo # Requires scbus and da # OLD Parallel port -# Please stay olpt driver after ppc driver -device olpt +#deviceolpt # PCI Ethernet NICs. device de # DEC/Intel DC21x4x (``Tulip'') ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r231123 - head/release
Author: nyan
Date: Tue Feb 7 10:59:19 2012
New Revision: 231123
URL: http://svn.freebsd.org/changeset/base/231123
Log:
- Set TERM to cons25w on pc98 because we still use old cons25w terminal
to show Japanese.
- Add cons25w to terminal lists.
Reviewed by: nwhitehorn
MFC after:1 week
Modified:
head/release/rc.local
Modified: head/release/rc.local
==
--- head/release/rc.local Tue Feb 7 09:51:41 2012(r231122)
+++ head/release/rc.local Tue Feb 7 10:59:19 2012(r231123)
@@ -8,10 +8,16 @@
: ${DIALOG_ITEM_HELP=4}
: ${DIALOG_ESC=255}
+MACHINE=`uname -m`
+
kbdcontrol -d >/dev/null 2>&1
if [ $? -eq 0 ]; then
# Syscons: use xterm, start interesting things on other VTYs
- TERM=xterm
+ if [ ${MACHINE} = "pc98" ]; then
+ TERM=cons25w
+ else
+ TERM=xterm
+ fi
if [ -z "$EXTERNAL_VTY_STARTED" ]; then
# Init will clean these processes up if/when the system
@@ -31,6 +37,7 @@ else
echo " ansi Standard ANSI terminal"
echo " vt100VT100 or compatible terminal"
echo " xtermxterm terminal emulator (or compatible)"
+ echo " cons25w cons25w terminal"
echo
echo -n "Console type [vt100]: "
read TERM
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r230482 - head/release
In article <4f2ea4f7.9010...@freebsd.org>
Nathan Whitehorn writes:
>>>>> TERM=xterm
>>>> This code is also used on pc98, right? I think on pc98 we still need
>>>> to
>>>> use TERM=cons25w, to support Japanese character sets and keyboard
>>>> input.
>> How about the attached patch?
>
> The top half looks OK. The bottom half (the menu) is relevant only for
> serial consoles. I guess people could be viewing a remote serial
> console on a PC-98 graphics console, but then it shouldn't be
> conditionalized on PC98 machines.
Ok. I update the patch.
---
TAKAHASHI Yoshihiro
Index: src/release/rc.local
===
RCS file: /home/ncvs/src/release/rc.local,v
retrieving revision 1.6
diff -u -r1.6 rc.local
--- src/release/rc.local 23 Jan 2012 16:17:54 - 1.6
+++ src/release/rc.local 6 Feb 2012 13:04:37 -
@@ -8,10 +8,16 @@
: ${DIALOG_ITEM_HELP=4}
: ${DIALOG_ESC=255}
+MACHINE=`uname -m`
+
kbdcontrol -d >/dev/null 2>&1
if [ $? -eq 0 ]; then
# Syscons: use xterm, start interesting things on other VTYs
- TERM=xterm
+ if [ ${MACHINE} = "pc98" ]; then
+ TERM=cons25w
+ else
+ TERM=xterm
+ fi
if [ -z "$EXTERNAL_VTY_STARTED" ]; then
# Init will clean these processes up if/when the system
@@ -31,6 +37,7 @@
echo " ansi Standard ANSI terminal"
echo " vt100VT100 or compatible terminal"
echo " xtermxterm terminal emulator (or compatible)"
+ echo " cons25w cons25w terminal"
echo
echo -n "Console type [vt100]: "
read TERM
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r230727 - head/sbin/camcontrol
Author: nyan Date: Sun Jan 29 09:12:34 2012 New Revision: 230727 URL: http://svn.freebsd.org/changeset/base/230727 Log: Fix build when RELEASE_CRUNCH is defined. Modified: head/sbin/camcontrol/Makefile Modified: head/sbin/camcontrol/Makefile == --- head/sbin/camcontrol/Makefile Sun Jan 29 08:33:34 2012 (r230726) +++ head/sbin/camcontrol/Makefile Sun Jan 29 09:12:34 2012 (r230727) @@ -1,9 +1,9 @@ # $FreeBSD$ PROG= camcontrol -SRCS= camcontrol.c fwdownload.c util.c +SRCS= camcontrol.c util.c .if !defined(RELEASE_CRUNCH) -SRCS+= modeedit.c +SRCS+= fwdownload.c modeedit.c .else CFLAGS+= -DMINIMALISTIC .endif ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r230482 - head/release
In article <1f971db2-9cc6-41c9-9296-039d63e05...@freebsd.org>
Nathan Whitehorn writes:
> I think we didn't make PC98 release media for 9.0, but that's a good
> point. I'm out of commission right now due to an injury, so patches
> would be welcome.
>>
>>> TERM=xterm
>>
>> This code is also used on pc98, right? I think on pc98 we still need
>> to
>> use TERM=cons25w, to support Japanese character sets and keyboard
>> input.
How about the attached patch?
---
TAKAHASHI Yoshihiro
Index: rc.local
===
RCS file: /home/ncvs/src/release/rc.local,v
retrieving revision 1.6
diff -u -r1.6 rc.local
--- rc.local 23 Jan 2012 16:17:54 - 1.6
+++ rc.local 28 Jan 2012 10:26:06 -
@@ -8,10 +8,16 @@
: ${DIALOG_ITEM_HELP=4}
: ${DIALOG_ESC=255}
+MACHINE=`uname -m`
+
kbdcontrol -d >/dev/null 2>&1
if [ $? -eq 0 ]; then
# Syscons: use xterm, start interesting things on other VTYs
- TERM=xterm
+ if [ ${MACHINE} = "pc98" ]; then
+ TERM=cons25w
+ else
+ TERM=xterm
+ fi
if [ -z "$EXTERNAL_VTY_STARTED" ]; then
# Init will clean these processes up if/when the system
@@ -30,6 +36,9 @@
echo "Common console types are:"
echo " ansi Standard ANSI terminal"
echo " vt100VT100 or compatible terminal"
+ if [ ${MACHINE} = "pc98" ]; then
+ echo " cons25w cons25w terminal"
+ fi
echo " xtermxterm terminal emulator (or compatible)"
echo
echo -n "Console type [vt100]: "
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r229463 - head/sys/boot/pc98/libpc98
Author: nyan
Date: Wed Jan 4 03:54:30 2012
New Revision: 229463
URL: http://svn.freebsd.org/changeset/base/229463
Log:
MFi386: revision 229435
Add special loader environment variables 'comconsole_port' and
'comconsole_pcidev'.
MFC after:2 weeks
Modified:
head/sys/boot/pc98/libpc98/comconsole.c
Modified: head/sys/boot/pc98/libpc98/comconsole.c
==
--- head/sys/boot/pc98/libpc98/comconsole.c Wed Jan 4 03:49:41 2012
(r229462)
+++ head/sys/boot/pc98/libpc98/comconsole.c Wed Jan 4 03:54:30 2012
(r229463)
@@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include "libi386.h"
#define COMC_FMT 0x3 /* 8N1 */
@@ -49,14 +50,23 @@ static int comc_init(int arg);
static voidcomc_putchar(int c);
static int comc_getchar(void);
static int comc_getspeed(void);
+static voidset_hw_console_hint(void);
static int comc_ischar(void);
-static int comc_parsespeed(const char *string);
-static voidcomc_setup(int speed);
+static int comc_parseint(const char *string);
+static uint32_t comc_parse_pcidev(const char *string);
+static int comc_pcidev_set(struct env_var *ev, int flags,
+ const void *value);
+static int comc_pcidev_handle(uint32_t locator);
+static int comc_port_set(struct env_var *ev, int flags,
+ const void *value);
+static voidcomc_setup(int speed, int port);
static int comc_speed_set(struct env_var *ev, int flags,
const void *value);
static int comc_started;
static int comc_curspeed;
+static int comc_port = COMPORT;
+static uint32_tcomc_locator;
struct console comconsole = {
"comconsole",
@@ -72,9 +82,10 @@ struct console comconsole = {
static void
comc_probe(struct console *cp)
{
-char speedbuf[16];
-char *cons, *speedenv;
-int speed;
+char intbuf[16];
+char *cons, *env;
+int speed, port;
+uint32_t locator;
/* XXX check the BIOS equipment list? */
cp->c_flags |= (C_PRESENTIN | C_PRESENTOUT);
@@ -90,16 +101,40 @@ comc_probe(struct console *cp)
getenv("boot_multicons") != NULL) {
comc_curspeed = comc_getspeed();
}
- speedenv = getenv("comconsole_speed");
- if (speedenv != NULL) {
- speed = comc_parsespeed(speedenv);
+
+ env = getenv("comconsole_speed");
+ if (env != NULL) {
+ speed = comc_parseint(env);
if (speed > 0)
comc_curspeed = speed;
}
- sprintf(speedbuf, "%d", comc_curspeed);
+ sprintf(intbuf, "%d", comc_curspeed);
unsetenv("comconsole_speed");
- env_setenv("comconsole_speed", EV_VOLATILE, speedbuf, comc_speed_set,
+ env_setenv("comconsole_speed", EV_VOLATILE, intbuf, comc_speed_set,
+ env_nounset);
+
+ env = getenv("comconsole_port");
+ if (env != NULL) {
+ port = comc_parseint(env);
+ if (port > 0)
+ comc_port = port;
+ }
+
+ sprintf(intbuf, "%d", comc_port);
+ unsetenv("comconsole_port");
+ env_setenv("comconsole_port", EV_VOLATILE, intbuf, comc_port_set,
+ env_nounset);
+
+ env = getenv("comconsole_pcidev");
+ if (env != NULL) {
+ locator = comc_parse_pcidev(env);
+ if (locator != 0)
+ comc_pcidev_handle(locator);
+ }
+
+ unsetenv("comconsole_pcidev");
+ env_setenv("comconsole_pcidev", EV_VOLATILE, env, comc_pcidev_set,
env_nounset);
}
}
@@ -111,7 +146,7 @@ comc_init(int arg)
return 0;
comc_started = 1;
-comc_setup(comc_curspeed);
+comc_setup(comc_curspeed, comc_port);
return(0);
}
@@ -122,8 +157,8 @@ comc_putchar(int c)
int wait;
for (wait = COMC_TXWAIT; wait > 0; wait--)
-if (inb(COMPORT + com_lsr) & LSR_TXRDY) {
- outb(COMPORT + com_data, (u_char)c);
+if (inb(comc_port + com_lsr) & LSR_TXRDY) {
+ outb(comc_port + com_data, (u_char)c);
break;
}
}
@@ -131,13 +166,13 @@ comc_putchar(int c)
static int
comc_getchar(void)
{
-return(comc_ischar() ? inb(COMPORT + com_data) : -1);
+return(comc_ischar() ? inb(comc_port + com_data) : -1);
}
static int
comc_ischar(void)
{
-return(inb(COMPORT + com_lsr) & LSR_RXRDY);
+return(inb(comc_port + com_lsr) & LSR_RXRDY);
}
static int
@@ -145,13 +180,33 @@ comc_speed_set(struct env_var *ev, int f
{
int speed;
-if (value == NULL || (speed = comc_parsespeed(value)) <= 0) {
+if (value == NULL || (speed = comc_parseint(value)) <= 0) {
printf("Invalid speed\n");
return (CMD_ERROR);
}
if (comc_started && comc_curspeed != speed)
- comc_setup(speed);
+ comc_setup(speed, comc_port);
+
+env_setenv(ev->ev_name, flags
svn commit: r229462 - head/sys/boot/pc98/boot2
Author: nyan Date: Wed Jan 4 03:49:41 2012 New Revision: 229462 URL: http://svn.freebsd.org/changeset/base/229462 Log: Fix 230MB MO support. Submitted by: Kaho Toshikazu MFC after:1 week Modified: head/sys/boot/pc98/boot2/boot1.S Modified: head/sys/boot/pc98/boot2/boot1.S == --- head/sys/boot/pc98/boot2/boot1.SWed Jan 4 03:37:41 2012 (r229461) +++ head/sys/boot/pc98/boot2/boot1.SWed Jan 4 03:49:41 2012 (r229462) @@ -219,7 +219,7 @@ read: xor %ax,%ax jc read_load and $0xff7f,%si /* SCSI MO */ mov %di,%cx - shr $16,%di + shr $16,%edi mov %di,%dx jmp read_load read_fd: or $0xd000,%si ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r227536 - in head: release share/man/man7
In article <1321457050.78238.10.ca...@bauer.cse.buffalo.edu>
Ken Smith writes:
>> >> +: ${RELSTRING=`chroot $2 uname -s`-`chroot $2 uname -r`-`chroot $2 uname
>> >> -p`}
>> > Should this be 'uname -m' rather than 'uname -p'?
>>
>> There isn't a good option here when there is only one tag -- most of the
>> time, I imagine this will get specified in the builder's environment. I
>> picked uname -p because there are more possibilities than uname -m: it
>> breaks the degeneracies for PPC, ARM, and MIPS, leaving only one for
>> i386/pc98. uname -m would have been the other way around.
I see.
> Or both? We're heading in the direction of having both for the FTP
> server tree.
>
> Kinda gross but "FBSD-9.0-RELEASE-amd64-amd64-bootonly.iso"? I don't
> see a good option among the three possibilities, which are:
>
> 1) uname -m only
> 2) uname -p only
> 3) both
>
> Option 3 at least has the benefit of not being abiguous and covers all
> the possibilities for builds given the new infrastructure.
I think that the same scheme as the FTP site is better. So I choose
(3) option.
---
TAKAHASHI Yoshihiro
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r227536 - in head: release share/man/man7
In article <20151849.pafinr3k012...@svn.freebsd.org>
Nathan Whitehorn writes:
> Log:
> Further automate production release generation by naming files the right
> things and generating checksums.
>
> Modified: head/release/generate-release.sh
> ==
> --- head/release/generate-release.sh Tue Nov 15 17:53:29 2011
> (r227535)
> +++ head/release/generate-release.sh Tue Nov 15 18:49:27 2011
> (r227536)
> @@ -65,3 +66,12 @@ chroot $2 make -C /usr/src $MAKE_FLAGS b
> chroot $2 make -C /usr/src/release release
> chroot $2 make -C /usr/src/release install DESTDIR=/R
>
> +: ${RELSTRING=`chroot $2 uname -s`-`chroot $2 uname -r`-`chroot $2 uname -p`}
Should this be 'uname -m' rather than 'uname -p'?
---
TAKAHASHI Yoshihiro
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r226329 - head/usr.bin/kdump
In article <86r52h9f5g@ds4.des.no>
Dag-Erling Smørgrav writes:
> TAKAHASHI Yoshihiro writes:
>> This change breaks cross building.
>
> Damn, you're right. Will this work?
>
> Index: usr.bin/kdump/Makefile
> ===
> --- usr.bin/kdump/Makefile(revision 226329)
> +++ usr.bin/kdump/Makefile(working copy)
> @@ -21,7 +21,8 @@
> CLEANFILES= ioctl.c kdump_subr.c kdump_subr.h linux_syscalls.c
>
> ioctl.c: mkioctls
> - sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
> + env MACHINE=${TARGET} \
> + sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
>
> kdump_subr.h: mksubr
> sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include | \
The above ${TARGET} should be ${MACHINE}. The others are fine.
Thanks.
---
TAKAHASHI Yoshihiro
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r226329 - head/usr.bin/kdump
In article <201110122145.p9cljccm085...@svn.freebsd.org>
Dag-Erling Smorgrav writes:
> Author: des
> Date: Wed Oct 12 21:45:12 2011
> New Revision: 226329
> URL: http://svn.freebsd.org/changeset/base/226329
>
> Log:
> Make kdump compile cleanly at WARNS level 6, with one exception: the
> ipfilter headers contain a duplicated function declaration. Turn off
> -Werror to allow kdump to compile in spite of this.
>
> It would be neat to be able to turn off -Werror on a file-by-file basis...
> Modified: head/usr.bin/kdump/mkioctls
> ==
> --- head/usr.bin/kdump/mkioctls Wed Oct 12 21:38:48 2011
> (r226328)
> +++ head/usr.bin/kdump/mkioctls Wed Oct 12 21:45:12 2011
> (r226329)
> @@ -15,12 +15,21 @@ LC_ALL=C; export LC_ALL
> # XXX should we use an ANSI cpp?
> ioctl_includes=`
> cd $1
> - find -H -s * -name '*.h' |
> + find -H -s * -name '*.h' | grep -v '.*disk.*\.h' | \
> xargs egrep -l \
> '^#[ ]*define[ ]+[A-Za-z_][A-Za-z0-9_]*[
> ]+_IO[^a-z0-9_]' |
> awk '{printf("#include <%s>n", $1)}'
> `
>
> +case "`uname -m`" in
> +*pc98*)
> + ioctl_includes="$ioctl_includes#include \\n"
> + ;;
> +*)
> + ioctl_includes="$ioctl_includes#include \\n"
> + ;;
> +esac
> +
> awk -v x="$ioctl_includes" 'BEGIN {print x}' |
> gcc -E -I$1 -dM -DCOMPAT_43TTY - |
> awk -v ioctl_includes="$ioctl_includes" '
>
This change breaks cross building.
---
TAKAHASHI Yoshihiro
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r225977 - head/sys/pc98/pc98
Author: nyan
Date: Tue Oct 4 13:24:22 2011
New Revision: 225977
URL: http://svn.freebsd.org/changeset/base/225977
Log:
MFi386: revision 225936
Add some improvements in the idle table callbacks:
- Replace instances of manual assembly instruction "hlt" call
with halt() function calling.
- In cpu_idle_mwait() avoid races in check to sched_runnable() using
the same pattern used in cpu_idle_hlt() with the 'hlt' instruction.
- Add comments explaining the logic behind the pattern used in
cpu_idle_hlt() and other idle callbacks.
Modified:
head/sys/pc98/pc98/machdep.c
Modified: head/sys/pc98/pc98/machdep.c
==
--- head/sys/pc98/pc98/machdep.cTue Oct 4 13:19:21 2011
(r225976)
+++ head/sys/pc98/pc98/machdep.cTue Oct 4 13:24:22 2011
(r225977)
@@ -1117,7 +1117,7 @@ void
cpu_halt(void)
{
for (;;)
- __asm__ ("hlt");
+ halt();
}
static int idle_mwait = 1; /* Use MONITOR/MWAIT for short idle. */
@@ -1136,9 +1136,22 @@ cpu_idle_hlt(int busy)
state = (int *)PCPU_PTR(monitorbuf);
*state = STATE_SLEEPING;
+
/*
-* We must absolutely guarentee that hlt is the next instruction
-* after sti or we introduce a timing window.
+* Since we may be in a critical section from cpu_idle(), if
+* an interrupt fires during that critical section we may have
+* a pending preemption. If the CPU halts, then that thread
+* may not execute until a later interrupt awakens the CPU.
+* To handle this race, check for a runnable thread after
+* disabling interrupts and immediately return if one is
+* found. Also, we must absolutely guarentee that hlt is
+* the next instruction after sti. This ensures that any
+* interrupt that fires after the call to disable_intr() will
+* immediately awaken the CPU from hlt. Finally, please note
+* that on x86 this works fine because of interrupts enabled only
+* after the instruction following sti takes place, while IF is set
+* to 1 immediately, allowing hlt instruction to acknowledge the
+* interrupt.
*/
disable_intr();
if (sched_runnable())
@@ -1164,11 +1177,19 @@ cpu_idle_mwait(int busy)
state = (int *)PCPU_PTR(monitorbuf);
*state = STATE_MWAIT;
- if (!sched_runnable()) {
- cpu_monitor(state, 0, 0);
- if (*state == STATE_MWAIT)
- cpu_mwait(0, MWAIT_C1);
+
+ /* See comments in cpu_idle_hlt(). */
+ disable_intr();
+ if (sched_runnable()) {
+ enable_intr();
+ *state = STATE_RUNNING;
+ return;
}
+ cpu_monitor(state, 0, 0);
+ if (*state == STATE_MWAIT)
+ __asm __volatile("sti; mwait" : : "a" (MWAIT_C1), "c" (0));
+ else
+ enable_intr();
*state = STATE_RUNNING;
}
@@ -1180,6 +1201,12 @@ cpu_idle_spin(int busy)
state = (int *)PCPU_PTR(monitorbuf);
*state = STATE_RUNNING;
+
+ /*
+* The sched_runnable() call is racy but as long as there is
+* a loop missing it one time will have just a little impact if any
+* (and it is much better than missing the check at all).
+*/
for (i = 0; i < 1000; i++) {
if (sched_runnable())
return;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r224780 - head/release
Author: nyan
Date: Thu Aug 11 13:15:11 2011
New Revision: 224780
URL: http://svn.freebsd.org/changeset/base/224780
Log:
Allow to build a release for stable/[78] on a current box and vise versa.
Approved by: re (hrs)
MFC after:1 week
Modified:
head/release/Makefile.sysinstall
Modified: head/release/Makefile.sysinstall
==
--- head/release/Makefile.sysinstallThu Aug 11 13:13:08 2011
(r224779)
+++ head/release/Makefile.sysinstallThu Aug 11 13:15:11 2011
(r224780)
@@ -600,7 +600,11 @@ release rerelease:
echo "fi" >> ${_MK}
echo "cd /usr/src/release" >> ${_MK}
echo "make obj" >> ${_MK}
- echo "make -f Makefile.sysinstall \$${_RELTARGET}" >> ${_MK}
+ echo "if [ -f Makefile.sysinstall ]; then" >> ${_MK}
+ echo " make -f Makefile.sysinstall \$${_RELTARGET}" >> ${_MK}
+ echo "else" >> ${_MK}
+ echo " make \$${_RELTARGET}" >> ${_MK}
+ echo "fi" >> ${_MK}
echo "echo \">>> make ${.TARGET} for ${TARGET} finished on \`LC_ALL=C
TZ=GMT date\`\"" >> ${_MK}
chmod 755 ${_MK}
.if defined(NOPORTS)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r224779 - head/release
Author: nyan
Date: Thu Aug 11 13:13:08 2011
New Revision: 224779
URL: http://svn.freebsd.org/changeset/base/224779
Log:
Fix building a release with old release scheme. This catches up with
renaming from Makefile to Makefile.sysinstall.
Approved by: re (hrs)
Modified:
head/release/Makefile.sysinstall
Modified: head/release/Makefile.sysinstall
==
--- head/release/Makefile.sysinstallThu Aug 11 12:30:23 2011
(r224778)
+++ head/release/Makefile.sysinstallThu Aug 11 13:13:08 2011
(r224779)
@@ -363,6 +363,8 @@ WMAKEENV!= cd ${.CURDIR}/..; \
WMAKE= ${WMAKEENV} ${BINMAKE}
.endif
+SMAKE= ${MAKE} -f ${MAKEFILE}
+
CVS_SRCARGS= -P
.if defined(RELEASETAG)
CVS_SRCARGS+= -r ${RELEASETAG}
@@ -479,7 +481,7 @@ release rerelease:
mkdir -p ${CHROOTDIR}/usr/ports/distfiles; \
fi
.if !defined(NO_PREFETCHDISTFILES)
- @cd ${.CURDIR} && ${MAKE} fetch-distfiles
+ @cd ${.CURDIR} && ${SMAKE} fetch-distfiles
.endif
.endif
.endif
@@ -719,7 +721,7 @@ release.6:
@for i in ${DISTRIBUTIONS} ; \
do \
if [ -d ${RD}/trees/$${i} ] ; then \
- cd ${.CURDIR} && $(MAKE) doTARBALL \
+ cd ${.CURDIR} && $(SMAKE) doTARBALL \
SD=${RD}/trees/$${i} \
TN=$$i TD=$$i ARG="." && \
echo "$${i} distribution is finished."; \
@@ -728,7 +730,7 @@ release.6:
@for i in ${KERNELS_BASE} ${KERNELS} ; \
do \
if [ -d ${RD}/kernels/$${i} ] ; then \
- cd ${.CURDIR} && $(MAKE) doTARBALL \
+ cd ${.CURDIR} && $(SMAKE) doTARBALL \
SD=${RD}/kernels \
TN=$$i TD=kernels ARG="$$i" && \
echo "$${i} distribution is finished."; \
@@ -758,11 +760,11 @@ release.6:
#
release.7:
.if !defined(NOSRC)
- @cd ${.CURDIR} && $(MAKE) doTARBALL SD=/usr/src \
+ @cd ${.CURDIR} && $(SMAKE) doTARBALL SD=/usr/src \
TD=src TN=sbase ARG="[A-Z]*"
@for i in `cd /usr/src && echo [a-z]*` ; do \
if [ -d /usr/src/$$i ] ; then \
- cd ${.CURDIR} && $(MAKE) doTARBALL \
+ cd ${.CURDIR} && $(SMAKE) doTARBALL \
TN=`echo s$$i | tr -d '.' | \
sed -e 's/usr/u/' \
-e 's/kerberos5/krb5/'` \
@@ -773,7 +775,7 @@ release.7:
@set ${EXTRA_SRC} && \
while [ $$# -ge 2 ] ; do \
if [ -d /usr/src/$$1 ] ; then \
- cd ${.CURDIR} && $(MAKE) doTARBALL \
+ cd ${.CURDIR} && $(SMAKE) doTARBALL \
SD=/usr/src TN="s$$2" TD=src ARG="$$1" ; \
fi && shift && shift ; \
done
@@ -796,7 +798,7 @@ release.8:
cd ${RD}/mfsfd && \
mkdir -p etc/defaults dev mnt stand/etc/defaults stand/help \
var/empty
- @cd ${.CURDIR} && $(MAKE) installCRUNCH CRUNCH=boot \
+ @cd ${.CURDIR} && $(SMAKE) installCRUNCH CRUNCH=boot \
DIR=${RD}/mfsfd/stand ZIP=false
( cd ${RD}/mfsfd && \
for dir in bin sbin ; do \
@@ -862,39 +864,39 @@ SMALLMFSROOTFLOPPYSET=${RD}/floppyset/m
floppies.1:
@${ZIPPER} -c ${RD}/kernels/${KERN_GENERIC}/kernel >
${RD}/kernels/kernel.gz
@echo "Making the kernel boot floppies..."
- @cd ${.CURDIR} && ${MAKE} makeFloppySet FLOPPYBASE=kern \
+ @cd ${.CURDIR} && ${SMAKE} makeFloppySet FLOPPYBASE=kern \
FLOPPYDESC="Kernel" SPLITFILE=${RD}/kernels/kernel.gz
.if defined(SMALLFLOPPYSIZE)
@echo "Making the small kernel boot floppies..."
- @cd ${.CURDIR} && ${MAKE} makeFloppySet FLOPPYBASE=kern-small \
+ @cd ${.CURDIR} && ${SMAKE} makeFloppySet FLOPPYBASE=kern-small \
FLOPPYDESC="Kernel" SPLITFILE=${RD}/kernels/kernel.gz \
FDSIZE="SMALL"
.endif
.if defined(SPLIT_MFSROOT)
@echo "Making the mfsroot boot floppies..."
- @cd ${.CURDIR} && ${MAKE} makeFloppySet FLOPPYBASE=mfsroot \
+ @cd ${.CURDIR} && ${SMAKE} makeFloppySet FLOPPYBASE=mfsroot \
FLOPPYDESC="Memory Filesystem" SPLITFILE=${RD}/mfsroot/mfsroot.gz
.if defined(SMALLFLOPPYSIZE)
@echo "Making the small mfsroot boot floppies..."
- @cd ${.CURDIR} && ${MAKE} makeFloppySet FLOPPYBASE=mfsroot-small \
+ @cd ${.CURDIR} && ${SMAKE} makeFloppySet FLOPPYBASE=mfsroot-small \
FLOPPYDESC="Memory Filesystem" SPLITFILE=${RD}/mfsroot/mfsroot.gz \
FDSIZE="SMALL"
.endif
- @cd ${.CURDIR} && ${MAKE} buildBootFloppy FSIMAGE="boot" \
+ @cd ${.CURDIR} && ${SMAKE} buildBootFloppy FSIMAGE="boot" \
KERNFILE="${KERNFLOPPYS
Re: svn commit: r223262 - in head: cddl/contrib/opensolaris/lib/libdtrace/common contrib/binutils/bfd contrib/binutils/gas contrib/binutils/gas/config contrib/binutils/ld contrib/binutils/opcodes cont
In article <201106181356.p5iduxhw044...@svn.freebsd.org>
Ben Laurie writes:
> Author: benl
> Date: Sat Jun 18 13:56:33 2011
> New Revision: 223262
> URL: http://svn.freebsd.org/changeset/base/223262
>
> Log:
> Fix clang warnings.
>
> Modified: head/sys/sys/diskpc98.h
> ==
> --- head/sys/sys/diskpc98.h Sat Jun 18 13:54:36 2011(r223261)
> +++ head/sys/sys/diskpc98.h Sat Jun 18 13:56:33 2011(r223262)
> @@ -36,8 +36,11 @@
> #include
>
> #define DOSBBSECTOR 0 /* DOS boot block relative sector
> number */
> +#undef DOSPARTOFF
> #define DOSPARTOFF 0
> +#undef DOSPARTSIZE
> #define DOSPARTSIZE 32
> +#undef NDOSPART
> #define NDOSPART16
> #define DOSMAGICOFFSET 510
> #define DOSMAGIC0xAA55
> @@ -52,6 +55,7 @@
>
> #define DOSMID_386BSD (PC98_MID_386BSD | PC98_MID_BOOTABLE)
> #define DOSSID_386BSD (PC98_SID_386BSD | PC98_SID_ACTIVE)
> +#undef DOSPTYP_386BSD
> #define DOSPTYP_386BSD (DOSSID_386BSD << 8 | DOSMID_386BSD)
>
> struct pc98_partition {
>
I wonder why this is needed, and why only for diskpc98.h, not
diskmbr.h.
---
TAKAHASHI Yoshihiro
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r223046 - head/sys/pc98/conf
Author: nyan Date: Mon Jun 13 13:24:33 2011 New Revision: 223046 URL: http://svn.freebsd.org/changeset/base/223046 Log: - Reduce diffs against i386. - Add snd_uaudio. Modified: head/sys/pc98/conf/GENERIC Modified: head/sys/pc98/conf/GENERIC == --- head/sys/pc98/conf/GENERIC Mon Jun 13 13:21:12 2011(r223045) +++ head/sys/pc98/conf/GENERIC Mon Jun 13 13:24:33 2011(r223046) @@ -139,12 +139,6 @@ device sc # Add suspend/resume support for the i8254. #devicepmtimer -# Audio support -#devicesound # Generic sound driver -#devicesnd_mss # Microsoft Sound System -#device"snd_sb16" # Sound Blaster 16 -#devicesnd_sbc # Sound Blaster - # PCCARD (PCMCIA) support # PCMCIA and cardbus bridge support device cbb # cardbus (yenta) bridge @@ -288,3 +282,10 @@ device bpf # Berkeley packet filter #devicefirewire# FireWire bus code #devicesbp # SCSI over FireWire (Requires scbus and da) #devicefwe # Ethernet over FireWire (non-standard!) + +# Sound support +#devicesound # Generic sound driver (required) +#devicesnd_mss # Microsoft Sound System +#device"snd_sb16" # Sound Blaster 16 +#devicesnd_sbc # Sound Blaster +#devicesnd_uaudio # USB Audio ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r220685 - head/sys/boot/pc98/boot2
Author: nyan
Date: Sat Apr 16 06:20:49 2011
New Revision: 220685
URL: http://svn.freebsd.org/changeset/base/220685
Log:
MFi386: revisions 220389 and 220392
- Mark getc() as inline, this has no effect on gcc but helps clang.
- Move getc() body before xgetc() so gcc does not emit a warning about
function having no body.
Modified:
head/sys/boot/pc98/boot2/boot2.c
Modified: head/sys/boot/pc98/boot2/boot2.c
==
--- head/sys/boot/pc98/boot2/boot2.cSat Apr 16 00:10:55 2011
(r220684)
+++ head/sys/boot/pc98/boot2/boot2.cSat Apr 16 06:20:49 2011
(r220685)
@@ -150,7 +150,7 @@ static int drvread(void *, unsigned);
static int keyhit(unsigned);
static int xputc(int);
static int xgetc(int);
-static int getc(int);
+static inline int getc(int);
static void memcpy(void *, const void *, int);
static void
@@ -779,6 +779,18 @@ xputc(int c)
}
static int
+getc(int fn)
+{
+v86.addr = 0x18;
+v86.eax = fn << 8;
+v86int();
+if (fn)
+ return (v86.ebx >> 8) & 0x01;
+else
+ return v86.eax & 0xff;
+}
+
+static int
xgetc(int fn)
{
if (OPT_CHECK(RBX_NOINTR))
@@ -792,15 +804,3 @@ xgetc(int fn)
return 0;
}
}
-
-static int
-getc(int fn)
-{
-v86.addr = 0x18;
-v86.eax = fn << 8;
-v86int();
-if (fn)
- return (v86.ebx >> 8) & 0x01;
-else
- return v86.eax & 0xff;
-}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r220361 - head/sys/boot/pc98/boot2
Author: nyan
Date: Tue Apr 5 13:48:53 2011
New Revision: 220361
URL: http://svn.freebsd.org/changeset/base/220361
Log:
MFi386: revision 220337
Build boot2 with -mregparm=3.
Modified:
head/sys/boot/pc98/boot2/Makefile
Modified: head/sys/boot/pc98/boot2/Makefile
==
--- head/sys/boot/pc98/boot2/Makefile Tue Apr 5 13:14:17 2011
(r220360)
+++ head/sys/boot/pc98/boot2/Makefile Tue Apr 5 13:48:53 2011
(r220361)
@@ -28,6 +28,7 @@ CFLAGS= -Os \
-fno-unit-at-a-time \
-mno-align-long-strings \
-mrtd \
+ -mregparm=3 \
-D${BOOT2_UFS} \
-DFLAGS=${BOOT_BOOT1_FLAGS} \
-DSIOPRT=${BOOT_COMCONSOLE_PORT} \
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r219960 - head/sys/boot/pc98/boot2
Author: nyan
Date: Thu Mar 24 15:09:36 2011
New Revision: 219960
URL: http://svn.freebsd.org/changeset/base/219960
Log:
MFi386: the part of 219452
- bunch of variables are turned into uint8_t.
- the setting and reading of "fmt" in load() is removed.
- buf in printf() is made static to save space.
Modified:
head/sys/boot/pc98/boot2/boot2.c
Modified: head/sys/boot/pc98/boot2/boot2.c
==
--- head/sys/boot/pc98/boot2/boot2.cThu Mar 24 14:12:41 2011
(r219959)
+++ head/sys/boot/pc98/boot2/boot2.cThu Mar 24 15:09:36 2011
(r219960)
@@ -137,7 +137,7 @@ static const char *kname = NULL;
static uint32_t opts;
static int comspeed = SIOSPD;
static struct bootinfo bootinfo;
-static unsigned ioctrl = IO_KEYBOARD;
+static uint8_t ioctrl = IO_KEYBOARD;
void exit(int);
static void load(void);
@@ -445,9 +445,8 @@ load(void)
static Elf32_Shdr es[2];
caddr_t p;
ino_t ino;
-uint32_t addr, x;
+uint32_t addr;
int i, j;
-uint8_t fmt;
if (!(ino = lookup(kname))) {
if (!ls)
@@ -456,15 +455,8 @@ load(void)
}
if (xfsread(ino, &hdr, sizeof(hdr)))
return;
-if (N_GETMAGIC(hdr.ex) == ZMAGIC)
- fmt = 0;
-else if (IS_ELF(hdr.eh))
- fmt = 1;
-else {
- printf("Invalid %s\n", "format");
- return;
-}
-if (fmt == 0) {
+
+if (N_GETMAGIC(hdr.ex) == ZMAGIC) {
addr = hdr.ex.a_entry & 0xff;
p = PTOV(addr);
fs_off = PAGE_SIZE;
@@ -473,7 +465,7 @@ load(void)
p += roundup2(hdr.ex.a_text, PAGE_SIZE);
if (xfsread(ino, p, hdr.ex.a_data))
return;
-} else {
+} else if (IS_ELF(hdr.eh)) {
fs_off = hdr.eh.e_phoff;
for (j = i = 0; i < hdr.eh.e_phnum && j < 2; i++) {
if (xfsread(ino, ep + j, sizeof(ep[0])))
@@ -505,7 +497,11 @@ load(void)
}
addr = hdr.eh.e_entry & 0xff;
bootinfo.bi_esymtab = VTOP(p);
+} else {
+ printf("Invalid %s\n", "format");
+ return;
}
+
bootinfo.bi_kernelname = VTOP(kname);
bootinfo.bi_bios_dev = dsk.daua;
__exec((caddr_t)addr, RB_BOOTINFO | (opts & RBX_MASK),
@@ -672,7 +668,7 @@ static void
printf(const char *fmt,...)
{
va_list ap;
-char buf[10];
+static char buf[10];
char *s;
unsigned u;
int c;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r219225 - head/sys/boot/pc98/boot2
Author: nyan
Date: Thu Mar 3 11:45:54 2011
New Revision: 219225
URL: http://svn.freebsd.org/changeset/base/219225
Log:
MFi386: revision 219186
This patch shrinks boot2 a little.
oIt switches kname to be just a pointer instead of an array.
oIt changes ioctl to unsigned from uint8_t.
oIt changes the second keyhit limit to 3 seconds from 5.
oIt removes bi_basemem/bi_extmem/bi_memsizes_valid setting.
Modified:
head/sys/boot/pc98/boot2/boot2.c
Modified: head/sys/boot/pc98/boot2/boot2.c
==
--- head/sys/boot/pc98/boot2/boot2.cThu Mar 3 11:31:08 2011
(r219224)
+++ head/sys/boot/pc98/boot2/boot2.cThu Mar 3 11:45:54 2011
(r219225)
@@ -133,11 +133,11 @@ static struct dsk {
unsigned start;
} dsk;
static char cmd[512], cmddup[512];
-static char kname[1024];
+static const char *kname = NULL;
static uint32_t opts;
static int comspeed = SIOSPD;
static struct bootinfo bootinfo;
-static uint8_t ioctrl = IO_KEYBOARD;
+static unsigned ioctrl = IO_KEYBOARD;
void exit(int);
static void load(void);
@@ -146,7 +146,6 @@ static int xfsread(ino_t, void *, size_t
static int dskread(void *, unsigned, unsigned);
static void printf(const char *,...);
static void putchar(int);
-static uint32_t memsize(void);
static int drvread(void *, unsigned);
static int keyhit(unsigned);
static int xputc(int);
@@ -184,13 +183,6 @@ xfsread(ino_t inode, void *buf, size_t n
return 0;
}
-static inline uint32_t
-memsize(void)
-{
-return (*(u_char *)PTOV(0x401) * 128 * 1024 +
- *(uint16_t *)PTOV(0x594) * 1024 * 1024);
-}
-
static inline void
getstr(void)
{
@@ -382,9 +374,6 @@ main(void)
#endif
bootinfo.bi_version = BOOTINFO_VERSION;
bootinfo.bi_size = sizeof(bootinfo);
-bootinfo.bi_basemem = 0; /* XXX will be filled by loader or kernel */
-bootinfo.bi_extmem = memsize();
-bootinfo.bi_memsizes_valid++;
/* Process configuration file */
@@ -408,11 +397,11 @@ main(void)
* or in case of failure, try to load a kernel directly instead.
*/
-if (autoboot && !*kname) {
- memcpy(kname, PATH_BOOT3, sizeof(PATH_BOOT3));
+if (autoboot && !kname) {
+ kname = PATH_BOOT3;
if (!keyhit(3*SECOND)) {
load();
- memcpy(kname, PATH_KERNEL, sizeof(PATH_KERNEL));
+ kname = PATH_KERNEL;
}
}
@@ -427,7 +416,7 @@ main(void)
'a' + dsk.part, kname);
if (ioctrl & IO_SERIAL)
sio_flush();
- if (!autoboot || keyhit(5*SECOND))
+ if (!autoboot || keyhit(3*SECOND))
getstr();
else if (!autoboot || !OPT_CHECK(RBX_QUIET))
putchar('\n');
@@ -611,11 +600,7 @@ parse()
dsk.daua = dsk.disk | dsk.unit;
dsk_meta = 0;
}
- if ((i = ep - arg)) {
- if ((size_t)i >= sizeof(kname))
- return -1;
- memcpy(kname, arg, i + 1);
- }
+kname = arg;
}
arg = p;
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r218946 - head/sys/boot/pc98/boot2
Author: nyan
Date: Tue Feb 22 13:52:03 2011
New Revision: 218946
URL: http://svn.freebsd.org/changeset/base/218946
Log:
MFi386: revision 218926
In sys/boot/i386/boot2/boot2.c, change the type of the 'opts' variable
from uint16_t back to uint32_t. The actual option bitmasks (RB_* and
RBX_*) assume at least a 32 bit variable.
Submitted by: rdivacky
Modified:
head/sys/boot/pc98/boot2/boot2.c
Modified: head/sys/boot/pc98/boot2/boot2.c
==
--- head/sys/boot/pc98/boot2/boot2.cTue Feb 22 10:09:34 2011
(r218945)
+++ head/sys/boot/pc98/boot2/boot2.cTue Feb 22 13:52:03 2011
(r218946)
@@ -134,7 +134,7 @@ static struct dsk {
} dsk;
static char cmd[512], cmddup[512];
static char kname[1024];
-static uint16_t opts;
+static uint32_t opts;
static int comspeed = SIOSPD;
static struct bootinfo bootinfo;
static uint8_t ioctrl = IO_KEYBOARD;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r218845 - head/sys/geom/part
Author: nyan
Date: Sat Feb 19 11:09:38 2011
New Revision: 218845
URL: http://svn.freebsd.org/changeset/base/218845
Log:
Add support to set a slice name.
Modified:
head/sys/geom/part/g_part_pc98.c
Modified: head/sys/geom/part/g_part_pc98.c
==
--- head/sys/geom/part/g_part_pc98.cSat Feb 19 11:06:00 2011
(r218844)
+++ head/sys/geom/part/g_part_pc98.cSat Feb 19 11:09:38 2011
(r218845)
@@ -140,6 +140,20 @@ pc98_parse_type(const char *type, u_char
return (EINVAL);
}
+static int
+pc98_set_slicename(const char *label, u_char *dp_name)
+{
+ int len;
+
+ len = strlen(label);
+ if (len > sizeof(((struct pc98_partition *)NULL)->dp_name))
+ return (EINVAL);
+ bzero(dp_name, sizeof(((struct pc98_partition *)NULL)->dp_name));
+ strncpy(dp_name, label, len);
+
+ return (0);
+}
+
static void
pc98_set_chs(struct g_part_table *table, uint32_t lba, u_short *cylp,
u_char *hdp, u_char *secp)
@@ -164,9 +178,7 @@ g_part_pc98_add(struct g_part_table *bas
struct g_part_pc98_entry *entry;
struct g_part_pc98_table *table;
uint32_t cyl, start, size;
-
- if (gpp->gpp_parms & G_PART_PARM_LABEL)
- return (EINVAL);
+ int error;
cyl = basetable->gpt_heads * basetable->gpt_sectors;
@@ -199,8 +211,16 @@ g_part_pc98_add(struct g_part_table *bas
&entry->ent.dp_shd, &entry->ent.dp_ssect);
pc98_set_chs(basetable, baseentry->gpe_end, &entry->ent.dp_ecyl,
&entry->ent.dp_ehd, &entry->ent.dp_esect);
- return (pc98_parse_type(gpp->gpp_type, &entry->ent.dp_mid,
- &entry->ent.dp_sid));
+
+ error = pc98_parse_type(gpp->gpp_type, &entry->ent.dp_mid,
+ &entry->ent.dp_sid);
+ if (error)
+ return (error);
+
+ if (gpp->gpp_parms & G_PART_PARM_LABEL)
+ return (pc98_set_slicename(gpp->gpp_label, entry->ent.dp_name));
+
+ return (0);
}
static int
@@ -231,7 +251,7 @@ g_part_pc98_create(struct g_part_table *
pp = gpp->gpp_provider;
cp = LIST_FIRST(&pp->consumers);
- if (pp->sectorsize < SECSIZE || pp->mediasize < 2 * SECSIZE)
+ if (pp->sectorsize < SECSIZE || pp->mediasize < BOOTSIZE)
return (ENOSPC);
if (pp->sectorsize > SECSIZE)
return (ENXIO);
@@ -305,14 +325,20 @@ g_part_pc98_modify(struct g_part_table *
struct g_part_entry *baseentry, struct g_part_parms *gpp)
{
struct g_part_pc98_entry *entry;
+ int error;
+
+ entry = (struct g_part_pc98_entry *)baseentry;
+
+ if (gpp->gpp_parms & G_PART_PARM_TYPE) {
+ error = pc98_parse_type(gpp->gpp_type, &entry->ent.dp_mid,
+ &entry->ent.dp_sid);
+ if (error)
+ return (error);
+ }
if (gpp->gpp_parms & G_PART_PARM_LABEL)
- return (EINVAL);
+ return (pc98_set_slicename(gpp->gpp_label, entry->ent.dp_name));
- entry = (struct g_part_pc98_entry *)baseentry;
- if (gpp->gpp_parms & G_PART_PARM_TYPE)
- return (pc98_parse_type(gpp->gpp_type, &entry->ent.dp_mid,
- &entry->ent.dp_sid));
return (0);
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r218843 - head/sys/pc98/pc98
Author: nyan
Date: Sat Feb 19 10:36:05 2011
New Revision: 218843
URL: http://svn.freebsd.org/changeset/base/218843
Log:
MFi386: revision 218744
To avoid excessive code duplication create wrapper for fill regs
from stack frame.
Modified:
head/sys/pc98/pc98/machdep.c
Modified: head/sys/pc98/pc98/machdep.c
==
--- head/sys/pc98/pc98/machdep.cSat Feb 19 10:32:12 2011
(r218842)
+++ head/sys/pc98/pc98/machdep.cSat Feb 19 10:36:05 2011
(r218843)
@@ -2458,6 +2458,13 @@ fill_regs(struct thread *td, struct reg
tp = td->td_frame;
pcb = td->td_pcb;
+ regs->r_gs = pcb->pcb_gs;
+ return (fill_frame_regs(tp, regs));
+}
+
+int
+fill_frame_regs(struct trapframe *tp, struct reg *regs)
+{
regs->r_fs = tp->tf_fs;
regs->r_es = tp->tf_es;
regs->r_ds = tp->tf_ds;
@@ -2473,7 +2480,6 @@ fill_regs(struct thread *td, struct reg
regs->r_eflags = tp->tf_eflags;
regs->r_esp = tp->tf_esp;
regs->r_ss = tp->tf_ss;
- regs->r_gs = pcb->pcb_gs;
return (0);
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r218842 - head/sys/boot/pc98/boot2
Author: nyan
Date: Sat Feb 19 10:32:12 2011
New Revision: 218842
URL: http://svn.freebsd.org/changeset/base/218842
Log:
MFi386: revision 218745
Remove reading of symbols from a.out loaded files.
Modified:
head/sys/boot/pc98/boot2/boot2.c
Modified: head/sys/boot/pc98/boot2/boot2.c
==
--- head/sys/boot/pc98/boot2/boot2.cSat Feb 19 09:33:53 2011
(r218841)
+++ head/sys/boot/pc98/boot2/boot2.cSat Feb 19 10:32:12 2011
(r218842)
@@ -484,23 +484,6 @@ load(void)
p += roundup2(hdr.ex.a_text, PAGE_SIZE);
if (xfsread(ino, p, hdr.ex.a_data))
return;
- p += hdr.ex.a_data + roundup2(hdr.ex.a_bss, PAGE_SIZE);
- bootinfo.bi_symtab = VTOP(p);
- *(uint32_t*)p = hdr.ex.a_syms;
- p += sizeof(hdr.ex.a_syms);
- if (hdr.ex.a_syms) {
- if (xfsread(ino, p, hdr.ex.a_syms))
- return;
- p += hdr.ex.a_syms;
- if (xfsread(ino, p, sizeof(int)))
- return;
- x = *(uint32_t *)p;
- p += sizeof(int);
- x -= sizeof(int);
- if (xfsread(ino, p, x))
- return;
- p += x;
- }
} else {
fs_off = hdr.eh.e_phoff;
for (j = i = 0; i < hdr.eh.e_phnum && j < 2; i++) {
@@ -532,8 +515,8 @@ load(void)
}
}
addr = hdr.eh.e_entry & 0xff;
+ bootinfo.bi_esymtab = VTOP(p);
}
-bootinfo.bi_esymtab = VTOP(p);
bootinfo.bi_kernelname = VTOP(kname);
bootinfo.bi_bios_dev = dsk.daua;
__exec((caddr_t)addr, RB_BOOTINFO | (opts & RBX_MASK),
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r218737 - head/sys/boot/pc98/boot2
Author: nyan
Date: Wed Feb 16 15:20:37 2011
New Revision: 218737
URL: http://svn.freebsd.org/changeset/base/218737
Log:
MFi386: revision 218713
Apply a few small optimizations to boot2's code, to make it shrink a
little further.
Modified:
head/sys/boot/pc98/boot2/boot2.c
Modified: head/sys/boot/pc98/boot2/boot2.c
==
--- head/sys/boot/pc98/boot2/boot2.cWed Feb 16 15:19:31 2011
(r218736)
+++ head/sys/boot/pc98/boot2/boot2.cWed Feb 16 15:20:37 2011
(r218737)
@@ -134,7 +134,7 @@ static struct dsk {
} dsk;
static char cmd[512], cmddup[512];
static char kname[1024];
-static uint32_t opts;
+static uint16_t opts;
static int comspeed = SIOSPD;
static struct bootinfo bootinfo;
static uint8_t ioctrl = IO_KEYBOARD;
@@ -360,7 +360,7 @@ main(void)
#ifdef GET_BIOSGEOM
int i;
#endif
-int autoboot;
+uint8_t autoboot;
ino_t ino;
dmadat = (void *)(roundup2(__base + (int32_t)&_end, 0x1) - __base);
@@ -457,7 +457,8 @@ load(void)
caddr_t p;
ino_t ino;
uint32_t addr, x;
-int fmt, i, j;
+int i, j;
+uint8_t fmt;
if (!(ino = lookup(kname))) {
if (!ls)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
