CVS commit: src/sys/arch/hpcmips/vr
Module Name:src Committed By: thorpej Date: Sat May 22 16:00:42 UTC 2021 Modified Files: src/sys/arch/hpcmips/vr: vrgiu.c Log Message: Be explicit about our interface attributes. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/arch/hpcmips/vr/vrgiu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/vr/vrgiu.c diff -u src/sys/arch/hpcmips/vr/vrgiu.c:1.45 src/sys/arch/hpcmips/vr/vrgiu.c:1.46 --- src/sys/arch/hpcmips/vr/vrgiu.c:1.45 Sat Apr 24 23:36:38 2021 +++ src/sys/arch/hpcmips/vr/vrgiu.c Sat May 22 16:00:42 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: vrgiu.c,v 1.45 2021/04/24 23:36:38 thorpej Exp $ */ +/* $NetBSD: vrgiu.c,v 1.46 2021/05/22 16:00:42 thorpej Exp $ */ /*- * Copyright (c) 1999-2001 * Shin Takemura and PocketBSD Project. All rights reserved. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vrgiu.c,v 1.45 2021/04/24 23:36:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vrgiu.c,v 1.46 2021/05/22 16:00:42 thorpej Exp $"); #include #include @@ -268,7 +268,9 @@ vrgiu_attach(device_t parent, device_t s haa.haa_sc = sc; haa.haa_getchip = vrgiu_getchip; haa.haa_iot = sc->sc_iot; - while (config_found(self, , vrgiu_print, CFARG_EOL)) ; + while (config_found(self, , vrgiu_print, + CFARG_IATTR, "hpcioif", + CFARG_EOL)) ; /* * GIU-ISA bridge */ @@ -289,7 +291,9 @@ vrgiu_callback(device_t self) haa.haa_sc = sc; haa.haa_getchip = vrgiu_getchip; haa.haa_iot = sc->sc_iot; - config_found(self, , vrgiu_print, CFARG_EOL); + config_found(self, , vrgiu_print, + CFARG_IATTR, "vrisabif", + CFARG_EOL); } int
CVS commit: src/sys/arch/hpcmips/dev
Module Name:src
Committed By: thorpej
Date: Sun Apr 25 18:26:15 UTC 2021
Modified Files:
src/sys/arch/hpcmips/dev: it8368.c
Log Message:
it8368_attach_socket(): Pass the device_t to config_found(), not the
softc. This was missed due to a (void *) cast when the device_t / softc
split changes occurred.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/hpcmips/dev/it8368.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/dev/it8368.c
diff -u src/sys/arch/hpcmips/dev/it8368.c:1.25 src/sys/arch/hpcmips/dev/it8368.c:1.26
--- src/sys/arch/hpcmips/dev/it8368.c:1.25 Sat Apr 24 23:36:38 2021
+++ src/sys/arch/hpcmips/dev/it8368.c Sun Apr 25 18:26:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: it8368.c,v 1.25 2021/04/24 23:36:38 thorpej Exp $ */
+/* $NetBSD: it8368.c,v 1.26 2021/04/25 18:26:15 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: it8368.c,v 1.25 2021/04/24 23:36:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: it8368.c,v 1.26 2021/04/25 18:26:15 thorpej Exp $");
#undef WINCE_DEFAULT_SETTING /* for debug */
#undef IT8368DEBUG
@@ -381,7 +381,8 @@ it8368_attach_socket(struct it8368e_soft
paa.pct = (pcmcia_chipset_tag_t)_functions;
paa.pch = (pcmcia_chipset_handle_t)sc;
- if ((sc->sc_pcmcia = config_found(sc, , it8368_print, CFARG_EOL))) {
+ if ((sc->sc_pcmcia = config_found(sc->sc_dev, , it8368_print,
+ CFARG_EOL))) {
it8368_init_socket(sc);
}
}
CVS commit: src/sys/arch/hpcmips/vr
Module Name:src
Committed By: skrll
Date: Wed Jan 13 06:39:47 UTC 2021
Modified Files:
src/sys/arch/hpcmips/vr: vraiu.c
Log Message:
Don't advertise AUDIO_PROP_CAPTURE - no capture method is provided
[ 1.000] audio0 at vraiu0: missing capture method
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hpcmips/vr/vraiu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/vr/vraiu.c
diff -u src/sys/arch/hpcmips/vr/vraiu.c:1.19 src/sys/arch/hpcmips/vr/vraiu.c:1.20
--- src/sys/arch/hpcmips/vr/vraiu.c:1.19 Sun Feb 23 04:02:46 2020
+++ src/sys/arch/hpcmips/vr/vraiu.c Wed Jan 13 06:39:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vraiu.c,v 1.19 2020/02/23 04:02:46 isaki Exp $ */
+/* $NetBSD: vraiu.c,v 1.20 2021/01/13 06:39:46 skrll Exp $ */
/*
* Copyright (c) 2001 HAMAJIMA Katsuomi. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vraiu.c,v 1.19 2020/02/23 04:02:46 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vraiu.c,v 1.20 2021/01/13 06:39:46 skrll Exp $");
#include
#include
@@ -493,7 +493,7 @@ vraiu_get_props(void *self)
{
DPRINTFN(3, ("vraiu_get_props\n"));
- return AUDIO_PROP_PLAYBACK | AUDIO_PROP_CAPTURE;
+ return AUDIO_PROP_PLAYBACK;
}
void
CVS commit: src/sys/arch/hpcmips/conf
Module Name:src Committed By: skrll Date: Tue Jan 12 08:03:19 UTC 2021 Modified Files: src/sys/arch/hpcmips/conf: GENERIC Log Message: Turn on DIAGNOSTIC to help track down problem in hpcmips test runs To generate a diff of this commit: cvs rdiff -u -r1.243 -r1.244 src/sys/arch/hpcmips/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/conf/GENERIC diff -u src/sys/arch/hpcmips/conf/GENERIC:1.243 src/sys/arch/hpcmips/conf/GENERIC:1.244 --- src/sys/arch/hpcmips/conf/GENERIC:1.243 Sat Aug 1 08:20:49 2020 +++ src/sys/arch/hpcmips/conf/GENERIC Tue Jan 12 08:03:19 2021 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.243 2020/08/01 08:20:49 maxv Exp $ +# $NetBSD: GENERIC,v 1.244 2021/01/12 08:03:19 skrll Exp $ # # GENERIC machine description file # @@ -24,7 +24,7 @@ include "arch/hpcmips/conf/std.hpcmips. options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.243 $" +#ident "GENERIC-$Revision: 1.244 $" maxusers 16 @@ -47,7 +47,7 @@ options DDB # in-kernel debugger #options DDB_ONPANIC=0 # don't enter debugger on panic options DDB_HISTORY_SIZE=512 # enable history editing in DDB #options KGDB # remote debugger -#options DIAGNOSTIC # extra kernel debugging checks +options DIAGNOSTIC # extra kernel debugging checks #options DEBUG # extra kernel debugging support options KTRACE # system call tracing support options MSGBUFSIZE=8192 # dmesg buffer size
CVS commit: src/sys/arch/hpcmips
Module Name:src
Committed By: thorpej
Date: Sat Nov 21 21:23:49 UTC 2020
Modified Files:
src/sys/arch/hpcmips/dev: plum.c plumiobus.c plumohci.c ucbsnd.c
src/sys/arch/hpcmips/hpcmips: bus_dma.c
src/sys/arch/hpcmips/tx: tx39icu.c txcom.c
src/sys/arch/hpcmips/vr: flash_vrip.c vr4181giu.c vrc4172gpio.c vrgiu.c
Log Message:
malloc(9) -> kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hpcmips/dev/plum.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hpcmips/dev/plumiobus.c \
src/sys/arch/hpcmips/dev/plumohci.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/hpcmips/dev/ucbsnd.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/hpcmips/hpcmips/bus_dma.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/hpcmips/tx/tx39icu.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/hpcmips/tx/txcom.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hpcmips/vr/flash_vrip.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hpcmips/vr/vr4181giu.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hpcmips/vr/vrc4172gpio.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/hpcmips/vr/vrgiu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/dev/plum.c
diff -u src/sys/arch/hpcmips/dev/plum.c:1.17 src/sys/arch/hpcmips/dev/plum.c:1.18
--- src/sys/arch/hpcmips/dev/plum.c:1.17 Sun Nov 10 21:16:28 2019
+++ src/sys/arch/hpcmips/dev/plum.c Sat Nov 21 21:23:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: plum.c,v 1.17 2019/11/10 21:16:28 chs Exp $ */
+/* $NetBSD: plum.c,v 1.18 2020/11/21 21:23:48 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,12 +30,12 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: plum.c,v 1.17 2019/11/10 21:16:28 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plum.c,v 1.18 2020/11/21 21:23:48 thorpej Exp $");
#include
#include
#include
-#include
+#include
#include
#include
@@ -103,8 +103,7 @@ plum_attach(device_t parent, device_t se
printf(": Plum2 #2\n");
break;
}
- sc->sc_pc = malloc(sizeof(struct plum_chipset_tag),
- M_DEVBUF, M_WAITOK | M_ZERO);
+ sc->sc_pc = kmem_zalloc(sizeof(struct plum_chipset_tag), KM_SLEEP);
sc->sc_pc->pc_tc = ca->ca_tc;
/* Attach Plum devices */
Index: src/sys/arch/hpcmips/dev/plumiobus.c
diff -u src/sys/arch/hpcmips/dev/plumiobus.c:1.15 src/sys/arch/hpcmips/dev/plumiobus.c:1.16
--- src/sys/arch/hpcmips/dev/plumiobus.c:1.15 Sun Nov 10 21:16:28 2019
+++ src/sys/arch/hpcmips/dev/plumiobus.c Sat Nov 21 21:23:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: plumiobus.c,v 1.15 2019/11/10 21:16:28 chs Exp $ */
+/* $NetBSD: plumiobus.c,v 1.16 2020/11/21 21:23:48 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: plumiobus.c,v 1.15 2019/11/10 21:16:28 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plumiobus.c,v 1.16 2020/11/21 21:23:48 thorpej Exp $");
#define PLUMIOBUSDEBUG
#include
#include
#include
-#include
+#include
#include
#include
@@ -172,7 +172,7 @@ __plumiobus_subregion(bus_space_tag_t t,
{
struct hpcmips_bus_space *hbs;
- hbs = malloc(sizeof(*hbs), M_DEVBUF, M_WAITOK);
+ hbs = kmem_alloc(sizeof(*hbs), KM_SLEEP);
*hbs = *t;
hbs->t_base += ofs;
hbs->t_size = size;
Index: src/sys/arch/hpcmips/dev/plumohci.c
diff -u src/sys/arch/hpcmips/dev/plumohci.c:1.15 src/sys/arch/hpcmips/dev/plumohci.c:1.16
--- src/sys/arch/hpcmips/dev/plumohci.c:1.15 Sat Apr 23 10:15:29 2016
+++ src/sys/arch/hpcmips/dev/plumohci.c Sat Nov 21 21:23:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: plumohci.c,v 1.15 2016/04/23 10:15:29 skrll Exp $ */
+/* $NetBSD: plumohci.c,v 1.16 2020/11/21 21:23:48 thorpej Exp $ */
/*-
* Copyright (c) 2000 UCHIYAMA Yasushi
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: plumohci.c,v 1.15 2016/04/23 10:15:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plumohci.c,v 1.16 2020/11/21 21:23:48 thorpej Exp $");
#include
#include
@@ -43,6 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: plumohci.c,v
#include
#include
#include
+#include
/* busdma */
#include
@@ -247,7 +248,7 @@ __plumohci_dmamem_alloc(bus_dma_tag_t tx
pmap_extract(pmap_kernel(), (vaddr_t)caddr, );
- ps = malloc(sizeof(struct plumohci_shm), M_DEVBUF, M_NOWAIT);
+ ps = kmem_intr_alloc(sizeof(struct plumohci_shm), KM_NOSLEEP);
if (ps == 0)
return 1;
@@ -276,7 +277,7 @@ __plumohci_dmamem_free(bus_dma_tag_t tx,
if (ps->ps_paddr == segs[0].ds_addr) {
bus_space_free(sc->sc.iot, ps->ps_bsh, ps->ps_size);
LIST_REMOVE(ps, ps_link);
- free(ps, M_DEVBUF);
+ kmem_intr_free(ps, sizeof(*ps));
return;
}
Index: src/sys/arch/hpcmips/dev/ucbsnd.c
diff -u src/sys/arch/hpcmips/dev/ucbsnd.c:1.25 src/sys/arch/hpcmips/dev/ucbsnd.c:1.26
--- src/sys/arch/hpcmips/dev/ucbsnd.c:1.25 Sat Dec 17 03:46:52 2016
+++ src/sys/arch/hpcmips/dev/ucbsnd.c Sat Nov 21 21:23:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ucbsnd.c,v 1.25 2016/12/17
CVS commit: src/sys/arch/hpcmips/hpcmips
Module Name:src
Committed By: sevan
Date: Mon Feb 17 22:52:18 UTC 2020
Modified Files:
src/sys/arch/hpcmips/hpcmips: hpcapm_machdep.c
Log Message:
spelling
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hpcmips/hpcmips/hpcapm_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/hpcmips/hpcapm_machdep.c
diff -u src/sys/arch/hpcmips/hpcmips/hpcapm_machdep.c:1.5 src/sys/arch/hpcmips/hpcmips/hpcapm_machdep.c:1.6
--- src/sys/arch/hpcmips/hpcmips/hpcapm_machdep.c:1.5 Wed Mar 16 13:23:41 2011
+++ src/sys/arch/hpcmips/hpcmips/hpcapm_machdep.c Mon Feb 17 22:52:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcapm_machdep.c,v 1.5 2011/03/16 13:23:41 tsutsui Exp $ */
+/* $NetBSD: hpcapm_machdep.c,v 1.6 2020/02/17 22:52:18 sevan Exp $ */
/*
* Copyright (c) 2000 Takemura Shin
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: hpcapm_machdep.c,v 1.5 2011/03/16 13:23:41 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcapm_machdep.c,v 1.6 2020/02/17 22:52:18 sevan Exp $");
#include
#include
@@ -67,8 +67,8 @@ machine_standby(void)
vrip_splpiu();
/*
- * STANDBY instruction puts the CPU into power saveing
- * state until some interrupt occuer.
+ * STANDBY instruction puts the CPU into power saving
+ * state until some interrupt occurs.
* It sleeps until you push the power button.
*/
__asm(".set noreorder");
@@ -99,8 +99,8 @@ machine_sleep(void)
vrip_splpiu();
/*
- * SUSPEND instruction puts the CPU into power saveing
- * state until some interrupt occuer.
+ * SUSPEND instruction puts the CPU into power saving
+ * state until some interrupt occurs.
* It sleeps until you push the power button.
*/
__asm(".set noreorder");
CVS commit: src/sys/arch/hpcmips/include
Module Name:src Committed By: christos Date: Thu Mar 28 08:33:07 UTC 2019 Modified Files: src/sys/arch/hpcmips/include: vmparam.h Log Message: protect kernel variables To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hpcmips/include/vmparam.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/include/vmparam.h diff -u src/sys/arch/hpcmips/include/vmparam.h:1.5 src/sys/arch/hpcmips/include/vmparam.h:1.6 --- src/sys/arch/hpcmips/include/vmparam.h:1.5 Sun Dec 13 19:46:04 2009 +++ src/sys/arch/hpcmips/include/vmparam.h Thu Mar 28 04:33:07 2019 @@ -1,9 +1,11 @@ -/* $NetBSD: vmparam.h,v 1.5 2009/12/14 00:46:04 matt Exp $ */ +/* $NetBSD: vmparam.h,v 1.6 2019/03/28 08:33:07 christos Exp $ */ #include +#ifdef _KERNEL #include #define VM_PHYSSEG_MAX 5 extern phys_ram_seg_t mem_clusters[]; extern int mem_cluster_cnt; +#endif
CVS commit: src/sys/arch/hpcmips/stand/libsa
Module Name:src
Committed By: christos
Date: Tue Aug 1 11:58:45 UTC 2017
Modified Files:
src/sys/arch/hpcmips/stand/libsa: devopen.c
Log Message:
PR/52446: Devid Binderman: Fix error checking for wcstombs
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hpcmips/stand/libsa/devopen.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/stand/libsa/devopen.c
diff -u src/sys/arch/hpcmips/stand/libsa/devopen.c:1.6 src/sys/arch/hpcmips/stand/libsa/devopen.c:1.7
--- src/sys/arch/hpcmips/stand/libsa/devopen.c:1.6 Sat Mar 14 17:04:09 2009
+++ src/sys/arch/hpcmips/stand/libsa/devopen.c Tue Aug 1 07:58:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: devopen.c,v 1.6 2009/03/14 21:04:09 dsl Exp $ */
+/* $NetBSD: devopen.c,v 1.7 2017/08/01 11:58:45 christos Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura.
@@ -80,7 +80,7 @@ parsebootfile(const char *fnamexx, char
} else {
static char name[1024]; /* XXX */
- if (wcstombs(name, (TCHAR*)fname, sizeof(name)) < 0) {
+ if (wcstombs(name, (TCHAR*)fname, sizeof(name)) == (size_t)-1) {
return (ENOENT);
}
if ('1' <= name[0] && name[0] <= '9' && name[1] == ':') {
CVS commit: src/sys/arch/hpcmips/stand/pbsdboot
Module Name:src
Committed By: christos
Date: Tue Aug 1 11:56:58 UTC 2017
Modified Files:
src/sys/arch/hpcmips/stand/pbsdboot: main.c
Log Message:
PR/52445: David Binderman: Fix wcstombs error checking
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/hpcmips/stand/pbsdboot/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/stand/pbsdboot/main.c
diff -u src/sys/arch/hpcmips/stand/pbsdboot/main.c:1.62 src/sys/arch/hpcmips/stand/pbsdboot/main.c:1.63
--- src/sys/arch/hpcmips/stand/pbsdboot/main.c:1.62 Fri Dec 14 16:15:52 2007
+++ src/sys/arch/hpcmips/stand/pbsdboot/main.c Tue Aug 1 07:56:58 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.62 2007/12/14 21:15:52 pavel Exp $ */
+/* $NetBSD: main.c,v 1.63 2017/08/01 11:56:58 christos Exp $ */
/*-
* Copyright (c) 1999, 2000 Shin Takemura.
@@ -1114,13 +1114,11 @@ BOOL BootKernel(int directboot)
szAppName, MB_OK);
return FALSE;
}
- GetDlgItemText(hDlgMain, IDC_OPTIONS,
- woptions, sizeof(woptions));
- if (wcstombs(options, woptions, sizeof(options)) < 0 ||
- wcstombs(kernel_name, wkernel_name,
- sizeof(kernel_name)) < 0) {
- MessageBox (NULL, TEXT("invalid character"),
- szAppName, MB_OK);
+ GetDlgItemText(hDlgMain, IDC_OPTIONS, woptions, sizeof(woptions));
+ if (wcstombs(options, woptions, sizeof(options)) == (size_t)-1 ||
+ wcstombs(kernel_name, wkernel_name, sizeof(kernel_name))
+ == (size_t)-1) {
+ MessageBox(NULL, TEXT("invalid character"), szAppName, MB_OK);
return FALSE;
}
@@ -1209,8 +1207,8 @@ BOOL BootKernel(int directboot)
platid.dw.dw0 = bi.platid_cpu;
platid.dw.dw1 = bi.platid_machine;
if (set_system_info()) {
- /*
- * boot !
+ /*
+ * boot !
*/
pbsdboot(wkernel_name, argc, argv, );
}
CVS commit: src/sys/arch/hpcmips/hpcmips
Module Name:src
Committed By: skrll
Date: Sun May 7 12:22:22 UTC 2017
Modified Files:
src/sys/arch/hpcmips/hpcmips: machdep.c
Log Message:
When compiled with DEBUG/DIAGNOSTIC memset uses the stack so don't ask
it to overwrite it. 64 bytes is enough stack for any memset.
To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 src/sys/arch/hpcmips/hpcmips/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/hpcmips/machdep.c
diff -u src/sys/arch/hpcmips/hpcmips/machdep.c:1.122 src/sys/arch/hpcmips/hpcmips/machdep.c:1.123
--- src/sys/arch/hpcmips/hpcmips/machdep.c:1.122 Sun May 7 12:20:50 2017
+++ src/sys/arch/hpcmips/hpcmips/machdep.c Sun May 7 12:22:22 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.122 2017/05/07 12:20:50 skrll Exp $ */
+/* $NetBSD: machdep.c,v 1.123 2017/05/07 12:22:22 skrll Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura, All rights reserved.
@@ -69,7 +69,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.122 2017/05/07 12:20:50 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.123 2017/05/07 12:22:22 skrll Exp $");
#include "opt_vr41xx.h"
#include "opt_tx39xx.h"
@@ -427,7 +427,7 @@ mach_init(int argc, char *argv[], struct
u_int32_t sp;
__asm volatile("move %0, $29" : "=r"(sp));
KDASSERT(sp > KERNBASE + 0x400);
- memset((void *)(KERNBASE + 0x400), 0, sp - (KERNBASE + 0x400));
+ memset((void *)(KERNBASE + 0x400), 0, sp - (KERNBASE + 0x400) - 64);
}
printf("mem_cluster_cnt = %d\n", mem_cluster_cnt);
CVS commit: src/sys/arch/hpcmips/hpcmips
Module Name:src
Committed By: skrll
Date: Sun May 7 12:20:50 UTC 2017
Modified Files:
src/sys/arch/hpcmips/hpcmips: machdep.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/sys/arch/hpcmips/hpcmips/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/hpcmips/machdep.c
diff -u src/sys/arch/hpcmips/hpcmips/machdep.c:1.121 src/sys/arch/hpcmips/hpcmips/machdep.c:1.122
--- src/sys/arch/hpcmips/hpcmips/machdep.c:1.121 Thu Dec 22 14:47:57 2016
+++ src/sys/arch/hpcmips/hpcmips/machdep.c Sun May 7 12:20:50 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.121 2016/12/22 14:47:57 cherry Exp $ */
+/* $NetBSD: machdep.c,v 1.122 2017/05/07 12:20:50 skrll Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura, All rights reserved.
@@ -69,7 +69,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.121 2016/12/22 14:47:57 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.122 2017/05/07 12:20:50 skrll Exp $");
#include "opt_vr41xx.h"
#include "opt_tx39xx.h"
@@ -129,7 +129,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include
#endif
-#if NBICONSDEV > 0
+#if NBICONSDEV > 0
#include
#include
#include
@@ -193,13 +193,13 @@ extern void stacktrace(void); /*XXX*/
/*
* Do all the stuff that locore normally does before calling main().
- * Process arguments passed to us by the boot loader.
+ * Process arguments passed to us by the boot loader.
* Return the first page address following the system.
*/
void
mach_init(int argc, char *argv[], struct bootinfo *bi)
{
- /*
+ /*
* this routines stack is never polluted since stack pointer
* is lower than kernel text segment, and at exiting, stack pointer
* is changed to proc0.
@@ -273,8 +273,8 @@ mach_init(int argc, char *argv[], struct
kloader_bootinfo_set(, argc, argv, bi, false);
#endif
- /*
- * CPU core Specific Function Hooks
+ /*
+ * CPU core Specific Function Hooks
*/
#if defined(VR41XX) && defined(TX39XX)
if (platid_match(, _mask_CPU_MIPS_VR_41XX))
@@ -291,8 +291,8 @@ mach_init(int argc, char *argv[], struct
#endif
#if NBICONSDEV > 0
- /*
- * bicons don't need actual device initialize. only bootinfo needed.
+ /*
+ * bicons don't need actual device initialize. only bootinfo needed.
*/
__bicons_enable = (bicons_init() == 0);
if (__bicons_enable)
@@ -419,8 +419,8 @@ mach_init(int argc, char *argv[], struct
#else
(*platform.mem_init)((paddr_t)kernend - MIPS_KSEG0_START);
#endif
- /*
- * Clear currently unused D-RAM area
+ /*
+ * Clear currently unused D-RAM area
* (For reboot Windows CE clearly)
*/
{
CVS commit: src/sys/arch/hpcmips/conf
Module Name:src Committed By: skrll Date: Mon Jul 11 19:36:04 UTC 2016 Modified Files: src/sys/arch/hpcmips/conf: std.hpcmips.vr41 std.lcard Log Message: Adapt to recent mips pmap changes To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hpcmips/conf/std.hpcmips.vr41 cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hpcmips/conf/std.lcard Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/conf/std.hpcmips.vr41 diff -u src/sys/arch/hpcmips/conf/std.hpcmips.vr41:1.11 src/sys/arch/hpcmips/conf/std.hpcmips.vr41:1.12 --- src/sys/arch/hpcmips/conf/std.hpcmips.vr41:1.11 Sun Dec 11 12:17:33 2005 +++ src/sys/arch/hpcmips/conf/std.hpcmips.vr41 Mon Jul 11 19:36:04 2016 @@ -1,11 +1,12 @@ # -# $NetBSD: std.hpcmips.vr41,v 1.11 2005/12/11 12:17:33 christos Exp $ +# $NetBSD: std.hpcmips.vr41,v 1.12 2016/07/11 19:36:04 skrll Exp $ # VR41XX common configuration. # options MIPS3 # R4000/R4400/R4600 CPUs options MIPS3_4100 # VR4100 core options VR41XX # NEC VR41xx series -options MIPS3_NO_PV_UNCACHED +options PMAP_NO_PV_UNCACHED +options ENABLE_MIPS_4KB_PAGE # # Vr4102, 4111, 4121 Index: src/sys/arch/hpcmips/conf/std.lcard diff -u src/sys/arch/hpcmips/conf/std.lcard:1.8 src/sys/arch/hpcmips/conf/std.lcard:1.9 --- src/sys/arch/hpcmips/conf/std.lcard:1.8 Sun Feb 20 07:58:13 2011 +++ src/sys/arch/hpcmips/conf/std.lcard Mon Jul 11 19:36:04 2016 @@ -1,4 +1,4 @@ -# $NetBSD: std.lcard,v 1.8 2011/02/20 07:58:13 matt Exp $ +# $NetBSD: std.lcard,v 1.9 2016/07/11 19:36:04 skrll Exp $ # standard, required hpcmips info machine hpcmips mips @@ -12,7 +12,8 @@ options MIPS3 # R4000/R4400/R4600 CPU options MIPS3_4100 # VR4100 core makeoptions CPUFLAGS="-mips3" # CPU codegen options options VR41XX # NEC VR41xx series -options MIPS3_NO_PV_UNCACHED +options PMAP_NO_PV_UNCACHED +options ENABLE_MIPS_4KB_PAGE options NO_SYMBOLSZ_ENTRY options VR4181 # NEC VR4181
CVS commit: src/sys/arch/hpcmips/tx
Module Name:src Committed By: skrll Date: Sat Jul 9 06:49:03 UTC 2016 Modified Files: src/sys/arch/hpcmips/tx: tx3912video.c Log Message: KNF To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/arch/hpcmips/tx/tx3912video.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/tx/tx3912video.c diff -u src/sys/arch/hpcmips/tx/tx3912video.c:1.43 src/sys/arch/hpcmips/tx/tx3912video.c:1.44 --- src/sys/arch/hpcmips/tx/tx3912video.c:1.43 Sat Jun 7 18:59:16 2014 +++ src/sys/arch/hpcmips/tx/tx3912video.c Sat Jul 9 06:49:03 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: tx3912video.c,v 1.43 2014/06/07 18:59:16 he Exp $ */ +/* $NetBSD: tx3912video.c,v 1.44 2016/07/09 06:49:03 skrll Exp $ */ /*- * Copyright (c) 1999-2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tx3912video.c,v 1.43 2014/06/07 18:59:16 he Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tx3912video.c,v 1.44 2016/07/09 06:49:03 skrll Exp $"); #define TX3912VIDEO_DEBUG @@ -39,11 +39,10 @@ __KERNEL_RCSID(0, "$NetBSD: tx3912video. #include #include +#include #include #include - #include -#include #include
CVS commit: src/sys/arch/hpcmips/dev
Module Name:src Committed By: skrll Date: Thu Jun 30 08:51:06 UTC 2016 Modified Files: src/sys/arch/hpcmips/dev: plumpcmcia.c Log Message: Fix the unused fix To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/hpcmips/dev/plumpcmcia.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/dev/plumpcmcia.c diff -u src/sys/arch/hpcmips/dev/plumpcmcia.c:1.27 src/sys/arch/hpcmips/dev/plumpcmcia.c:1.28 --- src/sys/arch/hpcmips/dev/plumpcmcia.c:1.27 Wed Mar 26 17:53:36 2014 +++ src/sys/arch/hpcmips/dev/plumpcmcia.c Thu Jun 30 08:51:06 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: plumpcmcia.c,v 1.27 2014/03/26 17:53:36 christos Exp $ */ +/* $NetBSD: plumpcmcia.c,v 1.28 2016/06/30 08:51:06 skrll Exp $ */ /* * Copyright (c) 1999, 2000 UCHIYAMA Yasushi. All rights reserved. @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: plumpcmcia.c,v 1.27 2014/03/26 17:53:36 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: plumpcmcia.c,v 1.28 2016/06/30 08:51:06 skrll Exp $"); #include #include @@ -844,6 +844,7 @@ plum_csc_intr_setup(struct plumpcmcia_so bus_space_tag_t regt = ph->ph_regt; bus_space_handle_t regh = ph->ph_regh; plumreg_t reg; + void *ih __diagused; /* enable CARD DETECT ENABLE only */ plum_conf_write(regt, regh, PLUM_PCMCIA_CSCINT, @@ -855,7 +856,7 @@ plum_csc_intr_setup(struct plumpcmcia_so plum_conf_write(regt, regh, PLUM_PCMCIA_GLOBALCTRL, reg); /* install interrupt handler (don't fail) */ - plum_intr_establish(sc->sc_pc, irq, IST_EDGE, IPL_TTY, + ih = plum_intr_establish(sc->sc_pc, irq, IST_EDGE, IPL_TTY, plum_csc_intr, ph); KASSERT(ih != 0); }
CVS commit: src/sys/arch/hpcmips/stand/lcboot
Module Name:src
Committed By: dholland
Date: Sat Jun 11 06:29:24 UTC 2016
Modified Files:
src/sys/arch/hpcmips/stand/lcboot: main.c
Log Message:
PR 51200 gets in libsa considered harmful: use kgets
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hpcmips/stand/lcboot/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/stand/lcboot/main.c
diff -u src/sys/arch/hpcmips/stand/lcboot/main.c:1.6 src/sys/arch/hpcmips/stand/lcboot/main.c:1.7
--- src/sys/arch/hpcmips/stand/lcboot/main.c:1.6 Sat Jan 22 19:19:18 2011
+++ src/sys/arch/hpcmips/stand/lcboot/main.c Sat Jun 11 06:29:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.6 2011/01/22 19:19:18 joerg Exp $ */
+/* $NetBSD: main.c,v 1.7 2016/06/11 06:29:24 dholland Exp $ */
/*
* Copyright (c) 2003 Naoto Shimazaki.
@@ -107,7 +107,7 @@
*
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: main.c,v 1.6 2011/01/22 19:19:18 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: main.c,v 1.7 2016/06/11 06:29:24 dholland Exp $");
#include
@@ -833,7 +833,7 @@ bootmenu(void)
/* input a line */
input[0] = '\0';
printf("> ");
- gets(input);
+ kgets(input, sizeof(input));
cmd = input;
/* skip leading whitespace. */
CVS commit: src/sys/arch/hpcmips/dev
Module Name:src
Committed By: msaitoh
Date: Fri Oct 2 09:05:33 UTC 2015
Modified Files:
src/sys/arch/hpcmips/dev: plum.c
Log Message:
Fix comiple error. plum(4) is not PCI...
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hpcmips/dev/plum.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/dev/plum.c
diff -u src/sys/arch/hpcmips/dev/plum.c:1.15 src/sys/arch/hpcmips/dev/plum.c:1.16
--- src/sys/arch/hpcmips/dev/plum.c:1.15 Fri Oct 2 05:22:50 2015
+++ src/sys/arch/hpcmips/dev/plum.c Fri Oct 2 09:05:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: plum.c,v 1.15 2015/10/02 05:22:50 msaitoh Exp $ */
+/* $NetBSD: plum.c,v 1.16 2015/10/02 09:05:33 msaitoh Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: plum.c,v 1.15 2015/10/02 05:22:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plum.c,v 1.16 2015/10/02 09:05:33 msaitoh Exp $");
#include
#include
@@ -172,9 +172,6 @@ plum_conf_read(bus_space_tag_t t, bus_sp
{
plumreg_t reg;
- if ((unsigned int)o >= PCI_CONF_SIZE)
- return (pcireg_t) -1;
-
reg = bus_space_read_4(t, h, o);
return (reg);
@@ -184,9 +181,6 @@ void
plum_conf_write(bus_space_tag_t t, bus_space_handle_t h, int o, plumreg_t v)
{
- if ((unsigned int)o >= PCI_CONF_SIZE)
- return;
-
bus_space_write_4(t, h, o, v);
}
CVS commit: src/sys/arch/hpcmips/dev
Module Name:src Committed By: matt Date: Fri Jun 26 22:15:33 UTC 2015 Modified Files: src/sys/arch/hpcmips/dev: mq200.c Log Message: Cleanup includes To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/hpcmips/dev/mq200.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/dev/mq200.c diff -u src/sys/arch/hpcmips/dev/mq200.c:1.31 src/sys/arch/hpcmips/dev/mq200.c:1.32 --- src/sys/arch/hpcmips/dev/mq200.c:1.31 Sat Oct 27 17:17:52 2012 +++ src/sys/arch/hpcmips/dev/mq200.c Fri Jun 26 22:15:33 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: mq200.c,v 1.31 2012/10/27 17:17:52 chs Exp $ */ +/* $NetBSD: mq200.c,v 1.32 2015/06/26 22:15:33 matt Exp $ */ /*- * Copyright (c) 2000, 2001 TAKEMURA Shin @@ -30,11 +30,12 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mq200.c,v 1.31 2012/10/27 17:17:52 chs Exp $); +__KERNEL_RCSID(0, $NetBSD: mq200.c,v 1.32 2015/06/26 22:15:33 matt Exp $); #include sys/param.h -#include sys/kernel.h +#include sys/bus.h #include sys/device.h +#include sys/kernel.h #include sys/systm.h #include sys/reboot.h @@ -42,8 +43,9 @@ __KERNEL_RCSID(0, $NetBSD: mq200.c,v 1. #include dev/wscons/wsconsio.h +#include mips/locore.h + #include machine/bootinfo.h -#include machine/bus.h #include machine/autoconf.h #include machine/config_hook.h #include machine/platid.h
CVS commit: src/sys/arch/hpcmips/dev
Module Name:src Committed By: matt Date: Fri Jun 26 22:16:27 UTC 2015 Modified Files: src/sys/arch/hpcmips/dev: ucbsnd.c Log Message: Cleanup includes To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/hpcmips/dev/ucbsnd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/dev/ucbsnd.c diff -u src/sys/arch/hpcmips/dev/ucbsnd.c:1.23 src/sys/arch/hpcmips/dev/ucbsnd.c:1.24 --- src/sys/arch/hpcmips/dev/ucbsnd.c:1.23 Fri Jul 25 08:10:33 2014 +++ src/sys/arch/hpcmips/dev/ucbsnd.c Fri Jun 26 22:16:27 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ucbsnd.c,v 1.23 2014/07/25 08:10:33 dholland Exp $ */ +/* $NetBSD: ucbsnd.c,v 1.24 2015/06/26 22:16:27 matt Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ucbsnd.c,v 1.23 2014/07/25 08:10:33 dholland Exp $); +__KERNEL_RCSID(0, $NetBSD: ucbsnd.c,v 1.24 2015/06/26 22:16:27 matt Exp $); #include opt_use_poll.h @@ -48,12 +48,12 @@ __KERNEL_RCSID(0, $NetBSD: ucbsnd.c,v 1 #include sys/device.h #include sys/proc.h #include sys/endian.h +#include sys/bus.h +#include sys/intr.h +#include mips/locore.h #include mips/cache.h -#include machine/bus.h -#include machine/intr.h - #include hpcmips/tx/tx39var.h #include hpcmips/tx/tx39sibvar.h #include hpcmips/tx/tx39sibreg.h
CVS commit: src/sys/arch/hpcmips/hpcmips
Module Name:src Committed By: matt Date: Fri Jun 26 22:18:00 UTC 2015 Modified Files: src/sys/arch/hpcmips/hpcmips: interrupt.c kloader_machdep.c Log Message: #include mips/locore.h To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hpcmips/hpcmips/interrupt.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hpcmips/hpcmips/kloader_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/hpcmips/interrupt.c diff -u src/sys/arch/hpcmips/hpcmips/interrupt.c:1.19 src/sys/arch/hpcmips/hpcmips/interrupt.c:1.20 --- src/sys/arch/hpcmips/hpcmips/interrupt.c:1.19 Tue Jun 9 22:46:36 2015 +++ src/sys/arch/hpcmips/hpcmips/interrupt.c Fri Jun 26 22:17:59 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: interrupt.c,v 1.19 2015/06/09 22:46:36 matt Exp $ */ +/* $NetBSD: interrupt.c,v 1.20 2015/06/26 22:17:59 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: interrupt.c,v 1.19 2015/06/09 22:46:36 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: interrupt.c,v 1.20 2015/06/26 22:17:59 matt Exp $); #include opt_vr41xx.h #include opt_tx39xx.h @@ -42,6 +42,8 @@ __KERNEL_RCSID(0, $NetBSD: interrupt.c, #include sys/malloc.h #include sys/intr.h +#include mips/locore.h + #include machine/sysconf.h void Index: src/sys/arch/hpcmips/hpcmips/kloader_machdep.c diff -u src/sys/arch/hpcmips/hpcmips/kloader_machdep.c:1.8 src/sys/arch/hpcmips/hpcmips/kloader_machdep.c:1.9 --- src/sys/arch/hpcmips/hpcmips/kloader_machdep.c:1.8 Tue Jun 9 22:46:36 2015 +++ src/sys/arch/hpcmips/hpcmips/kloader_machdep.c Fri Jun 26 22:17:59 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: kloader_machdep.c,v 1.8 2015/06/09 22:46:36 matt Exp $ */ +/* $NetBSD: kloader_machdep.c,v 1.9 2015/06/26 22:17:59 matt Exp $ */ /*- * Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc. @@ -27,12 +27,13 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kloader_machdep.c,v 1.8 2015/06/09 22:46:36 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: kloader_machdep.c,v 1.9 2015/06/26 22:17:59 matt Exp $); #include sys/param.h #include sys/cpu.h #include sys/systm.h +#include mips/locore.h #include mips/cache.h #include machine/sysconf.h
CVS commit: src/sys/arch/hpcmips
Module Name:src Committed By: matt Date: Tue Jun 9 22:46:36 UTC 2015 Modified Files: src/sys/arch/hpcmips/dev: tc5165buf.c src/sys/arch/hpcmips/hpcmips: interrupt.c kloader_machdep.c src/sys/arch/hpcmips/vr: vrdmaau.c vrdsu.c Log Message: #include sys/cpu.h and/or mips/cpuregs.h + other include fixes To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hpcmips/dev/tc5165buf.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hpcmips/hpcmips/interrupt.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hpcmips/hpcmips/kloader_machdep.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hpcmips/vr/vrdmaau.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hpcmips/vr/vrdsu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/dev/tc5165buf.c diff -u src/sys/arch/hpcmips/dev/tc5165buf.c:1.17 src/sys/arch/hpcmips/dev/tc5165buf.c:1.18 --- src/sys/arch/hpcmips/dev/tc5165buf.c:1.17 Sat Oct 27 17:17:53 2012 +++ src/sys/arch/hpcmips/dev/tc5165buf.c Tue Jun 9 22:46:36 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: tc5165buf.c,v 1.17 2012/10/27 17:17:53 chs Exp $ */ +/* $NetBSD: tc5165buf.c,v 1.18 2015/06/09 22:46:36 matt Exp $ */ /*- * Copyright (c) 1999-2001 The NetBSD Foundation, Inc. @@ -35,20 +35,21 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tc5165buf.c,v 1.17 2012/10/27 17:17:53 chs Exp $); +__KERNEL_RCSID(0, $NetBSD: tc5165buf.c,v 1.18 2015/06/09 22:46:36 matt Exp $); #include opt_use_poll.h #include sys/param.h -#include sys/systm.h +#include sys/bus.h #include sys/callout.h #include sys/device.h - -#include machine/bus.h -#include machine/intr.h +#include sys/intr.h +#include sys/systm.h #include dev/hpc/hpckbdvar.h +#include mips/cpuregs.h + #include hpcmips/tx/tx39var.h #include hpcmips/tx/txcsbusvar.h #include hpcmips/dev/tc5165bufvar.h Index: src/sys/arch/hpcmips/hpcmips/interrupt.c diff -u src/sys/arch/hpcmips/hpcmips/interrupt.c:1.18 src/sys/arch/hpcmips/hpcmips/interrupt.c:1.19 --- src/sys/arch/hpcmips/hpcmips/interrupt.c:1.18 Sun Feb 20 07:58:14 2011 +++ src/sys/arch/hpcmips/hpcmips/interrupt.c Tue Jun 9 22:46:36 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: interrupt.c,v 1.18 2011/02/20 07:58:14 matt Exp $ */ +/* $NetBSD: interrupt.c,v 1.19 2015/06/09 22:46:36 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: interrupt.c,v 1.18 2011/02/20 07:58:14 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: interrupt.c,v 1.19 2015/06/09 22:46:36 matt Exp $); #include opt_vr41xx.h #include opt_tx39xx.h @@ -38,6 +38,7 @@ __KERNEL_RCSID(0, $NetBSD: interrupt.c, #define __INTR_PRIVATE #include sys/param.h +#include sys/cpu.h #include sys/malloc.h #include sys/intr.h Index: src/sys/arch/hpcmips/hpcmips/kloader_machdep.c diff -u src/sys/arch/hpcmips/hpcmips/kloader_machdep.c:1.7 src/sys/arch/hpcmips/hpcmips/kloader_machdep.c:1.8 --- src/sys/arch/hpcmips/hpcmips/kloader_machdep.c:1.7 Wed Mar 18 10:22:29 2009 +++ src/sys/arch/hpcmips/hpcmips/kloader_machdep.c Tue Jun 9 22:46:36 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: kloader_machdep.c,v 1.7 2009/03/18 10:22:29 cegger Exp $ */ +/* $NetBSD: kloader_machdep.c,v 1.8 2015/06/09 22:46:36 matt Exp $ */ /*- * Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc. @@ -27,10 +27,12 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kloader_machdep.c,v 1.7 2009/03/18 10:22:29 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: kloader_machdep.c,v 1.8 2015/06/09 22:46:36 matt Exp $); #include sys/param.h +#include sys/cpu.h #include sys/systm.h + #include mips/cache.h #include machine/sysconf.h Index: src/sys/arch/hpcmips/vr/vrdmaau.c diff -u src/sys/arch/hpcmips/vr/vrdmaau.c:1.6 src/sys/arch/hpcmips/vr/vrdmaau.c:1.7 --- src/sys/arch/hpcmips/vr/vrdmaau.c:1.6 Sat Oct 27 17:17:56 2012 +++ src/sys/arch/hpcmips/vr/vrdmaau.c Tue Jun 9 22:46:36 2015 @@ -24,13 +24,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vrdmaau.c,v 1.6 2012/10/27 17:17:56 chs Exp $); +__KERNEL_RCSID(0, $NetBSD: vrdmaau.c,v 1.7 2015/06/09 22:46:36 matt Exp $); #include sys/param.h -#include sys/systm.h +#include sys/bus.h #include sys/device.h +#include sys/systm.h -#include machine/bus.h +#include mips/cpuregs.h #include hpcmips/vr/vripif.h #include hpcmips/vr/dmaaureg.h Index: src/sys/arch/hpcmips/vr/vrdsu.c diff -u src/sys/arch/hpcmips/vr/vrdsu.c:1.11 src/sys/arch/hpcmips/vr/vrdsu.c:1.12 --- src/sys/arch/hpcmips/vr/vrdsu.c:1.11 Sat Oct 27 17:17:56 2012 +++ src/sys/arch/hpcmips/vr/vrdsu.c Tue Jun 9 22:46:36 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: vrdsu.c,v 1.11 2012/10/27 17:17:56 chs Exp $ */ +/* $NetBSD: vrdsu.c,v 1.12 2015/06/09 22:46:36 matt Exp $ */ /* * Copyright (c) 1999 Shin Takemura All rights reserved. @@ -27,14 +27,16 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vrdsu.c,v 1.11 2012/10/27 17:17:56 chs Exp
CVS commit: src/sys/arch/hpcmips/vr
Module Name:src
Committed By: christos
Date: Thu Nov 20 16:18:29 UTC 2014
Modified Files:
src/sys/arch/hpcmips/vr: rtc.c
Log Message:
this is supposed to be SECS_PER_DAY.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/hpcmips/vr/rtc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/vr/rtc.c
diff -u src/sys/arch/hpcmips/vr/rtc.c:1.33 src/sys/arch/hpcmips/vr/rtc.c:1.34
--- src/sys/arch/hpcmips/vr/rtc.c:1.33 Sun Nov 16 21:15:48 2014
+++ src/sys/arch/hpcmips/vr/rtc.c Thu Nov 20 11:18:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rtc.c,v 1.33 2014/11/17 02:15:48 christos Exp $ */
+/* $NetBSD: rtc.c,v 1.34 2014/11/20 16:18:29 christos Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rtc.c,v 1.33 2014/11/17 02:15:48 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: rtc.c,v 1.34 2014/11/20 16:18:29 christos Exp $);
#include opt_vr41xx.h
@@ -203,10 +203,10 @@ vrrtc_attach(device_t parent, device_t s
* be on Jan 1.
*/
for (year = EPOCHYEAR; year POSIX_BASE_YEAR; year++) {
- sc-sc_epoch += days_per_year(year) * SECS_PER_YEAR;
+ sc-sc_epoch += days_per_year(year) * SECS_PER_DAY;
}
for (year = POSIX_BASE_YEAR; year EPOCHYEAR; year++) {
- sc-sc_epoch -= days_per_year(year) * SECS_PER_YEAR;
+ sc-sc_epoch -= days_per_year(year) * SECS_PER_DAY;
}
/*
CVS commit: src/sys/arch/hpcmips/conf
Module Name:src Committed By: uebayasi Date: Sat Oct 11 08:22:34 UTC 2014 Modified Files: src/sys/arch/hpcmips/conf: GENERIC Log Message: Missing midi attachment. To generate a diff of this commit: cvs rdiff -u -r1.226 -r1.227 src/sys/arch/hpcmips/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/conf/GENERIC diff -u src/sys/arch/hpcmips/conf/GENERIC:1.226 src/sys/arch/hpcmips/conf/GENERIC:1.227 --- src/sys/arch/hpcmips/conf/GENERIC:1.226 Sat Aug 23 20:26:58 2014 +++ src/sys/arch/hpcmips/conf/GENERIC Sat Oct 11 08:22:34 2014 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.226 2014/08/23 20:26:58 dholland Exp $ +# $NetBSD: GENERIC,v 1.227 2014/10/11 08:22:34 uebayasi Exp $ # # GENERIC machine description file # @@ -24,7 +24,7 @@ include arch/hpcmips/conf/std.hpcmips. options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.226 $ +#ident GENERIC-$Revision: 1.227 $ maxusers 16 @@ -652,6 +652,7 @@ uyap* at uhub? port ? ugen* at uhub? port ? audio* at uaudio? +midi* at midibus? # Pseudo-Devices
CVS commit: src/sys/arch/hpcmips/tx
Module Name:src
Committed By: christos
Date: Sun Sep 21 15:52:43 UTC 2014
Modified Files:
src/sys/arch/hpcmips/tx: tx39icu.c
Log Message:
fix leak.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/hpcmips/tx/tx39icu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/tx/tx39icu.c
diff -u src/sys/arch/hpcmips/tx/tx39icu.c:1.33 src/sys/arch/hpcmips/tx/tx39icu.c:1.34
--- src/sys/arch/hpcmips/tx/tx39icu.c:1.33 Wed Mar 26 13:53:36 2014
+++ src/sys/arch/hpcmips/tx/tx39icu.c Sun Sep 21 11:52:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tx39icu.c,v 1.33 2014/03/26 17:53:36 christos Exp $ */
+/* $NetBSD: tx39icu.c,v 1.34 2014/09/21 15:52:43 christos Exp $ */
/*-
* Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tx39icu.c,v 1.33 2014/03/26 17:53:36 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: tx39icu.c,v 1.34 2014/09/21 15:52:43 christos Exp $);
#include opt_vr41xx.h
#include opt_tx39xx.h
@@ -634,11 +634,9 @@ tx39_poll_establish(tx_chipset_tag_t tc,
s = splhigh();
sc = tc-tc_intrt;
- if (!(p = malloc(sizeof(struct txpoll_entry),
- M_DEVBUF, M_NOWAIT))) {
+ if (!(p = malloc(sizeof(*p), M_DEVBUF, M_NOWAIT | M_ZERO))) {
panic (tx39_poll_establish: no memory.);
}
- memset(p, 0, sizeof(struct txpoll_entry));
p-p_fun = ih_fun;
p-p_arg = ih_arg;
@@ -647,13 +645,13 @@ tx39_poll_establish(tx_chipset_tag_t tc,
if (!sc-sc_polling) {
tx39clock_alarm_set(tc, 33); /* 33 msec */
- if (!(sc-sc_poll_ih =
- tx_intr_establish(
- tc, MAKEINTR(5, TX39_INTRSTATUS5_ALARMINT),
- IST_EDGE, level, tx39_poll_intr, sc))) {
+ if (!(sc-sc_poll_ih = tx_intr_establish(
+ tc, MAKEINTR(5, TX39_INTRSTATUS5_ALARMINT),
+ IST_EDGE, level, tx39_poll_intr, sc))) {
printf(tx39_poll_establish: can't hook\n);
splx(s);
+ free(p, M_DEVBUF);
return (0);
}
}
CVS commit: src/sys/arch/hpcmips/tx
Module Name:src
Committed By: he
Date: Sat Jun 7 18:59:16 UTC 2014
Modified Files:
src/sys/arch/hpcmips/tx: tx3912video.c
Log Message:
Remove set-but-not-used variable bit8.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/hpcmips/tx/tx3912video.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/tx/tx3912video.c
diff -u src/sys/arch/hpcmips/tx/tx3912video.c:1.42 src/sys/arch/hpcmips/tx/tx3912video.c:1.43
--- src/sys/arch/hpcmips/tx/tx3912video.c:1.42 Sat Oct 27 17:17:54 2012
+++ src/sys/arch/hpcmips/tx/tx3912video.c Sat Jun 7 18:59:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tx3912video.c,v 1.42 2012/10/27 17:17:54 chs Exp $ */
+/* $NetBSD: tx3912video.c,v 1.43 2014/06/07 18:59:16 he Exp $ */
/*-
* Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tx3912video.c,v 1.42 2012/10/27 17:17:54 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: tx3912video.c,v 1.43 2014/06/07 18:59:16 he Exp $);
#define TX3912VIDEO_DEBUG
@@ -434,7 +434,7 @@ tx3912video_framebuffer_init(struct vide
void
tx3912video_resolution_init(struct video_chip *chip)
{
- int h, v, split, bit8, horzval, lineval;
+ int h, v, split, horzval, lineval;
tx_chipset_tag_t tc = chip-vc_v;
txreg_t reg;
u_int32_t val;
@@ -443,8 +443,6 @@ tx3912video_resolution_init(struct video
v = chip-vc_fbheight;
reg = tx_conf_read(tc, TX3912_VIDEOCTRL1_REG);
split = reg TX3912_VIDEOCTRL1_DISPSPLIT;
- bit8 = (TX3912_VIDEOCTRL1_BITSEL(reg) ==
- TX3912_VIDEOCTRL1_BITSEL_8BITCOLOR);
val = TX3912_VIDEOCTRL1_BITSEL(reg);
if ((val == TX3912_VIDEOCTRL1_BITSEL_8BITCOLOR) !split) {
CVS commit: src/sys/arch/hpcmips/vr
Module Name:src
Committed By: christos
Date: Mon Mar 31 20:46:41 UTC 2014
Modified Files:
src/sys/arch/hpcmips/vr: vrpciu.c
Log Message:
adjust to new pci_intr_string signature
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hpcmips/vr/vrpciu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/vr/vrpciu.c
diff -u src/sys/arch/hpcmips/vr/vrpciu.c:1.20 src/sys/arch/hpcmips/vr/vrpciu.c:1.21
--- src/sys/arch/hpcmips/vr/vrpciu.c:1.20 Sat Oct 27 13:17:56 2012
+++ src/sys/arch/hpcmips/vr/vrpciu.c Mon Mar 31 16:46:41 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vrpciu.c,v 1.20 2012/10/27 17:17:56 chs Exp $ */
+/* $NetBSD: vrpciu.c,v 1.21 2014/03/31 20:46:41 christos Exp $ */
/*-
* Copyright (c) 2001 Enami Tsugutomo.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vrpciu.c,v 1.20 2012/10/27 17:17:56 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: vrpciu.c,v 1.21 2014/03/31 20:46:41 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -91,7 +91,8 @@ static void vrpciu_decompose_tag(pci_chi
static pcireg_t vrpciu_conf_read(pci_chipset_tag_t, pcitag_t, int);
static void vrpciu_conf_write(pci_chipset_tag_t, pcitag_t, int, pcireg_t);
static int vrpciu_intr_map(const struct pci_attach_args *, pci_intr_handle_t *);
-static const char *vrpciu_intr_string(pci_chipset_tag_t, pci_intr_handle_t);
+static const char *vrpciu_intr_string(pci_chipset_tag_t, pci_intr_handle_t,
+ char *, size_t);
static const struct evcnt *vrpciu_intr_evcnt(pci_chipset_tag_t,
pci_intr_handle_t);
static void *vrpciu_intr_establish(pci_chipset_tag_t, pci_intr_handle_t,
@@ -484,16 +485,15 @@ vrpciu_intr_map(const struct pci_attach_
}
const char *
-vrpciu_intr_string(pci_chipset_tag_t pc, pci_intr_handle_t ih)
+vrpciu_intr_string(pci_chipset_tag_t pc, pci_intr_handle_t ih, char *buf,
+size_t len)
{
- static char irqstr[sizeof(pciintr) + 16];
-
- snprintf(irqstr, sizeof(irqstr), pciintr %d:%d:%d,
+ snprintf(buf, len, pciintr %d:%d:%d,
CONFIG_HOOK_PCIINTR_BUS((int)ih),
CONFIG_HOOK_PCIINTR_DEVICE((int)ih),
CONFIG_HOOK_PCIINTR_FUNCTION((int)ih));
- return (irqstr);
+ return buf;
}
const struct evcnt *
CVS commit: src/sys/arch/hpcmips
Module Name:src
Committed By: christos
Date: Wed Mar 26 17:53:36 UTC 2014
Modified Files:
src/sys/arch/hpcmips/dev: mq200debug.c plumpcmcia.c
src/sys/arch/hpcmips/hpcmips: machdep.c
src/sys/arch/hpcmips/include: cpu.h
src/sys/arch/hpcmips/tx: tx39.c tx39icu.c
src/sys/arch/hpcmips/vr: vr.c vrpmu.c
Log Message:
- kill sprintf
- fix unused
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hpcmips/dev/mq200debug.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/hpcmips/dev/plumpcmcia.c
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/hpcmips/hpcmips/machdep.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hpcmips/include/cpu.h
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/hpcmips/tx/tx39.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/hpcmips/tx/tx39icu.c
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/hpcmips/vr/vr.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hpcmips/vr/vrpmu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/dev/mq200debug.c
diff -u src/sys/arch/hpcmips/dev/mq200debug.c:1.5 src/sys/arch/hpcmips/dev/mq200debug.c:1.6
--- src/sys/arch/hpcmips/dev/mq200debug.c:1.5 Sun Dec 11 07:17:33 2005
+++ src/sys/arch/hpcmips/dev/mq200debug.c Wed Mar 26 13:53:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mq200debug.c,v 1.5 2005/12/11 12:17:33 christos Exp $ */
+/* $NetBSD: mq200debug.c,v 1.6 2014/03/26 17:53:36 christos Exp $ */
/*-
* Copyright (c) 2001 TAKEMURA Shin
@@ -31,7 +31,7 @@
#ifdef _KERNEL
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mq200debug.c,v 1.5 2005/12/11 12:17:33 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: mq200debug.c,v 1.6 2014/03/26 17:53:36 christos Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -193,11 +193,11 @@ mq200_regname(struct mq200_softc *sc, in
for (i = 0; i sizeof(regs)/sizeof(*regs); i++)
if (regs[i].base + regs[i].start * 4 = offset
offset = regs[i].base + regs[i].end * 4) {
- sprintf(buf, %s%02XR, regs[i].name,
+ snprintf(buf, bufsize, %s%02XR, regs[i].name,
(offset - regs[i].base) / 4);
return (buf);
}
- sprintf(buf, OFFSET %02X, offset);
+ snprintf(buf, bufsize, OFFSET %02X, offset);
return (buf);
}
Index: src/sys/arch/hpcmips/dev/plumpcmcia.c
diff -u src/sys/arch/hpcmips/dev/plumpcmcia.c:1.26 src/sys/arch/hpcmips/dev/plumpcmcia.c:1.27
--- src/sys/arch/hpcmips/dev/plumpcmcia.c:1.26 Sat Oct 27 13:17:53 2012
+++ src/sys/arch/hpcmips/dev/plumpcmcia.c Wed Mar 26 13:53:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: plumpcmcia.c,v 1.26 2012/10/27 17:17:53 chs Exp $ */
+/* $NetBSD: plumpcmcia.c,v 1.27 2014/03/26 17:53:36 christos Exp $ */
/*
* Copyright (c) 1999, 2000 UCHIYAMA Yasushi. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: plumpcmcia.c,v 1.26 2012/10/27 17:17:53 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: plumpcmcia.c,v 1.27 2014/03/26 17:53:36 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -213,7 +213,7 @@ plumpcmcia_attach(device_t parent, devic
struct plum_attach_args *pa = aux;
struct plumpcmcia_softc *sc = device_private(self);
struct plumpcmcia_handle *ph;
- int error;
+ int error __diagused;
sc-sc_dev = self;
sc-sc_pc = pa-pa_pc;
@@ -844,7 +844,6 @@ plum_csc_intr_setup(struct plumpcmcia_so
bus_space_tag_t regt = ph-ph_regt;
bus_space_handle_t regh = ph-ph_regh;
plumreg_t reg;
- void *ih;
/* enable CARD DETECT ENABLE only */
plum_conf_write(regt, regh, PLUM_PCMCIA_CSCINT,
@@ -856,7 +855,7 @@ plum_csc_intr_setup(struct plumpcmcia_so
plum_conf_write(regt, regh, PLUM_PCMCIA_GLOBALCTRL, reg);
/* install interrupt handler (don't fail) */
- ih = plum_intr_establish(sc-sc_pc, irq, IST_EDGE, IPL_TTY,
+ plum_intr_establish(sc-sc_pc, irq, IST_EDGE, IPL_TTY,
plum_csc_intr, ph);
KASSERT(ih != 0);
}
Index: src/sys/arch/hpcmips/hpcmips/machdep.c
diff -u src/sys/arch/hpcmips/hpcmips/machdep.c:1.118 src/sys/arch/hpcmips/hpcmips/machdep.c:1.119
--- src/sys/arch/hpcmips/hpcmips/machdep.c:1.118 Tue Mar 25 09:38:25 2014
+++ src/sys/arch/hpcmips/hpcmips/machdep.c Wed Mar 26 13:53:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.118 2014/03/25 13:38:25 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.119 2014/03/26 17:53:36 christos Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura, All rights reserved.
@@ -69,7 +69,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.118 2014/03/25 13:38:25 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.119 2014/03/26 17:53:36 christos Exp $);
#include opt_vr41xx.h
#include opt_tx39xx.h
@@ -152,7 +152,7 @@ static int __bicons_enable;
#endif
/* the following is used externally (sysctl_hw) */
-char hpcmips_cpuname[40]; /* set CPU depend xx_init() */
+static char hpcmips_cpuname[40]; /* set CPU depend xx_init() */
int cpuspeed = 1; /* approx # instr per usec. */
@@ -458,6 +458,19 @@ mach_init(int argc,
CVS commit: src/sys/arch/hpcmips/hpcmips
Module Name:src Committed By: christos Date: Tue Mar 25 13:38:25 UTC 2014 Modified Files: src/sys/arch/hpcmips/hpcmips: machdep.c Log Message: add missing include To generate a diff of this commit: cvs rdiff -u -r1.117 -r1.118 src/sys/arch/hpcmips/hpcmips/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/hpcmips/machdep.c diff -u src/sys/arch/hpcmips/hpcmips/machdep.c:1.117 src/sys/arch/hpcmips/hpcmips/machdep.c:1.118 --- src/sys/arch/hpcmips/hpcmips/machdep.c:1.117 Mon Mar 24 16:06:32 2014 +++ src/sys/arch/hpcmips/hpcmips/machdep.c Tue Mar 25 09:38:25 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.117 2014/03/24 20:06:32 christos Exp $ */ +/* $NetBSD: machdep.c,v 1.118 2014/03/25 13:38:25 christos Exp $ */ /*- * Copyright (c) 1999 Shin Takemura, All rights reserved. @@ -69,7 +69,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.117 2014/03/24 20:06:32 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.118 2014/03/25 13:38:25 christos Exp $); #include opt_vr41xx.h #include opt_tx39xx.h @@ -97,6 +97,7 @@ __KERNEL_RCSID(0, $NetBSD: machdep.c,v #include sys/ksyms.h #include sys/device.h #include sys/lwp.h +#include sys/cpu.h #include uvm/uvm_extern.h
CVS commit: src/sys/arch/hpcmips/stand/lcboot
Module Name:src
Committed By: matt
Date: Wed Aug 21 07:27:01 UTC 2013
Modified Files:
src/sys/arch/hpcmips/stand/lcboot: Makefile
Log Message:
Use bsd.klinks.mk
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hpcmips/stand/lcboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/stand/lcboot/Makefile
diff -u src/sys/arch/hpcmips/stand/lcboot/Makefile:1.11 src/sys/arch/hpcmips/stand/lcboot/Makefile:1.12
--- src/sys/arch/hpcmips/stand/lcboot/Makefile:1.11 Sat Jan 22 19:19:18 2011
+++ src/sys/arch/hpcmips/stand/lcboot/Makefile Wed Aug 21 07:27:01 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2011/01/22 19:19:18 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2013/08/21 07:27:01 matt Exp $
.include bsd.own.mk
ROMICE?= no
@@ -37,16 +37,6 @@ LD_SCRIPT= lcboot.ldscript
CPPFLAGS+= -DROMICE
.endif
-.if !make(obj) !make(clean) !make(cleandir)
-.BEGIN:
- @([ -h machine ] || ln -s ${S}/arch/${MACHINE}/include machine)
- @[ -h mips ] || ln -s ${S}/arch/mips/include mips
-.NOPATH: machine
-.endif
-CLEANFILES+= machine mips
-
-${OBJS}: machine mips
-
### find out what to use for libkern
.include ${S}/lib/libkern/Makefile.inc
LIBKERN= ${KERNLIB}
@@ -76,6 +66,7 @@ vers.c: ${VERSIONFILE}
CLEANFILES+= ${PROG}
${PROG}: ${OBJS} ${LIBKERN} ${LIBSA} ${LIBZ}
+ ${_MKTARGET_LINK}
${LD} -o ${PROG} -T ${LD_SCRIPT} ${OBJS} ${LIBLIST}
CLEANFILES+= ${SREC}
@@ -84,3 +75,4 @@ ${SREC}: ${PROG}
${OBJCOPY} -S -O srec ${PROG} ${SREC}
.include bsd.prog.mk
+.include bsd.klinks.mk
CVS commit: src/sys/arch/hpcmips/tx
Module Name:src Committed By: shattered Date: Fri Dec 2 18:07:26 UTC 2011 Modified Files: src/sys/arch/hpcmips/tx: tx39.c Log Message: PR/32394 -- Don't define 'panic' label unconditionally, or minimal mobilepro 780 kernel configuration will not build. OK by wiz@ To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/arch/hpcmips/tx/tx39.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/tx/tx39.c diff -u src/sys/arch/hpcmips/tx/tx39.c:1.43 src/sys/arch/hpcmips/tx/tx39.c:1.44 --- src/sys/arch/hpcmips/tx/tx39.c:1.43 Sat Feb 26 12:07:45 2011 +++ src/sys/arch/hpcmips/tx/tx39.c Fri Dec 2 18:07:26 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: tx39.c,v 1.43 2011/02/26 12:07:45 tsutsui Exp $ */ +/* $NetBSD: tx39.c,v 1.44 2011/12/02 18:07:26 shattered Exp $ */ /*- * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tx39.c,v 1.43 2011/02/26 12:07:45 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: tx39.c,v 1.44 2011/12/02 18:07:26 shattered Exp $); #include opt_vr41xx.h #include opt_tx39xx.h @@ -285,7 +285,9 @@ tx_cons_init(void) } return; +#if (NM38813C 0) || (NTC5165BUF 0) panic: +#endif panic(tx_cons_init: can't init console); /* NOTREACHED */ }
CVS commit: src/sys/arch/hpcmips/tx
Module Name:src
Committed By: matt
Date: Mon Aug 8 17:45:13 UTC 2011
Modified Files:
src/sys/arch/hpcmips/tx: tx39clock.c
Log Message:
Global inlines are not allowed.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/hpcmips/tx/tx39clock.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/tx/tx39clock.c
diff -u src/sys/arch/hpcmips/tx/tx39clock.c:1.25 src/sys/arch/hpcmips/tx/tx39clock.c:1.26
--- src/sys/arch/hpcmips/tx/tx39clock.c:1.25 Wed Mar 16 14:43:37 2011
+++ src/sys/arch/hpcmips/tx/tx39clock.c Mon Aug 8 17:45:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tx39clock.c,v 1.25 2011/03/16 14:43:37 tsutsui Exp $ */
+/* $NetBSD: tx39clock.c,v 1.26 2011/08/08 17:45:13 matt Exp $ */
/*-
* Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tx39clock.c,v 1.25 2011/03/16 14:43:37 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: tx39clock.c,v 1.26 2011/08/08 17:45:13 matt Exp $);
#include opt_tx39clock_debug.h
@@ -92,8 +92,8 @@
void __tx39timer_rtcfreeze(tx_chipset_tag_t);
void __tx39timer_rtcreset(tx_chipset_tag_t);
-inline void __tx39timer_rtcget(struct txtime *);
-inline time_t __tx39timer_rtc2sec(struct txtime *);
+void __tx39timer_rtcget(struct txtime *);
+time_t __tx39timer_rtc2sec(struct txtime *);
uint32_t tx39_timecount(struct timecounter *);
CFATTACH_DECL(tx39clock, sizeof(struct tx39clock_softc),
@@ -190,7 +190,7 @@
tx_conf_write(tc, TX39_TIMERCONTROL_REG, reg);
}
-inline void
+void
__tx39timer_rtcget(struct txtime *t)
{
tx_chipset_tag_t tc;
CVS commit: src/sys/arch/hpcmips
Module Name:src
Committed By: tsutsui
Date: Fri Mar 18 15:31:38 UTC 2011
Modified Files:
src/sys/arch/hpcmips/tx: tx39icu.c
src/sys/arch/hpcmips/vr: rtc.c vr.c vrip.c
Log Message:
Use vaddr_t for pc instead of uint32_t.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/hpcmips/tx/tx39icu.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/hpcmips/vr/rtc.c
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/hpcmips/vr/vr.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/hpcmips/vr/vrip.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/tx/tx39icu.c
diff -u src/sys/arch/hpcmips/tx/tx39icu.c:1.30 src/sys/arch/hpcmips/tx/tx39icu.c:1.31
--- src/sys/arch/hpcmips/tx/tx39icu.c:1.30 Sat Feb 26 12:54:41 2011
+++ src/sys/arch/hpcmips/tx/tx39icu.c Fri Mar 18 15:31:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tx39icu.c,v 1.30 2011/02/26 12:54:41 tsutsui Exp $ */
+/* $NetBSD: tx39icu.c,v 1.31 2011/03/18 15:31:38 tsutsui Exp $ */
/*-
* Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tx39icu.c,v 1.30 2011/02/26 12:54:41 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: tx39icu.c,v 1.31 2011/03/18 15:31:38 tsutsui Exp $);
#include opt_vr41xx.h
#include opt_tx39xx.h
@@ -206,7 +206,7 @@
void tx39_irqhigh_disestablish(tx_chipset_tag_t, int, int, int);
void tx39_irqhigh_establish(tx_chipset_tag_t, int, int, int,
int (*)(void *), void *);
-void tx39_irqhigh_intr(uint32_t, uint32_t, uint32_t);
+void tx39_irqhigh_intr(uint32_t, vaddr_t, uint32_t);
int tx39_irqhigh(int, int);
CFATTACH_DECL(tx39icu, sizeof(struct tx39icu_softc),
@@ -434,7 +434,7 @@
}
void
-tx39_irqhigh_intr(uint32_t ipending, uint32_t pc, uint32_t status)
+tx39_irqhigh_intr(uint32_t ipending, vaddr_t pc, uint32_t status)
{
struct txintr_high_entry *he;
struct tx39icu_softc *sc;
Index: src/sys/arch/hpcmips/vr/rtc.c
diff -u src/sys/arch/hpcmips/vr/rtc.c:1.31 src/sys/arch/hpcmips/vr/rtc.c:1.32
--- src/sys/arch/hpcmips/vr/rtc.c:1.31 Wed Mar 16 14:47:34 2011
+++ src/sys/arch/hpcmips/vr/rtc.c Fri Mar 18 15:31:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rtc.c,v 1.31 2011/03/16 14:47:34 tsutsui Exp $ */
+/* $NetBSD: rtc.c,v 1.32 2011/03/18 15:31:38 tsutsui Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rtc.c,v 1.31 2011/03/16 14:47:34 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: rtc.c,v 1.32 2011/03/18 15:31:38 tsutsui Exp $);
#include opt_vr41xx.h
@@ -100,7 +100,7 @@
int vrrtc_match(device_t, cfdata_t, void *);
void vrrtc_attach(device_t, device_t, void *);
-int vrrtc_intr(void*, uint32_t, uint32_t);
+int vrrtc_intr(void*, vaddr_t, uint32_t);
void vrrtc_dump_regs(struct vrrtc_softc *);
CFATTACH_DECL_NEW(vrrtc, sizeof(struct vrrtc_softc),
@@ -221,7 +221,7 @@
}
int
-vrrtc_intr(void *arg, uint32_t pc, uint32_t status)
+vrrtc_intr(void *arg, vaddr_t pc, uint32_t status)
{
struct vrrtc_softc *sc = arg;
struct clockframe cf;
Index: src/sys/arch/hpcmips/vr/vr.c
diff -u src/sys/arch/hpcmips/vr/vr.c:1.63 src/sys/arch/hpcmips/vr/vr.c:1.64
--- src/sys/arch/hpcmips/vr/vr.c:1.63 Wed Mar 16 13:38:34 2011
+++ src/sys/arch/hpcmips/vr/vr.c Fri Mar 18 15:31:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vr.c,v 1.63 2011/03/16 13:38:34 tsutsui Exp $ */
+/* $NetBSD: vr.c,v 1.64 2011/03/18 15:31:38 tsutsui Exp $ */
/*-
* Copyright (c) 1999-2002
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vr.c,v 1.63 2011/03/16 13:38:34 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: vr.c,v 1.64 2011/03/18 15:31:38 tsutsui Exp $);
#include opt_vr41xx.h
#include opt_tx39xx.h
@@ -164,7 +164,7 @@
* CPU interrupt dispatch table (HwInt[0:3])
*/
STATIC int vr_null_handler(void *, uint32_t, uint32_t);
-STATIC int (*vr_intr_handler[4])(void *, uint32_t, uint32_t) =
+STATIC int (*vr_intr_handler[4])(void *, vaddr_t, uint32_t) =
{
vr_null_handler,
vr_null_handler,
@@ -558,7 +558,7 @@
}
void *
-vr_intr_establish(int line, int (*ih_fun)(void *, uint32_t, uint32_t),
+vr_intr_establish(int line, int (*ih_fun)(void *, vaddr_t, uint32_t),
void *ih_arg)
{
@@ -580,7 +580,7 @@
}
int
-vr_null_handler(void *arg, uint32_t pc, uint32_t status)
+vr_null_handler(void *arg, vaddr_t pc, uint32_t status)
{
printf(vr_null_handler\n);
Index: src/sys/arch/hpcmips/vr/vrip.c
diff -u src/sys/arch/hpcmips/vr/vrip.c:1.35 src/sys/arch/hpcmips/vr/vrip.c:1.36
--- src/sys/arch/hpcmips/vr/vrip.c:1.35 Wed Mar 16 13:24:42 2011
+++ src/sys/arch/hpcmips/vr/vrip.c Fri Mar 18 15:31:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vrip.c,v 1.35 2011/03/16 13:24:42 tsutsui Exp $ */
+/* $NetBSD: vrip.c,v 1.36 2011/03/18 15:31:38 tsutsui Exp $ */
/*-
* Copyright (c) 1999, 2002
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vrip.c,v
CVS commit: src/sys/arch/hpcmips/include
Module Name:src Committed By: tsutsui Date: Fri Mar 18 16:36:50 UTC 2011 Modified Files: src/sys/arch/hpcmips/include: param.h Log Message: - include mips/mips_param.h after MACHINE is defined - remove redundant comment To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hpcmips/include/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/include/param.h diff -u src/sys/arch/hpcmips/include/param.h:1.15 src/sys/arch/hpcmips/include/param.h:1.16 --- src/sys/arch/hpcmips/include/param.h:1.15 Tue Feb 8 20:20:15 2011 +++ src/sys/arch/hpcmips/include/param.h Fri Mar 18 16:36:50 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.15 2011/02/08 20:20:15 rmind Exp $ */ +/* $NetBSD: param.h,v 1.16 2011/03/18 16:36:50 tsutsui Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -38,15 +38,9 @@ * @(#)param.h 8.1 (Berkeley) 6/10/93 */ -/* - * Machine-dependent constants (VM, etc) common across MIPS cpus - */ - #ifndef _HPCMIPS_PARAM_H_ #define _HPCMIPS_PARAM_H_ -#include mips/mips_param.h - /* * Machine dependent constants for mips-based Handheld PC. */ @@ -54,6 +48,8 @@ #define _MACHINE hpcmips #define MACHINE hpcmips +#include mips/mips_param.h + #define KERNBASE 0x8000 /* start of kernel virtual */ #define KERNTEXTOFF 0x80001000 /* start of kernel text for kvm_mkdb */ #define BTOPKERNBASE ((u_long)KERNBASE PGSHIFT)
CVS commit: src/sys/arch/hpcmips/include
Module Name:src Committed By: tsutsui Date: Wed Mar 16 13:08:22 UTC 2011 Modified Files: src/sys/arch/hpcmips/include: kloader.h Log Message: Put awful kludge to make MI kloader.c link on hpcmips. XXX: sys/dev/kloader.c should not refer avail_start and avail_end To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hpcmips/include/kloader.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/include/kloader.h diff -u src/sys/arch/hpcmips/include/kloader.h:1.4 src/sys/arch/hpcmips/include/kloader.h:1.5 --- src/sys/arch/hpcmips/include/kloader.h:1.4 Mon Apr 28 20:23:21 2008 +++ src/sys/arch/hpcmips/include/kloader.h Wed Mar 16 13:08:22 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: kloader.h,v 1.4 2008/04/28 20:23:21 martin Exp $ */ +/* $NetBSD: kloader.h,v 1.5 2011/03/16 13:08:22 tsutsui Exp $ */ /*- * Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc. @@ -30,4 +30,6 @@ #define PG_VADDR(pg) MIPS_PHYS_TO_KSEG0(VM_PAGE_TO_PHYS(pg)) - +/* XXX: kludge: MI kloader.c assumes avail_start and avail_end are common */ +#define avail_start mips_avail_start +#define avail_end mips_avail_end
CVS commit: src/sys/arch/hpcmips
Module Name:src
Committed By: tsutsui
Date: Wed Mar 16 13:23:42 UTC 2011
Modified Files:
src/sys/arch/hpcmips/conf: files.hpcmips
src/sys/arch/hpcmips/hpcmips: hpcapm_machdep.c
src/sys/arch/hpcmips/vr: vr.c vripvar.h
Added Files:
src/sys/arch/hpcmips/vr: vrip_spl.S
Log Message:
Blindly prepare an equivalent function with old _spllower(~MIPS_INT_MASK_0)
that disabled all interrupts except PIU. Compile test only.
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/hpcmips/conf/files.hpcmips
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hpcmips/hpcmips/hpcapm_machdep.c
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/hpcmips/vr/vr.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/hpcmips/vr/vrip_spl.S
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hpcmips/vr/vripvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/conf/files.hpcmips
diff -u src/sys/arch/hpcmips/conf/files.hpcmips:1.104 src/sys/arch/hpcmips/conf/files.hpcmips:1.105
--- src/sys/arch/hpcmips/conf/files.hpcmips:1.104 Wed Mar 2 08:25:09 2011
+++ src/sys/arch/hpcmips/conf/files.hpcmips Wed Mar 16 13:23:41 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.hpcmips,v 1.104 2011/03/02 08:25:09 ahoka Exp $
+# $NetBSD: files.hpcmips,v 1.105 2011/03/16 13:23:41 tsutsui Exp $
# maxpartitions must be first item in files.${ARCH}.
maxpartitions 8
@@ -103,6 +103,7 @@
device vripif { [addr=-1], [size=-1], [addr2=-1], [size2=-1], [unit=-1], [pwctl=-1], [platform = -1] }
define vrip_common
file arch/hpcmips/vr/vrip.c vrip_common needs-flag
+file arch/hpcmips/vr/vrip_spl.S vrip_common
device vrip: vripif
attach vrip at mainbus: vrip_common
device vr4102ip: vripif
Index: src/sys/arch/hpcmips/hpcmips/hpcapm_machdep.c
diff -u src/sys/arch/hpcmips/hpcmips/hpcapm_machdep.c:1.4 src/sys/arch/hpcmips/hpcmips/hpcapm_machdep.c:1.5
--- src/sys/arch/hpcmips/hpcmips/hpcapm_machdep.c:1.4 Sun Feb 20 07:58:14 2011
+++ src/sys/arch/hpcmips/hpcmips/hpcapm_machdep.c Wed Mar 16 13:23:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcapm_machdep.c,v 1.4 2011/02/20 07:58:14 matt Exp $ */
+/* $NetBSD: hpcapm_machdep.c,v 1.5 2011/03/16 13:23:41 tsutsui Exp $ */
/*
* Copyright (c) 2000 Takemura Shin
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hpcapm_machdep.c,v 1.4 2011/02/20 07:58:14 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: hpcapm_machdep.c,v 1.5 2011/03/16 13:23:41 tsutsui Exp $);
#include sys/param.h
#include sys/device.h
@@ -64,7 +64,7 @@
* disable all interrupts except PIU interrupt
*/
vrip_intr_suspend();
- _spllower(~MIPS_INT_MASK_0);
+ vrip_splpiu();
/*
* STANDBY instruction puts the CPU into power saveing
@@ -96,7 +96,7 @@
* disable all interrupts except PIU interrupt
*/
vrip_intr_suspend();
- _spllower(~MIPS_INT_MASK_0);
+ vrip_splpiu();
/*
* SUSPEND instruction puts the CPU into power saveing
Index: src/sys/arch/hpcmips/vr/vr.c
diff -u src/sys/arch/hpcmips/vr/vr.c:1.60 src/sys/arch/hpcmips/vr/vr.c:1.61
--- src/sys/arch/hpcmips/vr/vr.c:1.60 Sat Feb 26 12:07:46 2011
+++ src/sys/arch/hpcmips/vr/vr.c Wed Mar 16 13:23:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vr.c,v 1.60 2011/02/26 12:07:46 tsutsui Exp $ */
+/* $NetBSD: vr.c,v 1.61 2011/03/16 13:23:41 tsutsui Exp $ */
/*-
* Copyright (c) 1999-2002
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vr.c,v 1.60 2011/02/26 12:07:46 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: vr.c,v 1.61 2011/03/16 13:23:41 tsutsui Exp $);
#include opt_vr41xx.h
#include opt_tx39xx.h
@@ -504,7 +504,7 @@
*/
if (howto RB_HALT) {
#if NVRIP_COMMON 0
- _spllower(~MIPS_INT_MASK_0);
+ vrip_splpiu();
vrip_intr_suspend();
#else
splhigh();
Index: src/sys/arch/hpcmips/vr/vripvar.h
diff -u src/sys/arch/hpcmips/vr/vripvar.h:1.11 src/sys/arch/hpcmips/vr/vripvar.h:1.12
--- src/sys/arch/hpcmips/vr/vripvar.h:1.11 Sun Dec 11 12:17:34 2005
+++ src/sys/arch/hpcmips/vr/vripvar.h Wed Mar 16 13:23:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vripvar.h,v 1.11 2005/12/11 12:17:34 christos Exp $ */
+/* $NetBSD: vripvar.h,v 1.12 2011/03/16 13:23:41 tsutsui Exp $ */
/*-
* Copyright (c) 1999, 2002
@@ -70,5 +70,5 @@
void vrip_intr_resume(void);
int vripmatch(struct device *, struct cfdata *, void *);
void vripattach_common(struct device *, struct device *, void *);
-
+void vrip_splpiu(void);
#endif /* !_VRIPVAR_H_ */
Added files:
Index: src/sys/arch/hpcmips/vr/vrip_spl.S
diff -u /dev/null src/sys/arch/hpcmips/vr/vrip_spl.S:1.1
--- /dev/null Wed Mar 16 13:23:42 2011
+++ src/sys/arch/hpcmips/vr/vrip_spl.S Wed Mar 16 13:23:41 2011
@@ -0,0 +1,73 @@
+/* $NetBSD: vrip_spl.S,v 1.1 2011/03/16 13:23:41 tsutsui Exp $ */
+
+/*
+ * Copyright (c) 1992, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Digital Equipment
CVS commit: src/sys/arch/hpcmips/vr
Module Name:src
Committed By: tsutsui
Date: Wed Mar 16 13:24:43 UTC 2011
Modified Files:
src/sys/arch/hpcmips/vr: vrip.c
Log Message:
Avoid possible future device_t/softc confusion.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/hpcmips/vr/vrip.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/vr/vrip.c
diff -u src/sys/arch/hpcmips/vr/vrip.c:1.34 src/sys/arch/hpcmips/vr/vrip.c:1.35
--- src/sys/arch/hpcmips/vr/vrip.c:1.34 Wed Mar 18 10:22:29 2009
+++ src/sys/arch/hpcmips/vr/vrip.c Wed Mar 16 13:24:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vrip.c,v 1.34 2009/03/18 10:22:29 cegger Exp $ */
+/* $NetBSD: vrip.c,v 1.35 2011/03/16 13:24:42 tsutsui Exp $ */
/*-
* Copyright (c) 1999, 2002
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vrip.c,v 1.34 2009/03/18 10:22:29 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: vrip.c,v 1.35 2011/03/16 13:24:42 tsutsui Exp $);
#include opt_vr41xx.h
#include opt_tx39xx.h
@@ -238,7 +238,7 @@
/*
* Level 1 interrupts are redirected to HwInt0
*/
- vr_intr_establish(VR_INTR0, vrip_intr, self);
+ vr_intr_establish(VR_INTR0, vrip_intr, sc);
the_vrip_sc = sc;
/*
* Attach each devices
@@ -491,9 +491,9 @@
}
int
-vrip_intr(void *arg, u_int32_t pc, u_int32_t statusReg)
+vrip_intr(void *arg, u_int32_t pc, u_int32_t status)
{
- struct vrip_softc *sc = (struct vrip_softc*)arg;
+ struct vrip_softc *sc = (struct vrip_softc *)arg;
bus_space_tag_t iot = sc-sc_iot;
bus_space_handle_t ioh = sc-sc_ioh;
int i;
CVS commit: src/sys/arch/hpcmips/vr
Module Name:src
Committed By: tsutsui
Date: Wed Mar 16 13:26:55 UTC 2011
Modified Files:
src/sys/arch/hpcmips/vr: vr.c
Log Message:
vr_intr_handler[] takes status for hardclock(9), not ipending.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/hpcmips/vr/vr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/vr/vr.c
diff -u src/sys/arch/hpcmips/vr/vr.c:1.61 src/sys/arch/hpcmips/vr/vr.c:1.62
--- src/sys/arch/hpcmips/vr/vr.c:1.61 Wed Mar 16 13:23:41 2011
+++ src/sys/arch/hpcmips/vr/vr.c Wed Mar 16 13:26:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vr.c,v 1.61 2011/03/16 13:23:41 tsutsui Exp $ */
+/* $NetBSD: vr.c,v 1.62 2011/03/16 13:26:55 tsutsui Exp $ */
/*-
* Copyright (c) 1999-2002
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vr.c,v 1.61 2011/03/16 13:23:41 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: vr.c,v 1.62 2011/03/16 13:26:55 tsutsui Exp $);
#include opt_vr41xx.h
#include opt_tx39xx.h
@@ -548,7 +548,7 @@
}
if (ipending MIPS_INT_MASK_1) {
- (*vr_intr_handler[1])(vr_intr_arg[1], pc, ipending);
+ (*vr_intr_handler[1])(vr_intr_arg[1], pc, status);
}
if (ipending MIPS_INT_MASK_0) {
CVS commit: src/sys/arch/hpcmips/vr
Module Name:src Committed By: tsutsui Date: Wed Mar 16 13:38:35 UTC 2011 Modified Files: src/sys/arch/hpcmips/vr: vr.c Log Message: Set sr_bits[IPL_HIGH] properly, rather than setting sr_bits[IPL_VM] twice. I wonder if gcc could warn such botch in C99 array or member initializers... To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/sys/arch/hpcmips/vr/vr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/vr/vr.c diff -u src/sys/arch/hpcmips/vr/vr.c:1.62 src/sys/arch/hpcmips/vr/vr.c:1.63 --- src/sys/arch/hpcmips/vr/vr.c:1.62 Wed Mar 16 13:26:55 2011 +++ src/sys/arch/hpcmips/vr/vr.c Wed Mar 16 13:38:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: vr.c,v 1.62 2011/03/16 13:26:55 tsutsui Exp $ */ +/* $NetBSD: vr.c,v 1.63 2011/03/16 13:38:34 tsutsui Exp $ */ /*- * Copyright (c) 1999-2002 @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vr.c,v 1.62 2011/03/16 13:26:55 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: vr.c,v 1.63 2011/03/16 13:38:34 tsutsui Exp $); #include opt_vr41xx.h #include opt_tx39xx.h @@ -141,7 +141,7 @@ | MIPS_INT_MASK_0 | MIPS_INT_MASK_1, [IPL_DDB] = MIPS_INT_MASK, - [IPL_VM] = MIPS_INT_MASK, + [IPL_HIGH] = MIPS_INT_MASK, }, };
CVS commit: src/sys/arch/hpcmips/vr
Module Name:src Committed By: tsutsui Date: Wed Mar 16 14:23:19 UTC 2011 Modified Files: src/sys/arch/hpcmips/vr: rtc.c Log Message: Fix signedness issue triggered by 64 bit time_t. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/hpcmips/vr/rtc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/vr/rtc.c diff -u src/sys/arch/hpcmips/vr/rtc.c:1.27 src/sys/arch/hpcmips/vr/rtc.c:1.28 --- src/sys/arch/hpcmips/vr/rtc.c:1.27 Thu Mar 10 17:27:43 2011 +++ src/sys/arch/hpcmips/vr/rtc.c Wed Mar 16 14:23:19 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rtc.c,v 1.27 2011/03/10 17:27:43 tsutsui Exp $ */ +/* $NetBSD: rtc.c,v 1.28 2011/03/16 14:23:19 tsutsui Exp $ */ /*- * Copyright (c) 1999 Shin Takemura. All rights reserved. @@ -36,7 +36,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rtc.c,v 1.27 2011/03/10 17:27:43 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: rtc.c,v 1.28 2011/03/16 14:23:19 tsutsui Exp $); #include opt_vr41xx.h @@ -281,7 +281,7 @@ bus_space_handle_t ioh = sc-sc_ioh; u_int32_t timeh; /* elapse time (2*timeh sec) */ u_int32_t timel; /* timel/32768 sec */ - int64_t sec, usec; + u_int64_t sec, usec; timeh = bus_space_read_2(iot, ioh, ETIME_H_REG_W); timeh = (timeh 16) | bus_space_read_2(iot, ioh, ETIME_M_REG_W); @@ -290,7 +290,7 @@ DPRINTF((clock_get: timeh %08x timel %08x\n, timeh, timel)); timeh -= EPOCHOFF; - sec = timeh * 2; + sec = (uint64_t)timeh * 2; sec -= sc-sc_epoch; tvp-tv_sec = sec; tvp-tv_sec += timel / ETIME_L_HZ; @@ -299,7 +299,7 @@ usec = (timel % ETIME_L_HZ); usec *= 100; usec /= ETIME_L_HZ; - tvp-tv_usec = (uint32_t)usec; + tvp-tv_usec = usec; return 0; }
CVS commit: src/sys/arch/hpcmips/vr
Module Name:src
Committed By: tsutsui
Date: Wed Mar 16 14:28:39 UTC 2011
Modified Files:
src/sys/arch/hpcmips/vr: rtc.c
Log Message:
KNF and cosmetics.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/hpcmips/vr/rtc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/vr/rtc.c
diff -u src/sys/arch/hpcmips/vr/rtc.c:1.28 src/sys/arch/hpcmips/vr/rtc.c:1.29
--- src/sys/arch/hpcmips/vr/rtc.c:1.28 Wed Mar 16 14:23:19 2011
+++ src/sys/arch/hpcmips/vr/rtc.c Wed Mar 16 14:28:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rtc.c,v 1.28 2011/03/16 14:23:19 tsutsui Exp $ */
+/* $NetBSD: rtc.c,v 1.29 2011/03/16 14:28:39 tsutsui Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rtc.c,v 1.28 2011/03/16 14:23:19 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: rtc.c,v 1.29 2011/03/16 14:28:39 tsutsui Exp $);
#include opt_vr41xx.h
@@ -100,7 +100,7 @@
int vrrtc_match(struct device *, struct cfdata *, void *);
void vrrtc_attach(struct device *, struct device *, void *);
-int vrrtc_intr(void*, u_int32_t, u_int32_t);
+int vrrtc_intr(void*, uint32_t, uint32_t);
void vrrtc_dump_regs(struct vrrtc_softc *);
CFATTACH_DECL(vrrtc, sizeof(struct vrrtc_softc),
@@ -110,7 +110,7 @@
vrrtc_match(struct device *parent, struct cfdata *cf, void *aux)
{
- return (1);
+ return 1;
}
#ifndef SINGLE_VRIP_BASE
@@ -135,15 +135,13 @@
sc-sc_tclk_l_reg = VR4102_TCLK_L_REG_W;
sc-sc_tclk_cnt_h_reg = VR4102_TCLK_CNT_H_REG_W;
sc-sc_tclk_cnt_l_reg = VR4102_TCLK_CNT_L_REG_W;
- } else
- if (va-va_addr == VR4122_RTC_ADDR) {
+ } else if (va-va_addr == VR4122_RTC_ADDR) {
sc-sc_rtcint_reg = VR4122_RTCINT_REG_W;
sc-sc_tclk_h_reg = VR4122_TCLK_H_REG_W;
sc-sc_tclk_l_reg = VR4122_TCLK_L_REG_W;
sc-sc_tclk_cnt_h_reg = VR4122_TCLK_CNT_H_REG_W;
sc-sc_tclk_cnt_l_reg = VR4122_TCLK_CNT_L_REG_W;
- } else
- if (va-va_addr == VR4181_RTC_ADDR) {
+ } else if (va-va_addr == VR4181_RTC_ADDR) {
sc-sc_rtcint_reg = VR4181_RTCINT_REG_W;
sc-sc_tclk_h_reg = RTC_NO_REG_W;
sc-sc_tclk_l_reg = RTC_NO_REG_W;
@@ -223,14 +221,14 @@
}
int
-vrrtc_intr(void *arg, u_int32_t pc, u_int32_t statusReg)
+vrrtc_intr(void *arg, uint32_t pc, uint32_t status)
{
struct vrrtc_softc *sc = arg;
struct clockframe cf;
bus_space_write_2(sc-sc_iot, sc-sc_ioh, RTCINT_REG_W, RTCINT_ALL);
cf.pc = pc;
- cf.sr = statusReg;
+ cf.sr = status;
cf.intr = (curcpu()-ci_idepth 1);
hardclock(cf);
@@ -247,8 +245,8 @@
* Set tick (CLOCK_RATE)
*/
bus_space_write_2(sc-sc_iot, sc-sc_ioh, RTCL1_H_REG_W, 0);
- bus_space_write_2(sc-sc_iot, sc-sc_ioh, RTCL1_L_REG_W,
- RTCL1_L_HZ/CLOCK_RATE);
+ bus_space_write_2(sc-sc_iot, sc-sc_ioh,
+ RTCL1_L_REG_W, RTCL1_L_HZ / CLOCK_RATE);
/*
* Initialize timecounter.
@@ -269,19 +267,18 @@
bus_space_tag_t iot = sc-sc_iot;
bus_space_handle_t ioh = sc-sc_ioh;
- return (bus_space_read_2(iot, ioh, ETIME_L_REG_W));
+ return bus_space_read_2(iot, ioh, ETIME_L_REG_W);
}
int
vrrtc_get(todr_chip_handle_t tch, struct timeval *tvp)
{
-
struct vrrtc_softc *sc = (struct vrrtc_softc *)tch-cookie;
bus_space_tag_t iot = sc-sc_iot;
bus_space_handle_t ioh = sc-sc_ioh;
- u_int32_t timeh; /* elapse time (2*timeh sec) */
- u_int32_t timel; /* timel/32768 sec */
- u_int64_t sec, usec;
+ uint32_t timeh; /* elapse time (2*timeh sec) */
+ uint32_t timel; /* timel/32768 sec */
+ uint64_t sec, usec;
timeh = bus_space_read_2(iot, ioh, ETIME_H_REG_W);
timeh = (timeh 16) | bus_space_read_2(iot, ioh, ETIME_M_REG_W);
@@ -310,8 +307,8 @@
struct vrrtc_softc *sc = (struct vrrtc_softc *)tch-cookie;
bus_space_tag_t iot = sc-sc_iot;
bus_space_handle_t ioh = sc-sc_ioh;
- u_int32_t timeh; /* elapse time (2*timeh sec) */
- u_int32_t timel; /* timel/32768 sec */
+ uint32_t timeh; /* elapse time (2*timeh sec) */
+ uint32_t timel; /* timel/32768 sec */
int64_t sec, cnt;
sec = tvp-tv_sec + sc-sc_epoch;
@@ -371,8 +368,10 @@
timel = bus_space_read_2(sc-sc_iot, sc-sc_ioh, TCLK_L_REG_W);
printf(clock_init() TCLK %04x%04x\n, timeh, timel);
- timeh = bus_space_read_2(sc-sc_iot, sc-sc_ioh, TCLK_CNT_H_REG_W);
- timel = bus_space_read_2(sc-sc_iot, sc-sc_ioh, TCLK_CNT_L_REG_W);
+ timeh = bus_space_read_2(sc-sc_iot, sc-sc_ioh,
+ TCLK_CNT_H_REG_W);
+ timel = bus_space_read_2(sc-sc_iot, sc-sc_ioh,
+ TCLK_CNT_L_REG_W);
printf(clock_init() TCLK CNTL %04x%04x\n, timeh, timel);
}
}
CVS commit: src/sys/arch/hpcmips/tx
Module Name:src
Committed By: tsutsui
Date: Wed Mar 16 14:39:26 UTC 2011
Modified Files:
src/sys/arch/hpcmips/tx: tx39clock.c
Log Message:
Some KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/hpcmips/tx/tx39clock.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/tx/tx39clock.c
diff -u src/sys/arch/hpcmips/tx/tx39clock.c:1.23 src/sys/arch/hpcmips/tx/tx39clock.c:1.24
--- src/sys/arch/hpcmips/tx/tx39clock.c:1.23 Mon Apr 28 20:23:21 2008
+++ src/sys/arch/hpcmips/tx/tx39clock.c Wed Mar 16 14:39:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tx39clock.c,v 1.23 2008/04/28 20:23:21 martin Exp $ */
+/* $NetBSD: tx39clock.c,v 1.24 2011/03/16 14:39:26 tsutsui Exp $ */
/*-
* Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tx39clock.c,v 1.23 2008/04/28 20:23:21 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: tx39clock.c,v 1.24 2011/03/16 14:39:26 tsutsui Exp $);
#include opt_tx39clock_debug.h
@@ -59,7 +59,7 @@
#define ISSETPRINT(r, m) \
dbg_bitmask_print(r, TX39_CLOCK_EN ## m ## CLK, #m)
-void tx39clock_init(struct device *);
+void tx39clock_init(device_t);
struct platform_clock tx39_clock = {
#define CLOCK_RATE 100
@@ -67,8 +67,8 @@
};
struct txtime {
- u_int32_t t_hi;
- u_int32_t t_lo;
+ uint32_t t_hi;
+ uint32_t t_lo;
};
struct tx39clock_softc {
@@ -103,7 +103,7 @@
tx39clock_match(struct device *parent, struct cfdata *cf, void *aux)
{
- return (ATTACH_FIRST);
+ return ATTACH_FIRST;
}
void
@@ -244,7 +244,7 @@
* always be consistent. This is much faster than the routine which
* has to get both values, improving the quality.
*/
- return (tx_conf_read(tc, TX39_TIMERRTCLO_REG));
+ return tx_conf_read(tc, TX39_TIMERRTCLO_REG);
}
void
@@ -288,7 +288,7 @@
sc-sc_alarm = TX39_MSEC2RTC(msec);
tx39clock_alarm_refill(tc);
- return (0);
+ return 0;
}
void
@@ -296,15 +296,15 @@
{
struct tx39clock_softc *sc = tc-tc_clockt;
struct txtime t;
- u_int64_t mytime;
+ uint64_t mytime;
__tx39timer_rtcget(t);
- mytime = ((u_int64_t)t.t_hi 32) | (u_int64_t)t.t_lo;
- mytime += (u_int64_t)sc-sc_alarm;
+ mytime = ((uint64_t)t.t_hi 32) | (uint64_t)t.t_lo;
+ mytime += (uint64_t)sc-sc_alarm;
- t.t_hi = (u_int32_t)((mytime 32) TX39_TIMERALARMHI_MASK);
- t.t_lo = (u_int32_t)(mytime 0x);
+ t.t_hi = (uint32_t)((mytime 32) TX39_TIMERALARMHI_MASK);
+ t.t_lo = (uint32_t)(mytime 0x);
tx_conf_write(tc, TX39_TIMERALARMHI_REG, t.t_hi);
tx_conf_write(tc, TX39_TIMERALARMLO_REG, t.t_lo);
CVS commit: src/sys/arch/hpcmips
Module Name:src
Committed By: tsutsui
Date: Wed Mar 16 14:43:37 UTC 2011
Modified Files:
src/sys/arch/hpcmips/hpcmips: clock.c
src/sys/arch/hpcmips/include: sysconf.h
src/sys/arch/hpcmips/tx: tx39clock.c
src/sys/arch/hpcmips/vr: rtc.c
Log Message:
Fix device_t/softc confusion.
(currently harmless since they are not split yet)
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/hpcmips/hpcmips/clock.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hpcmips/include/sysconf.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/hpcmips/tx/tx39clock.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/hpcmips/vr/rtc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/hpcmips/clock.c
diff -u src/sys/arch/hpcmips/hpcmips/clock.c:1.21 src/sys/arch/hpcmips/hpcmips/clock.c:1.22
--- src/sys/arch/hpcmips/hpcmips/clock.c:1.21 Tue Feb 8 20:20:15 2011
+++ src/sys/arch/hpcmips/hpcmips/clock.c Wed Mar 16 14:43:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.21 2011/02/08 20:20:15 rmind Exp $ */
+/* $NetBSD: clock.c,v 1.22 2011/03/16 14:43:36 tsutsui Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura, All rights reserved.
@@ -68,7 +68,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.21 2011/02/08 20:20:15 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.22 2011/03/16 14:43:36 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
@@ -83,12 +83,12 @@
* Register CPU(VR41XX or TX39XX) dependent clock routine to system.
*/
void
-platform_clock_attach(void *ctx, struct platform_clock *clock)
+platform_clock_attach(device_t dev, struct platform_clock *clock)
{
printf(\n);
- clock-self = ctx;
+ clock-self = dev;
platform.clock = clock;
}
Index: src/sys/arch/hpcmips/include/sysconf.h
diff -u src/sys/arch/hpcmips/include/sysconf.h:1.16 src/sys/arch/hpcmips/include/sysconf.h:1.17
--- src/sys/arch/hpcmips/include/sysconf.h:1.16 Sun Feb 20 07:58:14 2011
+++ src/sys/arch/hpcmips/include/sysconf.h Wed Mar 16 14:43:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sysconf.h,v 1.16 2011/02/20 07:58:14 matt Exp $ */
+/* $NetBSD: sysconf.h,v 1.17 2011/03/16 14:43:36 tsutsui Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -73,12 +73,12 @@
struct platform_clock {
int hz;
- void (*init)(struct device *);
+ void (*init)(device_t);
void *self;
int start;
};
-void platform_clock_attach(void *, struct platform_clock *);
+void platform_clock_attach(device_t, struct platform_clock *);
#endif /* _KERNEL */
#endif /* !_HPCMIPS_SYSCONF_H_ */
Index: src/sys/arch/hpcmips/tx/tx39clock.c
diff -u src/sys/arch/hpcmips/tx/tx39clock.c:1.24 src/sys/arch/hpcmips/tx/tx39clock.c:1.25
--- src/sys/arch/hpcmips/tx/tx39clock.c:1.24 Wed Mar 16 14:39:26 2011
+++ src/sys/arch/hpcmips/tx/tx39clock.c Wed Mar 16 14:43:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tx39clock.c,v 1.24 2011/03/16 14:39:26 tsutsui Exp $ */
+/* $NetBSD: tx39clock.c,v 1.25 2011/03/16 14:43:37 tsutsui Exp $ */
/*-
* Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tx39clock.c,v 1.24 2011/03/16 14:39:26 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: tx39clock.c,v 1.25 2011/03/16 14:43:37 tsutsui Exp $);
#include opt_tx39clock_debug.h
@@ -110,7 +110,7 @@
tx39clock_attach(struct device *parent, struct device *self, void *aux)
{
struct txsim_attach_args *ta = aux;
- struct tx39clock_softc *sc = (void*)self;
+ struct tx39clock_softc *sc = device_private(self);
tx_chipset_tag_t tc;
txreg_t reg;
@@ -248,9 +248,9 @@
}
void
-tx39clock_init(struct device *dev)
+tx39clock_init(device_t self)
{
- struct tx39clock_softc *sc = (void*)dev;
+ struct tx39clock_softc *sc = device_private(self);
tx_chipset_tag_t tc = sc-sc_tc;
txreg_t reg;
int pcnt;
Index: src/sys/arch/hpcmips/vr/rtc.c
diff -u src/sys/arch/hpcmips/vr/rtc.c:1.29 src/sys/arch/hpcmips/vr/rtc.c:1.30
--- src/sys/arch/hpcmips/vr/rtc.c:1.29 Wed Mar 16 14:28:39 2011
+++ src/sys/arch/hpcmips/vr/rtc.c Wed Mar 16 14:43:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rtc.c,v 1.29 2011/03/16 14:28:39 tsutsui Exp $ */
+/* $NetBSD: rtc.c,v 1.30 2011/03/16 14:43:37 tsutsui Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rtc.c,v 1.29 2011/03/16 14:28:39 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: rtc.c,v 1.30 2011/03/16 14:43:37 tsutsui Exp $);
#include opt_vr41xx.h
@@ -88,7 +88,7 @@
struct timecounter sc_tc;
};
-void vrrtc_init(struct device *);
+void vrrtc_init(device_t);
int vrrtc_get(todr_chip_handle_t, struct timeval *);
int vrrtc_set(todr_chip_handle_t, struct timeval *);
uint32_t vrrtc_get_timecount(struct timecounter *);
@@ -125,7 +125,7 @@
vrrtc_attach(struct device *parent, struct device *self, void *aux)
CVS commit: src/sys/arch/hpcmips/vr
Module Name:src
Committed By: tsutsui
Date: Wed Mar 16 14:47:34 UTC 2011
Modified Files:
src/sys/arch/hpcmips/vr: rtc.c
Log Message:
Split device_t/softc. Tested on GXemul.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/hpcmips/vr/rtc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/vr/rtc.c
diff -u src/sys/arch/hpcmips/vr/rtc.c:1.30 src/sys/arch/hpcmips/vr/rtc.c:1.31
--- src/sys/arch/hpcmips/vr/rtc.c:1.30 Wed Mar 16 14:43:37 2011
+++ src/sys/arch/hpcmips/vr/rtc.c Wed Mar 16 14:47:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rtc.c,v 1.30 2011/03/16 14:43:37 tsutsui Exp $ */
+/* $NetBSD: rtc.c,v 1.31 2011/03/16 14:47:34 tsutsui Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rtc.c,v 1.30 2011/03/16 14:43:37 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: rtc.c,v 1.31 2011/03/16 14:47:34 tsutsui Exp $);
#include opt_vr41xx.h
@@ -74,7 +74,7 @@
#endif /* VRRTCDEBUG */
struct vrrtc_softc {
- struct device sc_dev;
+ device_t sc_dev;
bus_space_tag_t sc_iot;
bus_space_handle_t sc_ioh;
void *sc_ih;
@@ -98,16 +98,16 @@
CLOCK_RATE, vrrtc_init,
};
-int vrrtc_match(struct device *, struct cfdata *, void *);
-void vrrtc_attach(struct device *, struct device *, void *);
+int vrrtc_match(device_t, cfdata_t, void *);
+void vrrtc_attach(device_t, device_t, void *);
int vrrtc_intr(void*, uint32_t, uint32_t);
void vrrtc_dump_regs(struct vrrtc_softc *);
-CFATTACH_DECL(vrrtc, sizeof(struct vrrtc_softc),
+CFATTACH_DECL_NEW(vrrtc, sizeof(struct vrrtc_softc),
vrrtc_match, vrrtc_attach, NULL, NULL);
int
-vrrtc_match(struct device *parent, struct cfdata *cf, void *aux)
+vrrtc_match(device_t parent, cfdata_t cf, void *aux)
{
return 1;
@@ -122,7 +122,7 @@
#endif /* SINGLE_VRIP_BASE */
void
-vrrtc_attach(struct device *parent, struct device *self, void *aux)
+vrrtc_attach(device_t parent, device_t self, void *aux)
{
struct vrip_attach_args *va = aux;
struct vrrtc_softc *sc = device_private(self);
@@ -149,7 +149,7 @@
sc-sc_tclk_cnt_l_reg = RTC_NO_REG_W;
} else {
panic(%s: unknown base address 0x%lx,
- sc-sc_dev.dv_xname, va-va_addr);
+ device_xname(self), va-va_addr);
}
#endif /* SINGLE_VRIP_BASE */
CVS commit: src/sys/arch/hpcmips/vr
Module Name:src Committed By: tsutsui Date: Thu Mar 10 17:27:43 UTC 2011 Modified Files: src/sys/arch/hpcmips/vr: rtc.c Log Message: Set correct struct clockframe .intr value for hardclock(9). To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/arch/hpcmips/vr/rtc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/vr/rtc.c diff -u src/sys/arch/hpcmips/vr/rtc.c:1.26 src/sys/arch/hpcmips/vr/rtc.c:1.27 --- src/sys/arch/hpcmips/vr/rtc.c:1.26 Sat Dec 12 14:44:08 2009 +++ src/sys/arch/hpcmips/vr/rtc.c Thu Mar 10 17:27:43 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rtc.c,v 1.26 2009/12/12 14:44:08 tsutsui Exp $ */ +/* $NetBSD: rtc.c,v 1.27 2011/03/10 17:27:43 tsutsui Exp $ */ /*- * Copyright (c) 1999 Shin Takemura. All rights reserved. @@ -36,7 +36,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rtc.c,v 1.26 2009/12/12 14:44:08 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: rtc.c,v 1.27 2011/03/10 17:27:43 tsutsui Exp $); #include opt_vr41xx.h @@ -44,6 +44,7 @@ #include sys/systm.h #include sys/timetc.h #include sys/device.h +#include sys/cpu.h #include machine/sysconf.h #include machine/bus.h @@ -230,6 +231,7 @@ bus_space_write_2(sc-sc_iot, sc-sc_ioh, RTCINT_REG_W, RTCINT_ALL); cf.pc = pc; cf.sr = statusReg; + cf.intr = (curcpu()-ci_idepth 1); hardclock(cf); return 0;
CVS commit: src/sys/arch/hpcmips/include
Module Name:src Committed By: tsutsui Date: Sat Feb 26 12:04:25 UTC 2011 Modified Files: src/sys/arch/hpcmips/include: bus_types.h Log Message: No need to include mips/locore.h here. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hpcmips/include/bus_types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/include/bus_types.h diff -u src/sys/arch/hpcmips/include/bus_types.h:1.1 src/sys/arch/hpcmips/include/bus_types.h:1.2 --- src/sys/arch/hpcmips/include/bus_types.h:1.1 Sun Nov 18 08:19:40 2001 +++ src/sys/arch/hpcmips/include/bus_types.h Sat Feb 26 12:04:25 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_types.h,v 1.1 2001/11/18 08:19:40 takemura Exp $ */ +/* $NetBSD: bus_types.h,v 1.2 2011/02/26 12:04:25 tsutsui Exp $ */ /*- * Copyright (c) 2001 TAKEMRUA Shin. All rights reserved. @@ -32,8 +32,6 @@ #ifndef _HPCMIPS_BUS_TYPES_H_ #define _HPCMIPS_BUS_TYPES_H_ -#include mips/locore.h - #define __BUS_SPACE_HAS_STREAM_METHODS typedef u_long bus_addr_t;
CVS commit: src/sys/arch/hpcmips
Module Name:src Committed By: tsutsui Date: Sat Feb 26 12:07:46 UTC 2011 Modified Files: src/sys/arch/hpcmips/hpcmips: bus_dma.c bus_space.c src/sys/arch/hpcmips/tx: tx39.c src/sys/arch/hpcmips/vr: vr.c Log Message: Explicitly include mips/locore.h for wbflush(). To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/arch/hpcmips/hpcmips/bus_dma.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/hpcmips/hpcmips/bus_space.c cvs rdiff -u -r1.42 -r1.43 src/sys/arch/hpcmips/tx/tx39.c cvs rdiff -u -r1.59 -r1.60 src/sys/arch/hpcmips/vr/vr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/hpcmips/bus_dma.c diff -u src/sys/arch/hpcmips/hpcmips/bus_dma.c:1.36 src/sys/arch/hpcmips/hpcmips/bus_dma.c:1.37 --- src/sys/arch/hpcmips/hpcmips/bus_dma.c:1.36 Sun Feb 20 07:58:13 2011 +++ src/sys/arch/hpcmips/hpcmips/bus_dma.c Sat Feb 26 12:07:45 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_dma.c,v 1.36 2011/02/20 07:58:13 matt Exp $ */ +/* $NetBSD: bus_dma.c,v 1.37 2011/02/26 12:07:45 tsutsui Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.36 2011/02/20 07:58:13 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.37 2011/02/26 12:07:45 tsutsui Exp $); #include sys/param.h #include sys/systm.h @@ -40,6 +40,7 @@ #include uvm/uvm_extern.h #include mips/cache.h +#include mips/locore.h #include machine/bus.h #include machine/bus_dma_hpcmips.h Index: src/sys/arch/hpcmips/hpcmips/bus_space.c diff -u src/sys/arch/hpcmips/hpcmips/bus_space.c:1.29 src/sys/arch/hpcmips/hpcmips/bus_space.c:1.30 --- src/sys/arch/hpcmips/hpcmips/bus_space.c:1.29 Sun Feb 20 07:58:14 2011 +++ src/sys/arch/hpcmips/hpcmips/bus_space.c Sat Feb 26 12:07:45 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_space.c,v 1.29 2011/02/20 07:58:14 matt Exp $ */ +/* $NetBSD: bus_space.c,v 1.30 2011/02/26 12:07:45 tsutsui Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.29 2011/02/20 07:58:14 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.30 2011/02/26 12:07:45 tsutsui Exp $); #include sys/param.h #include sys/systm.h @@ -41,6 +41,7 @@ #include uvm/uvm_extern.h #include mips/cache.h +#include mips/locore.h #include mips/pte.h #include machine/bus.h #include machine/bus_space_hpcmips.h Index: src/sys/arch/hpcmips/tx/tx39.c diff -u src/sys/arch/hpcmips/tx/tx39.c:1.42 src/sys/arch/hpcmips/tx/tx39.c:1.43 --- src/sys/arch/hpcmips/tx/tx39.c:1.42 Sun Feb 20 07:58:14 2011 +++ src/sys/arch/hpcmips/tx/tx39.c Sat Feb 26 12:07:45 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: tx39.c,v 1.42 2011/02/20 07:58:14 matt Exp $ */ +/* $NetBSD: tx39.c,v 1.43 2011/02/26 12:07:45 tsutsui Exp $ */ /*- * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tx39.c,v 1.42 2011/02/20 07:58:14 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: tx39.c,v 1.43 2011/02/26 12:07:45 tsutsui Exp $); #include opt_vr41xx.h #include opt_tx39xx.h @@ -44,6 +44,7 @@ #include uvm/uvm_extern.h #include mips/cache.h +#include mips/locore.h #include machine/bootinfo.h /* bootinfo */ #include machine/sysconf.h /* platform */ Index: src/sys/arch/hpcmips/vr/vr.c diff -u src/sys/arch/hpcmips/vr/vr.c:1.59 src/sys/arch/hpcmips/vr/vr.c:1.60 --- src/sys/arch/hpcmips/vr/vr.c:1.59 Sun Feb 20 07:58:14 2011 +++ src/sys/arch/hpcmips/vr/vr.c Sat Feb 26 12:07:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: vr.c,v 1.59 2011/02/20 07:58:14 matt Exp $ */ +/* $NetBSD: vr.c,v 1.60 2011/02/26 12:07:46 tsutsui Exp $ */ /*- * Copyright (c) 1999-2002 @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vr.c,v 1.59 2011/02/20 07:58:14 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: vr.c,v 1.60 2011/02/26 12:07:46 tsutsui Exp $); #include opt_vr41xx.h #include opt_tx39xx.h @@ -52,6 +52,9 @@ #include uvm/uvm_extern.h +#include mips/cache.h +#include mips/locore.h + #include machine/sysconf.h #include machine/bootinfo.h #include machine/bus_space_hpcmips.h @@ -66,8 +69,6 @@ #include hpcmips/vr/vripreg.h #include hpcmips/vr/rtcreg.h -#include mips/cache.h - #include vrip_common.h #if NVRIP_COMMON 0 #include hpcmips/vr/vripvar.h
CVS commit: src/sys/arch/hpcmips/hpcmips
Module Name:src Committed By: tsutsui Date: Sat Feb 26 12:08:30 UTC 2011 Modified Files: src/sys/arch/hpcmips/hpcmips: cpu.c Log Message: Explicitly include mips/locore.h for mips_locoresw. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hpcmips/hpcmips/cpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/hpcmips/cpu.c diff -u src/sys/arch/hpcmips/hpcmips/cpu.c:1.17 src/sys/arch/hpcmips/hpcmips/cpu.c:1.18 --- src/sys/arch/hpcmips/hpcmips/cpu.c:1.17 Sun Feb 20 07:58:14 2011 +++ src/sys/arch/hpcmips/hpcmips/cpu.c Sat Feb 26 12:08:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.17 2011/02/20 07:58:14 matt Exp $ */ +/* $NetBSD: cpu.c,v 1.18 2011/02/26 12:08:30 tsutsui Exp $ */ /*- * Copyright (c) 1999 Shin Takemura, All rights reserved. * Copyright (c) 1999-2001 SATO Kazumi, All rights reserved. @@ -56,7 +56,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.17 2011/02/20 07:58:14 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.18 2011/02/26 12:08:30 tsutsui Exp $); #include sys/param.h #include sys/systm.h @@ -64,6 +64,8 @@ #include sys/cpu.h #include sys/bus.h +#include mips/locore.h + #include machine/sysconf.h #include machine/autoconf.h
CVS commit: src/sys/arch/hpcmips/tx
Module Name:src Committed By: tsutsui Date: Sat Feb 26 12:09:34 UTC 2011 Modified Files: src/sys/arch/hpcmips/tx: tx39icu.c Log Message: Explicitly include mips/locore.h for softint_process(). To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/arch/hpcmips/tx/tx39icu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/tx/tx39icu.c diff -u src/sys/arch/hpcmips/tx/tx39icu.c:1.28 src/sys/arch/hpcmips/tx/tx39icu.c:1.29 --- src/sys/arch/hpcmips/tx/tx39icu.c:1.28 Sun Feb 20 07:58:14 2011 +++ src/sys/arch/hpcmips/tx/tx39icu.c Sat Feb 26 12:09:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: tx39icu.c,v 1.28 2011/02/20 07:58:14 matt Exp $ */ +/* $NetBSD: tx39icu.c,v 1.29 2011/02/26 12:09:34 tsutsui Exp $ */ /*- * Copyright (c) 1999-2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tx39icu.c,v 1.28 2011/02/20 07:58:14 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: tx39icu.c,v 1.29 2011/02/26 12:09:34 tsutsui Exp $); #include opt_vr41xx.h #include opt_tx39xx.h @@ -49,6 +49,7 @@ #include uvm/uvm_extern.h #include mips/cpuregs.h +#include mips/locore.h #include machine/bus.h #include hpcmips/tx/tx39var.h
CVS commit: src/sys/arch/hpcmips/tx
Module Name:src
Committed By: tsutsui
Date: Sat Feb 26 12:54:41 UTC 2011
Modified Files:
src/sys/arch/hpcmips/tx: tx39icu.c
Log Message:
Mechanically adapt to new interrupt/spl framework. Untested.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/hpcmips/tx/tx39icu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/tx/tx39icu.c
diff -u src/sys/arch/hpcmips/tx/tx39icu.c:1.29 src/sys/arch/hpcmips/tx/tx39icu.c:1.30
--- src/sys/arch/hpcmips/tx/tx39icu.c:1.29 Sat Feb 26 12:09:34 2011
+++ src/sys/arch/hpcmips/tx/tx39icu.c Sat Feb 26 12:54:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tx39icu.c,v 1.29 2011/02/26 12:09:34 tsutsui Exp $ */
+/* $NetBSD: tx39icu.c,v 1.30 2011/02/26 12:54:41 tsutsui Exp $ */
/*-
* Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tx39icu.c,v 1.29 2011/02/26 12:09:34 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: tx39icu.c,v 1.30 2011/02/26 12:54:41 tsutsui Exp $);
#include opt_vr41xx.h
#include opt_tx39xx.h
@@ -39,6 +39,8 @@
#include opt_tx39icu_debug.h
#include opt_tx39_watchdogtimer.h
+#define __INTR_PRIVATE
+
#include sys/param.h
#include sys/systm.h
#include sys/device.h
@@ -49,8 +51,8 @@
#include uvm/uvm_extern.h
#include mips/cpuregs.h
-#include mips/locore.h
#include machine/bus.h
+#include machine/intr.h
#include hpcmips/tx/tx39var.h
#include hpcmips/tx/tx39icureg.h
@@ -66,7 +68,7 @@
#else
#define TX_INTR cpu_intr /* locore_mips3 directly call this */
#endif
-void TX_INTR(u_int32_t, u_int32_t, u_int32_t, u_int32_t);
+void TX_INTR(int, vaddr_t, uint32_t);
#ifdef TX39ICU_DEBUG
#define DPRINTF_ENABLE
@@ -74,29 +76,26 @@
#endif
#include machine/debug.h
-u_int32_t tx39intrvec;
+uint32_t tx39intrvec;
/*
* This is a mask of bits to clear in the SR when we go to a
* given interrupt priority level.
*/
-const u_int32_t __ipl_sr_bits_tx[_IPL_N] = {
- 0, /* IPL_NONE */
-
- MIPS_SOFT_INT_MASK_0, /* IPL_SOFTCLOCK */
-
- MIPS_SOFT_INT_MASK_0|
- MIPS_SOFT_INT_MASK_1, /* IPL_SOFTNET */
-
- MIPS_SOFT_INT_MASK_0|
- MIPS_SOFT_INT_MASK_1|
- MIPS_INT_MASK_2|
- MIPS_INT_MASK_4, /* IPL_VM */
-
- MIPS_SOFT_INT_MASK_0|
- MIPS_SOFT_INT_MASK_1|
- MIPS_INT_MASK_2|
- MIPS_INT_MASK_4, /* IPL_SCHED */
+const struct ipl_sr_map __ipl_sr_map_tx = {
+.sr_bits = {
+ [IPL_NONE] = 0,
+ [IPL_SOFTCLOCK] = MIPS_SOFT_INT_MASK_0,
+ [IPL_SOFTNET] = MIPS_SOFT_INT_MASK,
+ [IPL_VM] = MIPS_SOFT_INT_MASK
+| MIPS_INT_MASK_2
+| MIPS_INT_MASK_4,
+ [IPL_SCHED] = MIPS_SOFT_INT_MASK
+| MIPS_INT_MASK_2
+| MIPS_INT_MASK_4,
+ [IPL_DDB] = MIPS_INT_MASK,
+ [IPL_HIGH] = MIPS_INT_MASK,
+ },
};
/* IRQHIGH lines list */
@@ -201,14 +200,13 @@
int tx39icu_match(struct device *, struct cfdata *, void *);
void tx39icu_attach(struct device *, struct device *, void *);
-int tx39icu_intr(u_int32_t, u_int32_t, u_int32_t, u_int32_t);
void tx39_intr_dump(struct tx39icu_softc *);
void tx39_intr_decode(int, int *, int *);
void tx39_irqhigh_disestablish(tx_chipset_tag_t, int, int, int);
void tx39_irqhigh_establish(tx_chipset_tag_t, int, int, int,
int (*)(void *), void *);
-void tx39_irqhigh_intr(u_int32_t, u_int32_t, u_int32_t, u_int32_t);
+void tx39_irqhigh_intr(uint32_t, uint32_t, uint32_t);
int tx39_irqhigh(int, int);
CFATTACH_DECL(tx39icu, sizeof(struct tx39icu_softc),
@@ -306,23 +304,15 @@
}
void
-TX_INTR(u_int32_t status, u_int32_t cause, vaddr_t pc, u_int32_t ipending)
+TX_INTR(int ppl, vaddr_t pc, uint32_t status)
{
+ uint32_t ipending;
+ int ipl;
struct tx39icu_softc *sc;
tx_chipset_tag_t tc;
- struct cpu_info *ci;
txreg_t reg, pend, *regs;
int i, j;
- ci = curcpu();
- ci-ci_idepth++;
- ci-ci_data.cpu_nintr++;
-
-#ifdef __HAVE_FAST_SOFTINTS
- if ((ipending MIPS_HARD_INT_MASK) == 0)
- goto softintr;
-#endif
-
tc = tx_conf_get_tag();
sc = tc-tc_intrt;
/*
@@ -340,89 +330,92 @@
regs[8] = tx_conf_read(tc, TX39_INTRSTATUS8_REG);
#endif
+ while (ppl (ipl = splintr(ipending))) {
#ifdef TX39ICU_DEBUG
- if (!(ipending MIPS_INT_MASK_4) !(ipending MIPS_INT_MASK_2)) {
- dbg_bit_print(ipending);
- panic(bogus HwInt);
- }
- if (tx39icu_debug 1) {
- tx39_intr_dump(sc);
- }
+ if (!(ipending MIPS_INT_MASK_4)
+ !(ipending MIPS_INT_MASK_2)) {
+ dbg_bit_print(ipending);
+ panic(bogus HwInt);
+ }
+ if (tx39icu_debug 1) {
+ tx39_intr_dump(sc);
+ }
#endif /* TX39ICU_DEBUG */
- /* IRQHIGH */
- if (ipending MIPS_INT_MASK_4) {
- tx39_irqhigh_intr(ipending, pc, status, cause);
-
-#ifdef __HAVE_FAST_SOFTINTS
- goto softintr;
-#endif
- }
+ /* IRQHIGH */
+ if (ipending MIPS_INT_MASK_4) {
+ tx39_irqhigh_intr(ipending, pc, status);
+ }
- /* IRQLOW */
- if (ipending MIPS_INT_MASK_2) {
- for (i = 1; i = TX39_INTRSET_MAX; i++) {
- int ofs;
+ /* IRQLOW */
+ if (ipending
CVS commit: src/sys/arch/hpcmips
Module Name:src Committed By: matt Date: Sun Feb 20 07:58:14 UTC 2011 Modified Files: src/sys/arch/hpcmips/conf: std.hpcmips std.lcard src/sys/arch/hpcmips/hpcmips: autoconf.c bus_dma.c bus_space.c cpu.c hpcapm_machdep.c interrupt.c machdep.c mainbus.c src/sys/arch/hpcmips/include: intr.h sysconf.h src/sys/arch/hpcmips/tx: tx39.c tx39icu.c src/sys/arch/hpcmips/vr: vr.c vrdcu.c Log Message: Merge forward matt-nb5-mips64 Adapt to new interrupt/spl framework (XXX don't know how to deal with use of spllower in sleep/pause code so hpcmips kernel will fail to compile). To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hpcmips/conf/std.hpcmips cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hpcmips/conf/std.lcard cvs rdiff -u -r1.23 -r1.24 src/sys/arch/hpcmips/hpcmips/autoconf.c cvs rdiff -u -r1.35 -r1.36 src/sys/arch/hpcmips/hpcmips/bus_dma.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/hpcmips/hpcmips/bus_space.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hpcmips/hpcmips/cpu.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hpcmips/hpcmips/hpcapm_machdep.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hpcmips/hpcmips/interrupt.c cvs rdiff -u -r1.113 -r1.114 src/sys/arch/hpcmips/hpcmips/machdep.c cvs rdiff -u -r1.30 -r1.31 src/sys/arch/hpcmips/hpcmips/mainbus.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/hpcmips/include/intr.h cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hpcmips/include/sysconf.h cvs rdiff -u -r1.41 -r1.42 src/sys/arch/hpcmips/tx/tx39.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/hpcmips/tx/tx39icu.c cvs rdiff -u -r1.58 -r1.59 src/sys/arch/hpcmips/vr/vr.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hpcmips/vr/vrdcu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/conf/std.hpcmips diff -u src/sys/arch/hpcmips/conf/std.hpcmips:1.19 src/sys/arch/hpcmips/conf/std.hpcmips:1.20 --- src/sys/arch/hpcmips/conf/std.hpcmips:1.19 Sun Dec 11 12:17:33 2005 +++ src/sys/arch/hpcmips/conf/std.hpcmips Sun Feb 20 07:58:13 2011 @@ -1,4 +1,4 @@ -# $NetBSD: std.hpcmips,v 1.19 2005/12/11 12:17:33 christos Exp $ +# $NetBSD: std.hpcmips,v 1.20 2011/02/20 07:58:13 matt Exp $ # standard, required hpcmips info machine hpcmips mips @@ -6,7 +6,7 @@ makeoptions MACHINE_ARCH=mipsel options NOFPU # No FPU -options SOFTFLOAT # emulate FPU insn +options FPEMUL # emulate FPU insn mainbus0 at root cpu* at mainbus0 Index: src/sys/arch/hpcmips/conf/std.lcard diff -u src/sys/arch/hpcmips/conf/std.lcard:1.7 src/sys/arch/hpcmips/conf/std.lcard:1.8 --- src/sys/arch/hpcmips/conf/std.lcard:1.7 Sat Sep 16 02:14:56 2006 +++ src/sys/arch/hpcmips/conf/std.lcard Sun Feb 20 07:58:13 2011 @@ -1,4 +1,4 @@ -# $NetBSD: std.lcard,v 1.7 2006/09/16 02:14:56 gdamore Exp $ +# $NetBSD: std.lcard,v 1.8 2011/02/20 07:58:13 matt Exp $ # standard, required hpcmips info machine hpcmips mips @@ -6,7 +6,7 @@ makeoptions MACHINE_ARCH=mipsel options NOFPU # No FPU -options SOFTFLOAT # emulate FPU insn +options FPEMUL # emulate FPU insn options MIPS3 # R4000/R4400/R4600 CPUs options MIPS3_4100 # VR4100 core Index: src/sys/arch/hpcmips/hpcmips/autoconf.c diff -u src/sys/arch/hpcmips/hpcmips/autoconf.c:1.23 src/sys/arch/hpcmips/hpcmips/autoconf.c:1.24 --- src/sys/arch/hpcmips/hpcmips/autoconf.c:1.23 Tue Feb 8 20:20:14 2011 +++ src/sys/arch/hpcmips/hpcmips/autoconf.c Sun Feb 20 07:58:13 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.23 2011/02/08 20:20:14 rmind Exp $ */ +/* $NetBSD: autoconf.c,v 1.24 2011/02/20 07:58:13 matt Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -39,7 +39,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.23 2011/02/08 20:20:14 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.24 2011/02/20 07:58:13 matt Exp $); #include sys/param.h #include sys/systm.h @@ -76,7 +76,7 @@ panic(no mainbus found); /* Configuration is finished, turn on interrupts. */ - _splnone(); /* enable all source forcing SOFT_INTs cleared */ + spl0(); /* enable all source forcing SOFT_INTs cleared */ } void Index: src/sys/arch/hpcmips/hpcmips/bus_dma.c diff -u src/sys/arch/hpcmips/hpcmips/bus_dma.c:1.35 src/sys/arch/hpcmips/hpcmips/bus_dma.c:1.36 --- src/sys/arch/hpcmips/hpcmips/bus_dma.c:1.35 Mon Dec 14 00:46:03 2009 +++ src/sys/arch/hpcmips/hpcmips/bus_dma.c Sun Feb 20 07:58:13 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_dma.c,v 1.35 2009/12/14 00:46:03 matt Exp $ */ +/* $NetBSD: bus_dma.c,v 1.36 2011/02/20 07:58:13 matt Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.35 2009/12/14 00:46:03 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.36 2011/02/20 07:58:13 matt Exp $); #include sys/param.h #include sys/systm.h @@ -516,13 +516,12 @@ bus_size_t boundary, bus_dma_segment_t *segs, int
CVS commit: src/sys/arch/hpcmips/hpcmips
Module Name:src Committed By: uebayasi Date: Mon Nov 15 06:25:43 UTC 2010 Modified Files: src/sys/arch/hpcmips/hpcmips: machdep.c Log Message: curlwp needs sys/lwp.h. To generate a diff of this commit: cvs rdiff -u -r1.111 -r1.112 src/sys/arch/hpcmips/hpcmips/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/hpcmips/machdep.c diff -u src/sys/arch/hpcmips/hpcmips/machdep.c:1.111 src/sys/arch/hpcmips/hpcmips/machdep.c:1.112 --- src/sys/arch/hpcmips/hpcmips/machdep.c:1.111 Tue Mar 2 21:17:31 2010 +++ src/sys/arch/hpcmips/hpcmips/machdep.c Mon Nov 15 06:25:42 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.111 2010/03/02 21:17:31 pooka Exp $ */ +/* $NetBSD: machdep.c,v 1.112 2010/11/15 06:25:42 uebayasi Exp $ */ /*- * Copyright (c) 1999 Shin Takemura, All rights reserved. @@ -108,7 +108,7 @@ */ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.111 2010/03/02 21:17:31 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.112 2010/11/15 06:25:42 uebayasi Exp $); #include opt_vr41xx.h #include opt_tx39xx.h @@ -135,6 +135,7 @@ #include sys/boot_flag.h #include sys/ksyms.h #include sys/device.h +#include sys/lwp.h #include uvm/uvm_extern.h
CVS commit: src/sys/arch/hpcmips/tx
Module Name:src Committed By: uebayasi Date: Mon Nov 15 06:26:58 UTC 2010 Modified Files: src/sys/arch/hpcmips/tx: tx39icu.c Log Message: struct cpu_info * deref needs sys/cpu.h. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/hpcmips/tx/tx39icu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/tx/tx39icu.c diff -u src/sys/arch/hpcmips/tx/tx39icu.c:1.25 src/sys/arch/hpcmips/tx/tx39icu.c:1.26 --- src/sys/arch/hpcmips/tx/tx39icu.c:1.25 Mon Apr 28 20:23:21 2008 +++ src/sys/arch/hpcmips/tx/tx39icu.c Mon Nov 15 06:26:58 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: tx39icu.c,v 1.25 2008/04/28 20:23:21 martin Exp $ */ +/* $NetBSD: tx39icu.c,v 1.26 2010/11/15 06:26:58 uebayasi Exp $ */ /*- * Copyright (c) 1999-2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tx39icu.c,v 1.25 2008/04/28 20:23:21 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: tx39icu.c,v 1.26 2010/11/15 06:26:58 uebayasi Exp $); #include opt_vr41xx.h #include opt_tx39xx.h @@ -44,6 +44,7 @@ #include sys/device.h #include sys/malloc.h #include sys/queue.h +#include sys/cpu.h #include uvm/uvm_extern.h
CVS commit: src/sys/arch/hpcmips/vr
Module Name:src Committed By: uebayasi Date: Mon Nov 15 06:27:41 UTC 2010 Modified Files: src/sys/arch/hpcmips/vr: vr.c Log Message: struct cpu_info * deref needs sys/cpu.h. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/arch/hpcmips/vr/vr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/vr/vr.c diff -u src/sys/arch/hpcmips/vr/vr.c:1.56 src/sys/arch/hpcmips/vr/vr.c:1.57 --- src/sys/arch/hpcmips/vr/vr.c:1.56 Sat Apr 10 22:53:59 2010 +++ src/sys/arch/hpcmips/vr/vr.c Mon Nov 15 06:27:41 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: vr.c,v 1.56 2010/04/10 22:53:59 jun Exp $ */ +/* $NetBSD: vr.c,v 1.57 2010/11/15 06:27:41 uebayasi Exp $ */ /*- * Copyright (c) 1999-2002 @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vr.c,v 1.56 2010/04/10 22:53:59 jun Exp $); +__KERNEL_RCSID(0, $NetBSD: vr.c,v 1.57 2010/11/15 06:27:41 uebayasi Exp $); #include opt_vr41xx.h #include opt_tx39xx.h @@ -46,6 +46,7 @@ #include sys/reboot.h #include sys/device.h #include sys/bus.h +#include sys/cpu.h #include uvm/uvm_extern.h
CVS commit: src/sys/arch/hpcmips/tx
Module Name:src
Committed By: tsutsui
Date: Tue Jul 20 15:03:53 UTC 2010
Modified Files:
src/sys/arch/hpcmips/tx: txcom.c
Log Message:
Replace callout(9) with softint(9) which is more appropriate there.
Inspired by PR port-hpcmips/43472 and tested by Risto Sainio.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/hpcmips/tx/txcom.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/tx/txcom.c
diff -u src/sys/arch/hpcmips/tx/txcom.c:1.43 src/sys/arch/hpcmips/tx/txcom.c:1.44
--- src/sys/arch/hpcmips/tx/txcom.c:1.43 Fri Jul 16 15:30:10 2010
+++ src/sys/arch/hpcmips/tx/txcom.c Tue Jul 20 15:03:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: txcom.c,v 1.43 2010/07/16 15:30:10 tsutsui Exp $ */
+/* $NetBSD: txcom.c,v 1.44 2010/07/20 15:03:53 tsutsui Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: txcom.c,v 1.43 2010/07/16 15:30:10 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: txcom.c,v 1.44 2010/07/20 15:03:53 tsutsui Exp $);
#include opt_tx39uart_debug.h
@@ -99,8 +99,8 @@
struct tty *sc_tty;
struct txcom_chip *sc_chip;
- struct callout sc_txsoft_ch;
- struct callout sc_rxsoft_ch;
+ void *sc_txsoft_cookie;
+ void *sc_rxsoft_cookie;
u_int8_t *sc_tba; /* transmit buffer address */
int sc_tbc; /* transmit byte count */
@@ -249,10 +249,6 @@
printf(\n);
- /* initialize callouts */
- callout_init(sc-sc_txsoft_ch, 0);
- callout_init(sc-sc_rxsoft_ch, 0);
-
/*
* Enable interrupt
*/
@@ -273,6 +269,11 @@
tx_intr_establish(tc, TXCOMINTR(BREAK, slot), IST_EDGE, IPL_TTY,
txcom_break_intr, sc);
+ sc-sc_txsoft_cookie =
+ softint_establish(SOFTINT_SERIAL, txcom_txsoft, sc);
+ sc-sc_rxsoft_cookie =
+ softint_establish(SOFTINT_SERIAL, txcom_rxsoft, sc);
+
/*
* UARTA has external signal line. (its wiring is platform dependent)
*/
@@ -700,7 +701,7 @@
sc-sc_rbuf[sc-sc_rbput] = c;
sc-sc_rbput = (sc-sc_rbput + 1) % TXCOM_RING_MASK;
- callout_reset(sc-sc_rxsoft_ch, 1, txcom_rxsoft, sc);
+ softint_schedule(sc-sc_rxsoft_cookie);
return 0;
}
@@ -749,7 +750,7 @@
sc-sc_tbc--;
sc-sc_tba++;
} else {
- callout_reset(sc-sc_txsoft_ch, 1, txcom_txsoft, sc);
+ softint_schedule(sc-sc_txsoft_cookie);
}
return 0;
CVS commit: src/sys/arch/hpcmips/dev
Module Name:src Committed By: tsutsui Date: Tue Jul 20 15:06:44 UTC 2010 Modified Files: src/sys/arch/hpcmips/dev: plumohci.c Log Message: Remove (possibly) unnecessary boundary arg from bus_space_alloc(9) for DMA shared memory. PR port-hpcmips/43473 by Risto Sainio. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hpcmips/dev/plumohci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/dev/plumohci.c diff -u src/sys/arch/hpcmips/dev/plumohci.c:1.12 src/sys/arch/hpcmips/dev/plumohci.c:1.13 --- src/sys/arch/hpcmips/dev/plumohci.c:1.12 Thu Apr 3 17:04:40 2008 +++ src/sys/arch/hpcmips/dev/plumohci.c Tue Jul 20 15:06:43 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: plumohci.c,v 1.12 2008/04/03 17:04:40 drochner Exp $ */ +/* $NetBSD: plumohci.c,v 1.13 2010/07/20 15:06:43 tsutsui Exp $ */ /*- * Copyright (c) 2000 UCHIYAMA Yasushi @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: plumohci.c,v 1.12 2008/04/03 17:04:40 drochner Exp $); +__KERNEL_RCSID(0, $NetBSD: plumohci.c,v 1.13 2010/07/20 15:06:43 tsutsui Exp $); #include sys/param.h #include sys/systm.h @@ -241,7 +241,7 @@ */ error = bus_space_alloc(sc-sc.iot, PLUM_OHCI_SHMEMBASE, PLUM_OHCI_SHMEMBASE + PLUM_OHCI_SHMEMSIZE - 1, - size, OHCI_PAGE_SIZE, OHCI_PAGE_SIZE, 0, + size, OHCI_PAGE_SIZE, 0, 0, (bus_addr_t *)(void *)caddr, bsh); if (error) return (1);
CVS commit: src/sys/arch/hpcmips/tx
Module Name:src Committed By: tsutsui Date: Fri Jul 16 15:28:38 UTC 2010 Modified Files: src/sys/arch/hpcmips/tx: txcom.c Log Message: Add missing callout_init(9) calls. PR port-hpcmips/43472 To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/arch/hpcmips/tx/txcom.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/tx/txcom.c diff -u src/sys/arch/hpcmips/tx/txcom.c:1.41 src/sys/arch/hpcmips/tx/txcom.c:1.42 --- src/sys/arch/hpcmips/tx/txcom.c:1.41 Sat Mar 14 15:36:07 2009 +++ src/sys/arch/hpcmips/tx/txcom.c Fri Jul 16 15:28:38 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: txcom.c,v 1.41 2009/03/14 15:36:07 dsl Exp $ */ +/* $NetBSD: txcom.c,v 1.42 2010/07/16 15:28:38 tsutsui Exp $ */ /*- * Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: txcom.c,v 1.41 2009/03/14 15:36:07 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: txcom.c,v 1.42 2010/07/16 15:28:38 tsutsui Exp $); #include opt_tx39uart_debug.h @@ -249,6 +249,10 @@ printf(\n); + /* initialize callouts */ + callout_init(sc-sc_txsoft_ch, 0); + callout_init(sc-sc_rxsoft_ch, 0); + /* * Enable interrupt */
CVS commit: src/sys/arch/hpcmips/tx
Module Name:src
Committed By: tsutsui
Date: Fri Jul 16 15:30:10 UTC 2010
Modified Files:
src/sys/arch/hpcmips/tx: txcom.c
Log Message:
Fix a wrong arg for callout_reset(9) in txcom_txintr(). PR port-hpcmips/43474
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/hpcmips/tx/txcom.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/tx/txcom.c
diff -u src/sys/arch/hpcmips/tx/txcom.c:1.42 src/sys/arch/hpcmips/tx/txcom.c:1.43
--- src/sys/arch/hpcmips/tx/txcom.c:1.42 Fri Jul 16 15:28:38 2010
+++ src/sys/arch/hpcmips/tx/txcom.c Fri Jul 16 15:30:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: txcom.c,v 1.42 2010/07/16 15:28:38 tsutsui Exp $ */
+/* $NetBSD: txcom.c,v 1.43 2010/07/16 15:30:10 tsutsui Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: txcom.c,v 1.42 2010/07/16 15:28:38 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: txcom.c,v 1.43 2010/07/16 15:30:10 tsutsui Exp $);
#include opt_tx39uart_debug.h
@@ -749,7 +749,7 @@
sc-sc_tbc--;
sc-sc_tba++;
} else {
- callout_reset(sc-sc_rxsoft_ch, 1, txcom_txsoft, sc);
+ callout_reset(sc-sc_txsoft_ch, 1, txcom_txsoft, sc);
}
return 0;
CVS commit: src/sys/arch/hpcmips/vr
Module Name:src
Committed By: dholland
Date: Sun Jun 6 06:10:03 UTC 2010
Modified Files:
src/sys/arch/hpcmips/vr: vr4181aiu.c
Log Message:
Add missing close-parenthesis; reported by Henning Petersen in PR 42526.
(HI CEGGER!)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hpcmips/vr/vr4181aiu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/vr/vr4181aiu.c
diff -u src/sys/arch/hpcmips/vr/vr4181aiu.c:1.6 src/sys/arch/hpcmips/vr/vr4181aiu.c:1.7
--- src/sys/arch/hpcmips/vr/vr4181aiu.c:1.6 Wed Jun 11 23:53:15 2008
+++ src/sys/arch/hpcmips/vr/vr4181aiu.c Sun Jun 6 06:10:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vr4181aiu.c,v 1.6 2008/06/11 23:53:15 cegger Exp $ */
+/* $NetBSD: vr4181aiu.c,v 1.7 2010/06/06 06:10:03 dholland Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vr4181aiu.c,v 1.6 2008/06/11 23:53:15 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: vr4181aiu.c,v 1.7 2010/06/06 06:10:03 dholland Exp $);
#include sys/param.h
#include sys/conf.h
@@ -235,7 +235,7 @@
{
struct vr4181aiu_softc *sc;
- sc = device_lookup_private(vr4181aiu_cd, minor(dev);
+ sc = device_lookup_private(vr4181aiu_cd, minor(dev));
if (sc == NULL)
return ENXIO;
CVS commit: src/sys/arch/hpcmips/vr
Module Name:src
Committed By: jun
Date: Sat Apr 10 22:53:59 UTC 2010
Modified Files:
src/sys/arch/hpcmips/vr: vr.c
Log Message:
workaround for port-hpcmips/42934
NetBSD/hpcmips can't boot after 5.99.23
adviced by Naoki Fukaumi on twitter.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/hpcmips/vr/vr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/vr/vr.c
diff -u src/sys/arch/hpcmips/vr/vr.c:1.55 src/sys/arch/hpcmips/vr/vr.c:1.56
--- src/sys/arch/hpcmips/vr/vr.c:1.55 Thu Jan 21 01:23:15 2010
+++ src/sys/arch/hpcmips/vr/vr.c Sat Apr 10 22:53:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vr.c,v 1.55 2010/01/21 01:23:15 pooka Exp $ */
+/* $NetBSD: vr.c,v 1.56 2010/04/10 22:53:59 jun Exp $ */
/*-
* Copyright (c) 1999-2002
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vr.c,v 1.55 2010/01/21 01:23:15 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: vr.c,v 1.56 2010/04/10 22:53:59 jun Exp $);
#include opt_vr41xx.h
#include opt_tx39xx.h
@@ -344,8 +344,11 @@
for (; addr end; addr += PAGE_SIZE) {
page = (char *)MIPS_PHYS_TO_KSEG1(addr);
+/*
+ XXX see port-hpcmips/42934
if (badaddr(page, 4))
goto bad;
+ */
/* stop memory probing at first memory image */
if (memcmp(page, (void *)MIPS_PHYS_TO_KSEG0(0), 128) == 0)
CVS commit: src/sys/arch/hpcmips
Module Name:src
Committed By: pooka
Date: Thu Jan 21 01:23:15 UTC 2010
Modified Files:
src/sys/arch/hpcmips/hpcmips: machdep.c
src/sys/arch/hpcmips/include: cpu.h
src/sys/arch/hpcmips/tx: tx39.c
src/sys/arch/hpcmips/vr: vr.c
Log Message:
Move arch-local variable to a better namespace to make build again.
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/sys/arch/hpcmips/hpcmips/machdep.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hpcmips/include/cpu.h
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/hpcmips/tx/tx39.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/hpcmips/vr/vr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/hpcmips/machdep.c
diff -u src/sys/arch/hpcmips/hpcmips/machdep.c:1.107 src/sys/arch/hpcmips/hpcmips/machdep.c:1.108
--- src/sys/arch/hpcmips/hpcmips/machdep.c:1.107 Wed Dec 16 23:19:07 2009
+++ src/sys/arch/hpcmips/hpcmips/machdep.c Thu Jan 21 01:23:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.107 2009/12/16 23:19:07 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.108 2010/01/21 01:23:14 pooka Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura, All rights reserved.
@@ -108,7 +108,7 @@
*/
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.107 2009/12/16 23:19:07 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.108 2010/01/21 01:23:14 pooka Exp $);
#include opt_vr41xx.h
#include opt_tx39xx.h
@@ -192,7 +192,7 @@
#endif
/* the following is used externally (sysctl_hw) */
-char cpu_name[40]; /* set CPU depend xx_init() */
+char hpcmips_cpuname[40]; /* set CPU depend xx_init() */
struct cpu_info cpu_info_store; /* only one CPU */
int cpuspeed = 1; /* approx # instr per usec. */
@@ -551,7 +551,7 @@
* Good {morning,afternoon,evening,night}.
*/
printf(%s%s, copyright, version);
- sprintf(cpu_model, %s (%s), platid_name(platid), cpu_name);
+ sprintf(cpu_model, %s (%s), platid_name(platid), hpcmips_cpuname);
printf(%s\n, cpu_model);
format_bytes(pbuf, sizeof(pbuf), ctob(physmem));
printf(total memory = %s\n, pbuf);
Index: src/sys/arch/hpcmips/include/cpu.h
diff -u src/sys/arch/hpcmips/include/cpu.h:1.12 src/sys/arch/hpcmips/include/cpu.h:1.13
--- src/sys/arch/hpcmips/include/cpu.h:1.12 Thu Jan 31 17:56:34 2002
+++ src/sys/arch/hpcmips/include/cpu.h Thu Jan 21 01:23:15 2010
@@ -1,6 +1,6 @@
-/* $NetBSD: cpu.h,v 1.12 2002/01/31 17:56:34 uch Exp $ */
+/* $NetBSD: cpu.h,v 1.13 2010/01/21 01:23:15 pooka Exp $ */
#include mips/cpu.h
#ifndef _LOCORE
-extern char cpu_name[];
+extern char hpcmips_cpuname[];
#endif
Index: src/sys/arch/hpcmips/tx/tx39.c
diff -u src/sys/arch/hpcmips/tx/tx39.c:1.40 src/sys/arch/hpcmips/tx/tx39.c:1.41
--- src/sys/arch/hpcmips/tx/tx39.c:1.40 Wed Mar 18 10:22:29 2009
+++ src/sys/arch/hpcmips/tx/tx39.c Thu Jan 21 01:23:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: tx39.c,v 1.40 2009/03/18 10:22:29 cegger Exp $ */
+/* $NetBSD: tx39.c,v 1.41 2010/01/21 01:23:15 pooka Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tx39.c,v 1.40 2009/03/18 10:22:29 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: tx39.c,v 1.41 2010/01/21 01:23:15 pooka Exp $);
#include opt_vr41xx.h
#include opt_tx39xx.h
@@ -119,12 +119,13 @@
switch (model) {
default:
/* Unknown TOSHIBA TX39-series */
- sprintf(cpu_name, Unknown TOSHIBA TX39-series %x, model);
+ sprintf(hpcmips_cpuname,
+ Unknown TOSHIBA TX39-series %x, model);
break;
case TMPR3912:
tx39clock_cpuspeed(cpuclock, cpuspeed);
- sprintf(cpu_name, TOSHIBA TMPR3912 %d.%02d MHz,
+ sprintf(hpcmips_cpuname, TOSHIBA TMPR3912 %d.%02d MHz,
cpuclock / 100, (cpuclock % 100) / 1);
tc-tc_chipset = __TX391X;
break;
@@ -132,7 +133,7 @@
tx39clock_cpuspeed(cpuclock, cpuspeed);
rev = tx_conf_read(tc, TX3922_REVISION_REG);
- sprintf(cpu_name, TOSHIBA TMPR3922 rev. %x.%x
+ sprintf(hpcmips_cpuname, TOSHIBA TMPR3922 rev. %x.%x
%d.%02d MHz, (rev 4) 0xf, rev 0xf,
cpuclock / 100, (cpuclock % 100) / 1);
tc-tc_chipset = __TX392X;
Index: src/sys/arch/hpcmips/vr/vr.c
diff -u src/sys/arch/hpcmips/vr/vr.c:1.54 src/sys/arch/hpcmips/vr/vr.c:1.55
--- src/sys/arch/hpcmips/vr/vr.c:1.54 Wed Aug 19 12:49:24 2009
+++ src/sys/arch/hpcmips/vr/vr.c Thu Jan 21 01:23:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vr.c,v 1.54 2009/08/19 12:49:24 jun Exp $ */
+/* $NetBSD: vr.c,v 1.55 2010/01/21 01:23:15 pooka Exp $ */
/*-
* Copyright (c) 1999-2002
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vr.c,v 1.54 2009/08/19 12:49:24 jun Exp $);
+__KERNEL_RCSID(0, $NetBSD: vr.c,v 1.55 2010/01/21 01:23:15 pooka Exp $);
#include opt_vr41xx.h
#include opt_tx39xx.h
@@ -302,14 +302,14 @@
platform.reboot = vr_reboot;
#if NVRBCU 0
-
CVS commit: src/sys/arch/hpcmips/vr
Module Name:src
Committed By: jun
Date: Wed Aug 19 12:49:24 UTC 2009
Modified Files:
src/sys/arch/hpcmips/vr: vr.c
Log Message:
Fix #41863, Missing }.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/hpcmips/vr/vr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/vr/vr.c
diff -u src/sys/arch/hpcmips/vr/vr.c:1.53 src/sys/arch/hpcmips/vr/vr.c:1.54
--- src/sys/arch/hpcmips/vr/vr.c:1.53 Wed Mar 18 15:14:29 2009
+++ src/sys/arch/hpcmips/vr/vr.c Wed Aug 19 12:49:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vr.c,v 1.53 2009/03/18 15:14:29 cegger Exp $ */
+/* $NetBSD: vr.c,v 1.54 2009/08/19 12:49:24 jun Exp $ */
/*-
* Copyright (c) 1999-2002
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vr.c,v 1.53 2009/03/18 15:14:29 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: vr.c,v 1.54 2009/08/19 12:49:24 jun Exp $);
#include opt_vr41xx.h
#include opt_tx39xx.h
@@ -428,6 +428,7 @@
printf(%s(%d): can't init kgdb's serial port,
__FILE__, __LINE__);
}
+ }
#else /* KGDB */
if (com_info-attach != NULL (bootinfo-bi_cnuseBI_CNUSE_SERIAL)) {
/* Serial console */
CVS commit: src/sys/arch/hpcmips/isa
Module Name:src
Committed By: dyoung
Date: Wed Aug 19 15:12:31 UTC 2009
Modified Files:
src/sys/arch/hpcmips/isa: isa_machdep.c plumisa_machdep.c
Log Message:
isa_detach_hook() needs two arguments, the first an isa_chipset_tag_t.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/hpcmips/isa/isa_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hpcmips/isa/plumisa_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/isa/isa_machdep.c
diff -u src/sys/arch/hpcmips/isa/isa_machdep.c:1.37 src/sys/arch/hpcmips/isa/isa_machdep.c:1.38
--- src/sys/arch/hpcmips/isa/isa_machdep.c:1.37 Tue Aug 18 17:02:00 2009
+++ src/sys/arch/hpcmips/isa/isa_machdep.c Wed Aug 19 15:12:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.37 2009/08/18 17:02:00 dyoung Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.38 2009/08/19 15:12:31 dyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: isa_machdep.c,v 1.37 2009/08/18 17:02:00 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: isa_machdep.c,v 1.38 2009/08/19 15:12:31 dyoung Exp $);
#include opt_vr41xx.h
@@ -200,7 +200,7 @@
}
void
-isa_detach_hook(device_t self)
+isa_detach_hook(isa_chipset_tag_t ic, device_t self)
{
}
Index: src/sys/arch/hpcmips/isa/plumisa_machdep.c
diff -u src/sys/arch/hpcmips/isa/plumisa_machdep.c:1.10 src/sys/arch/hpcmips/isa/plumisa_machdep.c:1.11
--- src/sys/arch/hpcmips/isa/plumisa_machdep.c:1.10 Tue Aug 18 17:02:00 2009
+++ src/sys/arch/hpcmips/isa/plumisa_machdep.c Wed Aug 19 15:12:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: plumisa_machdep.c,v 1.10 2009/08/18 17:02:00 dyoung Exp $ */
+/* $NetBSD: plumisa_machdep.c,v 1.11 2009/08/19 15:12:31 dyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: plumisa_machdep.c,v 1.10 2009/08/18 17:02:00 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: plumisa_machdep.c,v 1.11 2009/08/19 15:12:31 dyoung Exp $);
#include sys/param.h
#include sys/systm.h
@@ -140,7 +140,7 @@
}
void
-isa_detach_hook(device_t self)
+isa_detach_hook(isa_chipset_tag_t, device_t self)
{
}
CVS commit: src/sys/arch/hpcmips/vr
Module Name:src Committed By: dholland Date: Sun Apr 5 21:19:37 UTC 2009 Modified Files: src/sys/arch/hpcmips/vr: vrc4173bcu.c Log Message: Fix broken build from missing comma. (HI CHRISTOS!!) To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hpcmips/vr/vrc4173bcu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/vr/vrc4173bcu.c diff -u src/sys/arch/hpcmips/vr/vrc4173bcu.c:1.20 src/sys/arch/hpcmips/vr/vrc4173bcu.c:1.21 --- src/sys/arch/hpcmips/vr/vrc4173bcu.c:1.20 Tue Dec 16 22:35:23 2008 +++ src/sys/arch/hpcmips/vr/vrc4173bcu.c Sun Apr 5 21:19:37 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: vrc4173bcu.c,v 1.20 2008/12/16 22:35:23 christos Exp $ */ +/* $NetBSD: vrc4173bcu.c,v 1.21 2009/04/05 21:19:37 dholland Exp $ */ /*- * Copyright (c) 2001,2002 Enami Tsugutomo. @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vrc4173bcu.c,v 1.20 2008/12/16 22:35:23 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: vrc4173bcu.c,v 1.21 2009/04/05 21:19:37 dholland Exp $); #include sys/param.h #include sys/systm.h @@ -362,7 +362,7 @@ bus_space_write_2(sc-sc_iot, sc-sc_icuh, VRC4173ICU_MSYSINT1, reg); reg = bus_space_read_2(sc-sc_iot, sc-sc_icuh, VRC4173ICU_MSYSINT1); - snprintb(buf, sizeof(buf) + snprintb(buf, sizeof(buf), \20\1USB\2PCMCIA2\3PCMCIA1\4PS2CH2\5PS2CH1\6PIU\7AIU\10KIU \11GIU\12AC97\13AC97-1\14B11\15B12\16DOZEPIU\17B14\20B15, reg); printf(%s: MSYSINT1 = 0x%s\n, sc-sc_dev.dv_xname, buf);
