Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch Consistently use vaddr_t as initarm and friends ret...



details:   https://anonhg.NetBSD.org/src/rev/58e6163ab0d7
branches:  trunk
changeset: 1000239:58e6163ab0d7
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Jul 16 14:41:43 2019 +0000

description:
Consistently use vaddr_t as initarm and friends return type.

Makes no difference to binaries except for aarch64 where it's required

diffstat:

 sys/arch/acorn32/acorn32/rpc_machdep.c                    |   6 ++--
 sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c            |   6 ++--
 sys/arch/arm/at91/at91bus.c                               |   6 ++--
 sys/arch/arm/at91/at91busvar.h                            |   6 ++--
 sys/arch/arm/include/arm32/machdep.h                      |   4 +-
 sys/arch/arm/ofw/ofwgencfg_machdep.c                      |   6 ++--
 sys/arch/cats/cats/cats_machdep.c                         |  10 ++++----
 sys/arch/epoc32/epoc32/machdep.c                          |   8 +++---
 sys/arch/evbarm/adi_brh/brh_machdep.c                     |   8 +++---
 sys/arch/evbarm/armadaxp/armadaxp_machdep.c               |   8 +++---
 sys/arch/evbarm/armadillo/armadillo9_machdep.c            |   8 +++---
 sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c                 |  10 ++++----
 sys/arch/evbarm/beagle/beagle_machdep.c                   |  10 ++++----
 sys/arch/evbarm/fdt/fdt_machdep.c                         |  10 +++-----
 sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c                 |   6 ++--
 sys/arch/evbarm/gemini/gemini_machdep.c                   |   8 +++---
 sys/arch/evbarm/gumstix/gumstix_machdep.c                 |   8 +++---
 sys/arch/evbarm/hawk/hawk_machdep.c                       |   6 ++--
 sys/arch/evbarm/hdl_g/hdlg_machdep.c                      |   8 +++---
 sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c |   4 +-
 sys/arch/evbarm/imx31/imx31lk_machdep.c                   |   8 +++---
 sys/arch/evbarm/imx7/imx7_machdep.c                       |  10 ++++----
 sys/arch/evbarm/integrator/integrator_machdep.c           |   8 +++---
 sys/arch/evbarm/iq80310/iq80310_machdep.c                 |   8 +++---
 sys/arch/evbarm/iq80321/iq80321_machdep.c                 |   8 +++---
 sys/arch/evbarm/ixdp425/ixdp425_machdep.c                 |   8 +++---
 sys/arch/evbarm/ixm1200/ixm1200_machdep.c                 |   6 ++--
 sys/arch/evbarm/iyonix/iyonix_machdep.c                   |   8 +++---
 sys/arch/evbarm/kobo/kobo_machdep.c                       |   8 +++---
 sys/arch/evbarm/lubbock/lubbock_machdep.c                 |   8 +++---
 sys/arch/evbarm/marvell/marvell_machdep.c                 |   8 +++---
 sys/arch/evbarm/mini2440/mini2440_machdep.c               |   6 ++--
 sys/arch/evbarm/mmnet/mmnet_machdep.c                     |  16 +++++++-------
 sys/arch/evbarm/mpcsa/mpcsa_machdep.c                     |  16 +++++++-------
 sys/arch/evbarm/netwalker/netwalker_machdep.c             |   8 +++---
 sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c             |  10 ++++----
 sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c                 |   8 +++---
 sys/arch/evbarm/nslu2/nslu2_machdep.c                     |   8 +++---
 sys/arch/evbarm/osk5912/osk5912_machdep.c                 |   8 +++---
 sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c               |   8 +++---
 sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c               |   8 +++---
 sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c               |   8 +++---
 sys/arch/evbarm/tsarm/tsarm_machdep.c                     |   8 +++---
 sys/arch/evbarm/viper/viper_machdep.c                     |   8 +++---
 sys/arch/evbarm/zynq/zynq_machdep.c                       |  10 ++++----
 sys/arch/hpcarm/hpcarm/hpc_machdep.c                      |  12 +++++-----
 sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c               |   8 +++---
 sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c               |   8 +++---
 sys/arch/iyonix/iyonix/iyonix_machdep.c                   |   8 +++---
 sys/arch/netwinder/netwinder/netwinder_machdep.c          |   8 +++---
 sys/arch/shark/shark/shark_machdep.c                      |   8 +++---
 sys/arch/zaurus/zaurus/machdep.c                          |   8 +++---
 52 files changed, 211 insertions(+), 213 deletions(-)

diffs (truncated from 1865 to 300 lines):

diff -r 72db2ceafe67 -r 58e6163ab0d7 sys/arch/acorn32/acorn32/rpc_machdep.c
--- a/sys/arch/acorn32/acorn32/rpc_machdep.c    Tue Jul 16 11:32:07 2019 +0000
+++ b/sys/arch/acorn32/acorn32/rpc_machdep.c    Tue Jul 16 14:41:43 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rpc_machdep.c,v 1.92 2018/10/28 14:30:30 skrll Exp $   */
+/*     $NetBSD: rpc_machdep.c,v 1.93 2019/07/16 14:41:43 skrll Exp $   */
 
 /*
  * Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -55,7 +55,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.92 2018/10/28 14:30:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.93 2019/07/16 14:41:43 skrll Exp $");
 
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -392,7 +392,7 @@
 }
 
 
-u_int
+vaddr_t
 initarm(void *cookie)
 {
        struct bootconfig *raw_bootconf = cookie;
diff -r 72db2ceafe67 -r 58e6163ab0d7 sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
--- a/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c    Tue Jul 16 11:32:07 2019 +0000
+++ b/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c    Tue Jul 16 14:41:43 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: eb7500atx_machdep.c,v 1.30 2018/10/28 14:30:30 skrll Exp $     */
+/*     $NetBSD: eb7500atx_machdep.c,v 1.31 2019/07/16 14:41:43 skrll Exp $     */
 
 /*
  * Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -55,7 +55,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.30 2018/10/28 14:30:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.31 2019/07/16 14:41:43 skrll Exp $");
 
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -359,7 +359,7 @@
 }
 
 
-u_int
+vaddr_t
 initarm(void *cookie)
 {
        struct bootconfig *raw_bootconf = cookie;
diff -r 72db2ceafe67 -r 58e6163ab0d7 sys/arch/arm/at91/at91bus.c
--- a/sys/arch/arm/at91/at91bus.c       Tue Jul 16 11:32:07 2019 +0000
+++ b/sys/arch/arm/at91/at91bus.c       Tue Jul 16 14:41:43 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: at91bus.c,v 1.24 2019/07/16 09:25:55 skrll Exp $       */
+/*     $NetBSD: at91bus.c,v 1.25 2019/07/16 14:41:43 skrll Exp $       */
 
 /*
  * Copyright (c) 2007 Embedtronics Oy
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.24 2019/07/16 09:25:55 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.25 2019/07/16 14:41:43 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_console.h"
@@ -232,7 +232,7 @@
        return 0;
 }
 
-u_int
+vaddr_t
 at91bus_setup(BootConfig *mem)
 {
        int loop;
diff -r 72db2ceafe67 -r 58e6163ab0d7 sys/arch/arm/at91/at91busvar.h
--- a/sys/arch/arm/at91/at91busvar.h    Tue Jul 16 11:32:07 2019 +0000
+++ b/sys/arch/arm/at91/at91busvar.h    Tue Jul 16 14:41:43 2019 +0000
@@ -1,5 +1,5 @@
-/*     $Id: at91busvar.h,v 1.6 2012/11/12 18:00:36 skrll Exp $ */
-/*     $NetBSD: at91busvar.h,v 1.6 2012/11/12 18:00:36 skrll Exp $ */
+/*     $Id: at91busvar.h,v 1.7 2019/07/16 14:41:43 skrll Exp $ */
+/*     $NetBSD: at91busvar.h,v 1.7 2019/07/16 14:41:43 skrll Exp $ */
 
 /*
  * Copyright (c) 2007 Embedtronics Oy
@@ -117,7 +117,7 @@
 
 extern int at91bus_init(void);
 struct _BootConfig;
-extern u_int at91bus_setup(struct _BootConfig *);
+extern vaddr_t at91bus_setup(struct _BootConfig *);
 extern bus_dma_tag_t at91_bus_dma_init(struct arm32_bus_dma_tag *);
 
 static __inline const struct pmap_devmap *
diff -r 72db2ceafe67 -r 58e6163ab0d7 sys/arch/arm/include/arm32/machdep.h
--- a/sys/arch/arm/include/arm32/machdep.h      Tue Jul 16 11:32:07 2019 +0000
+++ b/sys/arch/arm/include/arm32/machdep.h      Tue Jul 16 14:41:43 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.h,v 1.28 2019/01/03 10:26:41 skrll Exp $ */
+/* $NetBSD: machdep.h,v 1.29 2019/07/16 14:41:43 skrll Exp $ */
 
 #ifndef _ARM32_MACHDEP_H_
 #define _ARM32_MACHDEP_H_
@@ -69,7 +69,7 @@
  * note that we use void * as all the platforms have different ideas on what
  * the structure is
  */
-u_int initarm(void *);
+vaddr_t initarm(void *);
 struct pmap_devmap;
 struct boot_physmem;
 
diff -r 72db2ceafe67 -r 58e6163ab0d7 sys/arch/arm/ofw/ofwgencfg_machdep.c
--- a/sys/arch/arm/ofw/ofwgencfg_machdep.c      Tue Jul 16 11:32:07 2019 +0000
+++ b/sys/arch/arm/ofw/ofwgencfg_machdep.c      Tue Jul 16 14:41:43 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ofwgencfg_machdep.c,v 1.19 2012/10/27 17:17:40 chs Exp $       */
+/*     $NetBSD: ofwgencfg_machdep.c,v 1.20 2019/07/16 14:41:44 skrll Exp $     */
 
 /*
  * Copyright 1997
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofwgencfg_machdep.c,v 1.19 2012/10/27 17:17:40 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofwgencfg_machdep.c,v 1.20 2019/07/16 14:41:44 skrll Exp $");
 
 #include "opt_ddb.h"
 
@@ -146,7 +146,7 @@
  * Return the new stackptr (va) for the SVC frame.
  *
  */
-u_int
+vaddr_t
 initarm(void *cookie)
 {
        ofw_handle_t ofw_handle = cookie;
diff -r 72db2ceafe67 -r 58e6163ab0d7 sys/arch/cats/cats/cats_machdep.c
--- a/sys/arch/cats/cats/cats_machdep.c Tue Jul 16 11:32:07 2019 +0000
+++ b/sys/arch/cats/cats/cats_machdep.c Tue Jul 16 14:41:43 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cats_machdep.c,v 1.87 2019/04/26 07:32:40 skrll Exp $  */
+/*     $NetBSD: cats_machdep.c,v 1.88 2019/07/16 14:41:44 skrll Exp $  */
 
 /*
  * Copyright (c) 1997,1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.87 2019/04/26 07:32:40 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.88 2019/07/16 14:41:44 skrll Exp $");
 
 #include "opt_ddb.h"
 #include "opt_modular.h"
@@ -218,7 +218,7 @@
 void footbridge_pci_bs_tag_init(void);
 
 /*
- * u_int initarm(struct ebsaboot *bootinfo)
+ * vaddr_t initarm(struct ebsaboot *bootinfo)
  *
  * Initial entry point on startup. This gets called before main() is
  * entered.
@@ -231,7 +231,7 @@
  *   Relocating the kernel to the bottom of physical memory
  */
 
-u_int
+vaddr_t
 initarm(void *arm_bootargs)
 {
        struct ebsaboot *bootinfo = arm_bootargs;
@@ -467,7 +467,7 @@
        cpu_reset_address_paddr = DC21285_ROM_BASE;
 
        /* initarm_common returns the new stack pointer address */
-       u_int sp;
+       vaddr_t sp;
        sp = initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE, cats_physmem,
            ncats_physmem);
 
diff -r 72db2ceafe67 -r 58e6163ab0d7 sys/arch/epoc32/epoc32/machdep.c
--- a/sys/arch/epoc32/epoc32/machdep.c  Tue Jul 16 11:32:07 2019 +0000
+++ b/sys/arch/epoc32/epoc32/machdep.c  Tue Jul 16 14:41:43 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.7 2018/10/28 14:30:31 skrll Exp $        */
+/*     $NetBSD: machdep.c,v 1.8 2019/07/16 14:41:44 skrll Exp $        */
 /*
  * Copyright (c) 2012, 2013 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.7 2018/10/28 14:30:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.8 2019/07/16 14:41:44 skrll Exp $");
 
 #include "clpscom.h"
 #include "clpslcd.h"
@@ -149,7 +149,7 @@
 };
 
 /*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
  *
  * Initial entry point on startup. This gets called before main() is
  * entered.
@@ -161,7 +161,7 @@
  *   Setting up page tables for the kernel
  *   Relocating the kernel to the bottom of physical memory
  */
-u_int
+vaddr_t
 initarm(void *arg)
 {
        extern char _end[];
diff -r 72db2ceafe67 -r 58e6163ab0d7 sys/arch/evbarm/adi_brh/brh_machdep.c
--- a/sys/arch/evbarm/adi_brh/brh_machdep.c     Tue Jul 16 11:32:07 2019 +0000
+++ b/sys/arch/evbarm/adi_brh/brh_machdep.c     Tue Jul 16 14:41:43 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: brh_machdep.c,v 1.47 2018/10/28 14:30:31 skrll Exp $   */
+/*     $NetBSD: brh_machdep.c,v 1.48 2019/07/16 14:41:44 skrll Exp $   */
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.47 2018/10/28 14:30:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.48 2019/07/16 14:41:44 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_console.h"
@@ -339,7 +339,7 @@
 }
 
 /*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
  *
  * Initial entry point on startup. This gets called before main() is
  * entered.
@@ -351,7 +351,7 @@
  *   Setting up page tables for the kernel
  *   Relocating the kernel to the bottom of physical memory
  */
-u_int
+vaddr_t
 initarm(void *arg)
 {
        extern vaddr_t xscale_cache_clean_addr;
diff -r 72db2ceafe67 -r 58e6163ab0d7 sys/arch/evbarm/armadaxp/armadaxp_machdep.c
--- a/sys/arch/evbarm/armadaxp/armadaxp_machdep.c       Tue Jul 16 11:32:07 2019 +0000
+++ b/sys/arch/evbarm/armadaxp/armadaxp_machdep.c       Tue Jul 16 14:41:43 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: armadaxp_machdep.c,v 1.16 2018/09/21 12:04:07 skrll Exp $      */
+/*     $NetBSD: armadaxp_machdep.c,v 1.17 2019/07/16 14:41:44 skrll Exp $      */
 /*******************************************************************************
 Copyright (C) Marvell International Ltd. and its affiliates
 
@@ -37,7 +37,7 @@
 *******************************************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadaxp_machdep.c,v 1.16 2018/09/21 12:04:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadaxp_machdep.c,v 1.17 2019/07/16 14:41:44 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_console.h"
@@ -309,7 +309,7 @@
 }
 
 /*
- * u_int initarm(...)
+ * vaddr_t initarm(...)
  *
  * Initial entry point on startup. This gets called before main() is
  * entered.
@@ -321,7 +321,7 @@
  *   Setting up page tables for the kernel
  *   Relocating the kernel to the bottom of physical memory
  */
-u_int
+vaddr_t
 initarm(void *arg)
 {
        cpu_reset_address = axp_system_reset;
diff -r 72db2ceafe67 -r 58e6163ab0d7 sys/arch/evbarm/armadillo/armadillo9_machdep.c



Home | Main Index | Thread Index | Old Index