Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Add prefixes to struct arm_platform{, _info} members.
details: https://anonhg.NetBSD.org/src/rev/81c4e1153891
branches: trunk
changeset: 834276:81c4e1153891
user: skrll <skrll%NetBSD.org@localhost>
date: Sun Aug 05 14:02:35 2018 +0000
description:
Add prefixes to struct arm_platform{,_info} members.
No functional change.
diffstat:
sys/arch/arm/arm32/arm32_machdep.c | 6 +-
sys/arch/arm/broadcom/bcm283x_platform.c | 52 +++++-----
sys/arch/arm/fdt/arm_fdt.c | 12 +-
sys/arch/arm/fdt/arm_fdtvar.h | 26 ++--
sys/arch/arm/nvidia/tegra_platform.c | 36 ++++----
sys/arch/arm/rockchip/rk_platform.c | 20 ++--
sys/arch/arm/samsung/exynos_platform.c | 20 ++--
sys/arch/arm/sunxi/sunxi_platform.c | 132 +++++++++++++++---------------
sys/arch/arm/ti/ti_platform.c | 16 +-
sys/arch/arm/vexpress/vexpress_platform.c | 20 ++--
sys/arch/arm/virt/virt_platform.c | 20 ++--
sys/arch/evbarm/fdt/fdt_machdep.c | 30 +++---
12 files changed, 195 insertions(+), 195 deletions(-)
diffs (truncated from 764 to 300 lines):
diff -r fd580ada56d3 -r 81c4e1153891 sys/arch/arm/arm32/arm32_machdep.c
--- a/sys/arch/arm/arm32/arm32_machdep.c Sun Aug 05 13:41:27 2018 +0000
+++ b/sys/arch/arm/arm32/arm32_machdep.c Sun Aug 05 14:02:35 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_machdep.c,v 1.117 2018/08/05 06:48:50 skrll Exp $ */
+/* $NetBSD: arm32_machdep.c,v 1.118 2018/08/05 14:02:35 skrll Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.117 2018/08/05 06:48:50 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.118 2018/08/05 14:02:35 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_fdt.h"
@@ -815,7 +815,7 @@
arm32_bootmem_init(memory_start, memory_size, KERNEL_BASE_PHYS);
arm32_kernel_vm_init(KERNEL_VM_BASE, ARM_VECTORS_HIGH, 0,
- plat->devmap(), mapallmem_p);
+ plat->ap_devmap(), mapallmem_p);
}
#endif
diff -r fd580ada56d3 -r 81c4e1153891 sys/arch/arm/broadcom/bcm283x_platform.c
--- a/sys/arch/arm/broadcom/bcm283x_platform.c Sun Aug 05 13:41:27 2018 +0000
+++ b/sys/arch/arm/broadcom/bcm283x_platform.c Sun Aug 05 14:02:35 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm283x_platform.c,v 1.10 2018/08/03 15:46:41 skrll Exp $ */
+/* $NetBSD: bcm283x_platform.c,v 1.11 2018/08/05 14:02:35 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.10 2018/08/03 15:46:41 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.11 2018/08/05 14:02:35 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_bcm283x.h"
@@ -1415,14 +1415,14 @@
#if defined(SOC_BCM2835)
static const struct arm_platform bcm2835_platform = {
- .devmap = bcm2835_platform_devmap,
- .bootstrap = bcm2835_platform_bootstrap,
- .init_attach_args = bcm2835_platform_init_attach_args,
- .early_putchar = bcm2835_platform_early_putchar,
- .device_register = bcm283x_platform_device_register,
- .reset = bcm2835_system_reset,
- .delay = bcm2835_tmr_delay,
- .uart_freq = bcm283x_platform_uart_freq,
+ .ap_devmap = bcm2835_platform_devmap,
+ .ap_bootstrap = bcm2835_platform_bootstrap,
+ .ap_init_attach_args = bcm2835_platform_init_attach_args,
+ .ap_early_putchar = bcm2835_platform_early_putchar,
+ .ap_device_register = bcm283x_platform_device_register,
+ .ap_reset = bcm2835_system_reset,
+ .ap_delay = bcm2835_tmr_delay,
+ .ap_uart_freq = bcm283x_platform_uart_freq,
};
ARM_PLATFORM(bcm2835, "brcm,bcm2835", &bcm2835_platform);
@@ -1437,25 +1437,25 @@
}
static const struct arm_platform bcm2836_platform = {
- .devmap = bcm2836_platform_devmap,
- .bootstrap = bcm2836_platform_bootstrap,
- .init_attach_args = bcm2836_platform_init_attach_args,
- .early_putchar = bcm2836_platform_early_putchar,
- .device_register = bcm283x_platform_device_register,
- .reset = bcm2835_system_reset,
- .delay = gtmr_delay,
- .uart_freq = bcm283x_platform_uart_freq,
+ .ap_devmap = bcm2836_platform_devmap,
+ .ap_bootstrap = bcm2836_platform_bootstrap,
+ .ap_init_attach_args = bcm2836_platform_init_attach_args,
+ .ap_early_putchar = bcm2836_platform_early_putchar,
+ .ap_device_register = bcm283x_platform_device_register,
+ .ap_reset = bcm2835_system_reset,
+ .ap_delay = gtmr_delay,
+ .ap_uart_freq = bcm283x_platform_uart_freq,
};
static const struct arm_platform bcm2837_platform = {
- .devmap = bcm2836_platform_devmap,
- .bootstrap = bcm2836_platform_bootstrap,
- .init_attach_args = bcm2836_platform_init_attach_args,
- .early_putchar = bcm2837_platform_early_putchar,
- .device_register = bcm283x_platform_device_register,
- .reset = bcm2835_system_reset,
- .delay = gtmr_delay,
- .uart_freq = bcm2837_platform_uart_freq,
+ .ap_devmap = bcm2836_platform_devmap,
+ .ap_bootstrap = bcm2836_platform_bootstrap,
+ .ap_init_attach_args = bcm2836_platform_init_attach_args,
+ .ap_early_putchar = bcm2837_platform_early_putchar,
+ .ap_device_register = bcm283x_platform_device_register,
+ .ap_reset = bcm2835_system_reset,
+ .ap_delay = gtmr_delay,
+ .ap_uart_freq = bcm2837_platform_uart_freq,
};
ARM_PLATFORM(bcm2836, "brcm,bcm2836", &bcm2836_platform);
diff -r fd580ada56d3 -r 81c4e1153891 sys/arch/arm/fdt/arm_fdt.c
--- a/sys/arch/arm/fdt/arm_fdt.c Sun Aug 05 13:41:27 2018 +0000
+++ b/sys/arch/arm/fdt/arm_fdt.c Sun Aug 05 14:02:35 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: arm_fdt.c,v 1.7 2017/12/10 21:38:26 skrll Exp $ */
+/* $NetBSD: arm_fdt.c,v 1.8 2018/08/05 14:02:35 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -29,7 +29,7 @@
#include "opt_arm_timer.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm_fdt.c,v 1.7 2017/12/10 21:38:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm_fdt.c,v 1.8 2018/08/05 14:02:35 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -79,7 +79,7 @@
aprint_naive("\n");
aprint_normal("\n");
- plat->init_attach_args(&faa);
+ plat->ap_init_attach_args(&faa);
faa.faa_name = "";
faa.faa_phandle = OF_peer(0);
@@ -99,7 +99,7 @@
int match, best_match = 0;
__link_set_foreach(info, arm_platforms) {
- const char * const compat[] = { (*info)->compat, NULL };
+ const char * const compat[] = { (*info)->api_compat, NULL };
match = of_match_compatible(phandle, compat);
if (match > best_match) {
best_match = match;
@@ -110,7 +110,7 @@
booted_platform = best_info;
}
- return booted_platform == NULL ? NULL : booted_platform->ops;
+ return booted_platform == NULL ? NULL : booted_platform->api_ops;
}
void
@@ -166,7 +166,7 @@
bus_space_tag_t bst;
bus_space_handle_t bsh;
- plat->init_attach_args(&faa);
+ plat->ap_init_attach_args(&faa);
bst = faa.faa_bst;
bus_space_map(bst, pa, 0x100, 0, &bsh);
diff -r fd580ada56d3 -r 81c4e1153891 sys/arch/arm/fdt/arm_fdtvar.h
--- a/sys/arch/arm/fdt/arm_fdtvar.h Sun Aug 05 13:41:27 2018 +0000
+++ b/sys/arch/arm/fdt/arm_fdtvar.h Sun Aug 05 14:02:35 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: arm_fdtvar.h,v 1.7 2017/08/24 13:06:23 jmcneill Exp $ */
+/* $NetBSD: arm_fdtvar.h,v 1.8 2018/08/05 14:02:35 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -36,19 +36,19 @@
struct fdt_attach_args;
struct arm_platform {
- const struct pmap_devmap * (*devmap)(void);
- void (*bootstrap)(void);
- void (*init_attach_args)(struct fdt_attach_args *);
- void (*early_putchar)(char);
- void (*device_register)(device_t, void *);
- void (*reset)(void);
- void (*delay)(u_int);
- u_int (*uart_freq)(void);
+ const struct pmap_devmap * (*ap_devmap)(void);
+ void (*ap_bootstrap)(void);
+ void (*ap_init_attach_args)(struct fdt_attach_args *);
+ void (*ap_early_putchar)(char);
+ void (*ap_device_register)(device_t, void *);
+ void (*ap_reset)(void);
+ void (*ap_delay)(u_int);
+ u_int (*ap_uart_freq)(void);
};
struct arm_platform_info {
- const char * compat;
- const struct arm_platform * ops;
+ const char * api_compat;
+ const struct arm_platform * api_ops;
};
#define _ARM_PLATFORM_REGISTER(name) \
@@ -56,8 +56,8 @@
#define ARM_PLATFORM(_name, _compat, _ops) \
static const struct arm_platform_info __CONCAT(_name,_platinfo) = { \
- .compat = (_compat), \
- .ops = (_ops) \
+ .api_compat = (_compat), \
+ .api_ops = (_ops) \
}; \
_ARM_PLATFORM_REGISTER(_name)
diff -r fd580ada56d3 -r 81c4e1153891 sys/arch/arm/nvidia/tegra_platform.c
--- a/sys/arch/arm/nvidia/tegra_platform.c Sun Aug 05 13:41:27 2018 +0000
+++ b/sys/arch/arm/nvidia/tegra_platform.c Sun Aug 05 14:02:35 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_platform.c,v 1.13 2018/07/08 11:37:50 jmcneill Exp $ */
+/* $NetBSD: tegra_platform.c,v 1.14 2018/08/05 14:02:35 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -33,7 +33,7 @@
#include "ukbd.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_platform.c,v 1.13 2018/07/08 11:37:50 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_platform.c,v 1.14 2018/08/05 14:02:35 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -213,14 +213,14 @@
#ifdef SOC_TEGRA124
static const struct arm_platform tegra124_platform = {
- .devmap = tegra_platform_devmap,
- .bootstrap = tegra124_platform_bootstrap,
- .init_attach_args = tegra_platform_init_attach_args,
- .early_putchar = tegra_platform_early_putchar,
- .device_register = tegra_platform_device_register,
- .reset = tegra_platform_reset,
- .delay = tegra_platform_delay,
- .uart_freq = tegra_platform_uart_freq,
+ .ap_devmap = tegra_platform_devmap,
+ .ap_bootstrap = tegra124_platform_bootstrap,
+ .ap_init_attach_args = tegra_platform_init_attach_args,
+ .ap_early_putchar = tegra_platform_early_putchar,
+ .ap_device_register = tegra_platform_device_register,
+ .ap_reset = tegra_platform_reset,
+ .ap_delay = tegra_platform_delay,
+ .ap_uart_freq = tegra_platform_uart_freq,
};
ARM_PLATFORM(tegra124, "nvidia,tegra124", &tegra124_platform);
@@ -228,14 +228,14 @@
#ifdef SOC_TEGRA210
static const struct arm_platform tegra210_platform = {
- .devmap = tegra_platform_devmap,
- .bootstrap = tegra210_platform_bootstrap,
- .init_attach_args = tegra_platform_init_attach_args,
- .early_putchar = tegra_platform_early_putchar,
- .device_register = tegra_platform_device_register,
- .reset = tegra_platform_reset,
- .delay = tegra_platform_delay,
- .uart_freq = tegra_platform_uart_freq,
+ .ap_devmap = tegra_platform_devmap,
+ .ap_bootstrap = tegra210_platform_bootstrap,
+ .ap_init_attach_args = tegra_platform_init_attach_args,
+ .ap_early_putchar = tegra_platform_early_putchar,
+ .ap_device_register = tegra_platform_device_register,
+ .ap_reset = tegra_platform_reset,
+ .ap_delay = tegra_platform_delay,
+ .ap_uart_freq = tegra_platform_uart_freq,
};
ARM_PLATFORM(tegra210, "nvidia,tegra210", &tegra210_platform);
diff -r fd580ada56d3 -r 81c4e1153891 sys/arch/arm/rockchip/rk_platform.c
--- a/sys/arch/arm/rockchip/rk_platform.c Sun Aug 05 13:41:27 2018 +0000
+++ b/sys/arch/arm/rockchip/rk_platform.c Sun Aug 05 14:02:35 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_platform.c,v 1.1 2018/06/16 00:19:04 jmcneill Exp $ */
+/* $NetBSD: rk_platform.c,v 1.2 2018/08/05 14:02:35 skrll Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -31,7 +31,7 @@
#include "opt_fdt_arm.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_platform.c,v 1.1 2018/06/16 00:19:04 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_platform.c,v 1.2 2018/08/05 14:02:35 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -145,14 +145,14 @@
}
static const struct arm_platform rk3328_platform = {
Home |
Main Index |
Thread Index |
Old Index