CVS commit: src/sys/arch/iyonix/iyonix
Module Name:src
Committed By: andvar
Date: Wed Sep 13 19:45:37 UTC 2023
Modified Files:
src/sys/arch/iyonix/iyonix: iyonix_machdep.c
Log Message:
fix printf format specifier for physmem.
fixes VERBOSE_INIT_ARM enabled build for iyonix.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/iyonix/iyonix/iyonix_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/iyonix/iyonix/iyonix_machdep.c
diff -u src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.32 src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.33
--- src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.32 Thu Apr 20 08:28:06 2023
+++ src/sys/arch/iyonix/iyonix/iyonix_machdep.c Wed Sep 13 19:45:37 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: iyonix_machdep.c,v 1.32 2023/04/20 08:28:06 skrll Exp $ */
+/* $NetBSD: iyonix_machdep.c,v 1.33 2023/09/13 19:45:37 andvar Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.32 2023/04/20 08:28:06 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.33 2023/09/13 19:45:37 andvar Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -492,7 +492,7 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
/* Tell the user about the memory */
- printf("physmemory: %d pages at 0x%08lx -> 0x%08lx\n", physmem,
+ printf("physmemory: %ld pages at 0x%08lx -> 0x%08lx\n", physmem,
physical_start, physical_end - 1);
#endif
CVS commit: src/sys/arch/iyonix/iyonix
Module Name:src Committed By: andvar Date: Wed Sep 13 19:45:37 UTC 2023 Modified Files: src/sys/arch/iyonix/iyonix: iyonix_machdep.c Log Message: fix printf format specifier for physmem. fixes VERBOSE_INIT_ARM enabled build for iyonix. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/arch/iyonix/iyonix/iyonix_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/iyonix/iyonix
Module Name:src Committed By: skrll Date: Fri Apr 21 14:57:52 UTC 2023 Modified Files: src/sys/arch/iyonix/iyonix: obio_space.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/iyonix/iyonix/obio_space.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/iyonix/iyonix
Module Name:src
Committed By: skrll
Date: Fri Apr 21 14:57:52 UTC 2023
Modified Files:
src/sys/arch/iyonix/iyonix: obio_space.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/iyonix/iyonix/obio_space.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/iyonix/iyonix/obio_space.c
diff -u src/sys/arch/iyonix/iyonix/obio_space.c:1.7 src/sys/arch/iyonix/iyonix/obio_space.c:1.8
--- src/sys/arch/iyonix/iyonix/obio_space.c:1.7 Fri Mar 16 17:56:33 2018
+++ src/sys/arch/iyonix/iyonix/obio_space.c Fri Apr 21 14:57:52 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: obio_space.c,v 1.7 2018/03/16 17:56:33 ryo Exp $ */
+/* $NetBSD: obio_space.c,v 1.8 2023/04/21 14:57:52 skrll Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.7 2018/03/16 17:56:33 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.8 2023/04/21 14:57:52 skrll Exp $");
#include
#include
@@ -153,7 +153,7 @@ obio_bs_map(void *t, bus_addr_t bpa, bus
endpa = round_page(bpa + size);
offset = bpa & PAGE_MASK;
startpa = trunc_page(bpa);
-
+
va = uvm_km_alloc(kernel_map, endpa - startpa, 0,
UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
if (va == 0)
@@ -201,7 +201,7 @@ obio_bs_unmap(void *t, bus_space_handle_
uvm_km_free(kernel_map, va, endva - va, UVM_KMF_VAONLY);
}
-void
+void
obio_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
{
CVS commit: src/sys/arch/iyonix/iyonix
Module Name:src Committed By: christos Date: Sun Jan 2 16:42:10 UTC 2022 Modified Files: src/sys/arch/iyonix/iyonix: iyonix_machdep.c Log Message: fix the build. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/iyonix/iyonix/iyonix_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/iyonix/iyonix/iyonix_machdep.c diff -u src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.30 src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.31 --- src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.30 Sat Apr 18 07:00:41 2020 +++ src/sys/arch/iyonix/iyonix/iyonix_machdep.c Sun Jan 2 11:42:10 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: iyonix_machdep.c,v 1.30 2020/04/18 11:00:41 skrll Exp $ */ +/* $NetBSD: iyonix_machdep.c,v 1.31 2022/01/02 16:42:10 christos Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -73,7 +73,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.30 2020/04/18 11:00:41 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.31 2022/01/02 16:42:10 christos Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -583,7 +583,9 @@ initarm(void *arg) valloc_pages(kernelstack, UPAGES); /* Allocate enough pages for cleaning the Mini-Data cache. */ +#ifdef DIAGNOSTIC KASSERT(xscale_minidata_clean_size <= PAGE_SIZE); +#endif valloc_pages(minidataclean, 1); #ifdef VERBOSE_INIT_ARM
CVS commit: src/sys/arch/iyonix/iyonix
Module Name:src Committed By: christos Date: Sun Jan 2 16:42:10 UTC 2022 Modified Files: src/sys/arch/iyonix/iyonix: iyonix_machdep.c Log Message: fix the build. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/iyonix/iyonix/iyonix_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/iyonix/iyonix
Module Name:src Committed By: macallan Date: Thu Dec 20 21:38:23 UTC 2018 Modified Files: src/sys/arch/iyonix/iyonix: autoconf.c Log Message: set base_year_is_2k on dsrtc so we're compatible with RISC OS To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/iyonix/iyonix/autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/iyonix/iyonix
Module Name:src
Committed By: macallan
Date: Wed Nov 21 20:36:41 UTC 2018
Modified Files:
src/sys/arch/iyonix/iyonix: autoconf.c
Log Message:
- RISC OS hands us the graphics hardware in BGR mode when running 32bit colour
pass that info on to genfb/gffb so X can show colours correctly
- set genfb properties on gffb as well
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/iyonix/iyonix/autoconf.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/iyonix/iyonix/autoconf.c
diff -u src/sys/arch/iyonix/iyonix/autoconf.c:1.15 src/sys/arch/iyonix/iyonix/autoconf.c:1.16
--- src/sys/arch/iyonix/iyonix/autoconf.c:1.15 Sat Oct 27 17:17:58 2012
+++ src/sys/arch/iyonix/iyonix/autoconf.c Wed Nov 21 20:36:41 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.15 2012/10/27 17:17:58 chs Exp $ */
+/* $NetBSD: autoconf.c,v 1.16 2018/11/21 20:36:41 macallan Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.15 2012/10/27 17:17:58 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.16 2018/11/21 20:36:41 macallan Exp $");
#include "opt_md.h"
@@ -138,7 +138,7 @@ device_register(device_t dev, void *aux)
}
}
- if (device_is_a(dev, "genfb") &&
+ if ((device_is_a(dev, "genfb") || device_is_a(dev, "gffb")) &&
device_is_a(device_parent(dev), "pci") ) {
prop_dictionary_t dict = device_properties(dev);
struct pci_attach_args *pa = aux;
@@ -178,6 +178,13 @@ device_register(device_t dev, void *aux)
bootconfig.height + 1);
prop_dictionary_set_uint32(dict, "depth",
1 << bootconfig.log2_bpp);
+ /*
+ * XXX
+ * at least RISC OS 5.28 seems to use the graphics hardware in
+ * BGR mode when in 32bit colour, so take that into account
+ */
+ if (bootconfig.log2_bpp == 5)
+ prop_dictionary_set_bool(dict, "is_bgr", 1);
prop_dictionary_set_uint32(dict, "address", fbaddr);
}
}
CVS commit: src/sys/arch/iyonix/iyonix
Module Name:src Committed By: macallan Date: Wed Nov 21 20:36:41 UTC 2018 Modified Files: src/sys/arch/iyonix/iyonix: autoconf.c Log Message: - RISC OS hands us the graphics hardware in BGR mode when running 32bit colour pass that info on to genfb/gffb so X can show colours correctly - set genfb properties on gffb as well To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/iyonix/iyonix/autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/iyonix/iyonix
Module Name:src
Committed By: jmcneill
Date: Sun Nov 18 14:12:28 UTC 2018
Modified Files:
src/sys/arch/iyonix/iyonix: iyonix_pci.c
Log Message:
Add xname argument to pc_intr_establish implementation
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/iyonix/iyonix/iyonix_pci.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/iyonix/iyonix/iyonix_pci.c
diff -u src/sys/arch/iyonix/iyonix/iyonix_pci.c:1.8 src/sys/arch/iyonix/iyonix/iyonix_pci.c:1.9
--- src/sys/arch/iyonix/iyonix/iyonix_pci.c:1.8 Sat Mar 29 19:28:28 2014
+++ src/sys/arch/iyonix/iyonix/iyonix_pci.c Sun Nov 18 14:12:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: iyonix_pci.c,v 1.8 2014/03/29 19:28:28 christos Exp $ */
+/* $NetBSD: iyonix_pci.c,v 1.9 2018/11/18 14:12:28 jmcneill Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: iyonix_pci.c,v 1.8 2014/03/29 19:28:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iyonix_pci.c,v 1.9 2018/11/18 14:12:28 jmcneill Exp $");
#include
#include
@@ -66,7 +66,7 @@ int iyonix_pci_intr_map(const struct pci
const char *iyonix_pci_intr_string(void *, pci_intr_handle_t, char *, size_t);
const struct evcnt *iyonix_pci_intr_evcnt(void *, pci_intr_handle_t);
void *iyonix_pci_intr_establish(void *, pci_intr_handle_t,
- int, int (*func)(void *), void *);
+ int, int (*func)(void *), void *, const char *);
void iyonix_pci_intr_disestablish(void *, void *);
void pci_conf_write_byte(pci_chipset_tag_t, pcitag_t, int, int);
int pci_conf_read_byte(pci_chipset_tag_t, pcitag_t, int);
@@ -148,7 +148,7 @@ iyonix_pci_intr_evcnt(void *v, pci_intr_
void *
iyonix_pci_intr_establish(void *v, pci_intr_handle_t ih, int ipl,
-int (*func)(void *), void *arg)
+int (*func)(void *), void *arg, const char *xname)
{
return (i80321_intr_establish(ih, ipl, func, arg));
CVS commit: src/sys/arch/iyonix/iyonix
Module Name:src Committed By: jmcneill Date: Sun Nov 18 14:12:28 UTC 2018 Modified Files: src/sys/arch/iyonix/iyonix: iyonix_pci.c Log Message: Add xname argument to pc_intr_establish implementation To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/iyonix/iyonix/iyonix_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/iyonix/iyonix
Module Name:src Committed By: joerg Date: Sun Mar 2 13:28:23 UTC 2014 Modified Files: src/sys/arch/iyonix/iyonix: iyonix_machdep.c Log Message: Initialize variables used to setup a dummy element. XXX bogus, needs review To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/iyonix/iyonix/iyonix_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/iyonix/iyonix/iyonix_machdep.c diff -u src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.22 src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.23 --- src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.22 Sun Aug 18 21:50:31 2013 +++ src/sys/arch/iyonix/iyonix/iyonix_machdep.c Sun Mar 2 13:28:23 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: iyonix_machdep.c,v 1.22 2013/08/18 21:50:31 matt Exp $ */ +/* $NetBSD: iyonix_machdep.c,v 1.23 2014/03/02 13:28:23 joerg Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -73,7 +73,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: iyonix_machdep.c,v 1.22 2013/08/18 21:50:31 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: iyonix_machdep.c,v 1.23 2014/03/02 13:28:23 joerg Exp $); #include opt_ddb.h #include opt_kgdb.h @@ -441,8 +441,8 @@ initarm(void *arg) int loop; int loop1; u_int l1pagetable; - paddr_t memstart; - psize_t memsize; + paddr_t memstart = 0; + psize_t memsize = 0; /* Calibrate the delay loop. */ i80321_calibrate_delay();
CVS commit: src/sys/arch/iyonix/iyonix
Module Name:src Committed By: joerg Date: Sun Mar 2 13:28:23 UTC 2014 Modified Files: src/sys/arch/iyonix/iyonix: iyonix_machdep.c Log Message: Initialize variables used to setup a dummy element. XXX bogus, needs review To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/iyonix/iyonix/iyonix_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/iyonix/iyonix
Module Name:src Committed By: matt Date: Sun Aug 18 21:50:31 UTC 2013 Modified Files: src/sys/arch/iyonix/iyonix: iyonix_machdep.c Log Message: Fix arm/locore.h lossage To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/iyonix/iyonix/iyonix_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/iyonix/iyonix/iyonix_machdep.c diff -u src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.21 src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.22 --- src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.21 Sat Sep 22 00:33:41 2012 +++ src/sys/arch/iyonix/iyonix/iyonix_machdep.c Sun Aug 18 21:50:31 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: iyonix_machdep.c,v 1.21 2012/09/22 00:33:41 matt Exp $ */ +/* $NetBSD: iyonix_machdep.c,v 1.22 2013/08/18 21:50:31 matt Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -73,7 +73,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: iyonix_machdep.c,v 1.21 2012/09/22 00:33:41 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: iyonix_machdep.c,v 1.22 2013/08/18 21:50:31 matt Exp $); #include opt_ddb.h #include opt_kgdb.h @@ -89,11 +89,16 @@ __KERNEL_RCSID(0, $NetBSD: iyonix_machd #include sys/reboot.h #include sys/termios.h #include sys/ksyms.h +#include sys/bus.h +#include sys/cpu.h #include uvm/uvm_extern.h #include dev/cons.h +#include dev/pci/ppbreg.h +#include dev/ic/i8259reg.h + #include net/if.h #include net/if_ether.h @@ -102,9 +107,7 @@ __KERNEL_RCSID(0, $NetBSD: iyonix_machd #include ddb/db_extern.h #include acorn32/include/bootconfig.h -#include sys/bus.h -#include machine/cpu.h -#include machine/frame.h +#include arm/locore.h #include arm/undefined.h #include arm/arm32/machdep.h @@ -115,9 +118,6 @@ __KERNEL_RCSID(0, $NetBSD: iyonix_machd #include iyonix/iyonix/iyonixreg.h #include iyonix/iyonix/obiovar.h -#include dev/pci/ppbreg.h -#include dev/ic/i8259reg.h - #include ksyms.h #define KERNEL_TEXT_BASE KERNEL_BASE
CVS commit: src/sys/arch/iyonix/iyonix
Module Name:src Committed By: matt Date: Sun Aug 18 21:50:31 UTC 2013 Modified Files: src/sys/arch/iyonix/iyonix: iyonix_machdep.c Log Message: Fix arm/locore.h lossage To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/iyonix/iyonix/iyonix_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/iyonix/iyonix
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:48:23 UTC 2011 Modified Files: src/sys/arch/iyonix/iyonix: com_obio.c i80321_mainbus.c iyonix_machdep.c iyonix_pci.c obio.c obio_space.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/iyonix/iyonix/com_obio.c \ src/sys/arch/iyonix/iyonix/obio.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/iyonix/iyonix/i80321_mainbus.c \ src/sys/arch/iyonix/iyonix/obio_space.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/iyonix/iyonix/iyonix_machdep.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/iyonix/iyonix/iyonix_pci.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/iyonix/iyonix/com_obio.c diff -u src/sys/arch/iyonix/iyonix/com_obio.c:1.5 src/sys/arch/iyonix/iyonix/com_obio.c:1.6 --- src/sys/arch/iyonix/iyonix/com_obio.c:1.5 Mon Apr 28 20:23:26 2008 +++ src/sys/arch/iyonix/iyonix/com_obio.c Fri Jul 1 20:48:22 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: com_obio.c,v 1.5 2008/04/28 20:23:26 martin Exp $ */ +/* $NetBSD: com_obio.c,v 1.6 2011/07/01 20:48:22 dyoung Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,14 +30,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: com_obio.c,v 1.5 2008/04/28 20:23:26 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: com_obio.c,v 1.6 2011/07/01 20:48:22 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h #include sys/termios.h -#include machine/bus.h +#include sys/bus.h #include arm/xscale/i80321var.h Index: src/sys/arch/iyonix/iyonix/obio.c diff -u src/sys/arch/iyonix/iyonix/obio.c:1.5 src/sys/arch/iyonix/iyonix/obio.c:1.6 --- src/sys/arch/iyonix/iyonix/obio.c:1.5 Mon Jun 6 16:29:15 2011 +++ src/sys/arch/iyonix/iyonix/obio.c Fri Jul 1 20:48:23 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: obio.c,v 1.5 2011/06/06 16:29:15 matt Exp $ */ +/* $NetBSD: obio.c,v 1.6 2011/07/01 20:48:23 dyoung Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -40,14 +40,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: obio.c,v 1.5 2011/06/06 16:29:15 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: obio.c,v 1.6 2011/07/01 20:48:23 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h #include machine/autoconf.h -#include machine/bus.h +#include sys/bus.h #include arm/xscale/i80321reg.h Index: src/sys/arch/iyonix/iyonix/i80321_mainbus.c diff -u src/sys/arch/iyonix/iyonix/i80321_mainbus.c:1.4 src/sys/arch/iyonix/iyonix/i80321_mainbus.c:1.5 --- src/sys/arch/iyonix/iyonix/i80321_mainbus.c:1.4 Sun May 14 15:26:05 2006 +++ src/sys/arch/iyonix/iyonix/i80321_mainbus.c Fri Jul 1 20:48:23 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: i80321_mainbus.c,v 1.4 2006/05/14 15:26:05 gavan Exp $ */ +/* $NetBSD: i80321_mainbus.c,v 1.5 2011/07/01 20:48:23 dyoung Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -42,14 +42,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: i80321_mainbus.c,v 1.4 2006/05/14 15:26:05 gavan Exp $); +__KERNEL_RCSID(0, $NetBSD: i80321_mainbus.c,v 1.5 2011/07/01 20:48:23 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h #include machine/autoconf.h -#include machine/bus.h +#include sys/bus.h #include iyonix/iyonix/iyonixreg.h #include iyonix/iyonix/iyonixvar.h Index: src/sys/arch/iyonix/iyonix/obio_space.c diff -u src/sys/arch/iyonix/iyonix/obio_space.c:1.4 src/sys/arch/iyonix/iyonix/obio_space.c:1.5 --- src/sys/arch/iyonix/iyonix/obio_space.c:1.4 Sat Nov 7 07:27:44 2009 +++ src/sys/arch/iyonix/iyonix/obio_space.c Fri Jul 1 20:48:23 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: obio_space.c,v 1.4 2009/11/07 07:27:44 cegger Exp $ */ +/* $NetBSD: obio_space.c,v 1.5 2011/07/01 20:48:23 dyoung Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -40,14 +40,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: obio_space.c,v 1.4 2009/11/07 07:27:44 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: obio_space.c,v 1.5 2011/07/01 20:48:23 dyoung Exp $); #include sys/param.h #include sys/systm.h #include uvm/uvm_extern.h -#include machine/bus.h +#include sys/bus.h /* Prototypes for all the bus_space structure functions */ bs_protos(obio); Index: src/sys/arch/iyonix/iyonix/iyonix_machdep.c diff -u src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.17 src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.18 --- src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.17 Thu Jun 30 20:09:32 2011 +++ src/sys/arch/iyonix/iyonix/iyonix_machdep.c Fri Jul 1 20:48:23 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: iyonix_machdep.c,v 1.17 2011/06/30 20:09:32 wiz Exp $ */ +/* $NetBSD: iyonix_machdep.c,v 1.18 2011/07/01 20:48:23 dyoung Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -73,7 +73,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD:
CVS commit: src/sys/arch/iyonix/iyonix
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:48:23 UTC 2011 Modified Files: src/sys/arch/iyonix/iyonix: com_obio.c i80321_mainbus.c iyonix_machdep.c iyonix_pci.c obio.c obio_space.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/iyonix/iyonix/com_obio.c \ src/sys/arch/iyonix/iyonix/obio.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/iyonix/iyonix/i80321_mainbus.c \ src/sys/arch/iyonix/iyonix/obio_space.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/iyonix/iyonix/iyonix_machdep.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/iyonix/iyonix/iyonix_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/iyonix/iyonix
Module Name:src
Committed By: dyoung
Date: Wed Apr 6 01:48:44 UTC 2011
Modified Files:
src/sys/arch/iyonix/iyonix: iyonix_pci.c
Log Message:
Fix fallout from pci_attach_args constification.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/iyonix/iyonix/iyonix_pci.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/iyonix/iyonix/iyonix_pci.c
diff -u src/sys/arch/iyonix/iyonix/iyonix_pci.c:1.5 src/sys/arch/iyonix/iyonix/iyonix_pci.c:1.6
--- src/sys/arch/iyonix/iyonix/iyonix_pci.c:1.5 Wed Oct 17 19:55:03 2007
+++ src/sys/arch/iyonix/iyonix/iyonix_pci.c Wed Apr 6 01:48:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iyonix_pci.c,v 1.5 2007/10/17 19:55:03 garbled Exp $ */
+/* $NetBSD: iyonix_pci.c,v 1.6 2011/04/06 01:48:43 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: iyonix_pci.c,v 1.5 2007/10/17 19:55:03 garbled Exp $);
+__KERNEL_RCSID(0, $NetBSD: iyonix_pci.c,v 1.6 2011/04/06 01:48:43 dyoung Exp $);
#include sys/param.h
#include sys/systm.h
@@ -61,7 +61,8 @@
#include sys/extent.h
#include dev/pci/pciconf.h
-int iyonix_pci_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
+int iyonix_pci_intr_map(const struct pci_attach_args *,
+ pci_intr_handle_t *);
const char *iyonix_pci_intr_string(void *, pci_intr_handle_t);
const struct evcnt *iyonix_pci_intr_evcnt(void *, pci_intr_handle_t);
void *iyonix_pci_intr_establish(void *, pci_intr_handle_t,
@@ -83,7 +84,7 @@
}
int
-iyonix_pci_intr_map(struct pci_attach_args *pa, pci_intr_handle_t *ihp)
+iyonix_pci_intr_map(const struct pci_attach_args *pa, pci_intr_handle_t *ihp)
{
struct i80321_softc *sc = pa-pa_pc-pc_intr_v;
int b, d, f;
CVS commit: src/sys/arch/iyonix/iyonix
Module Name:src Committed By: dyoung Date: Wed Apr 6 01:48:44 UTC 2011 Modified Files: src/sys/arch/iyonix/iyonix: iyonix_pci.c Log Message: Fix fallout from pci_attach_args constification. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/iyonix/iyonix/iyonix_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
