Source-Changes-HG archive

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

[src/trunk]: src/sys/arch C99 types



details:   https://anonhg.NetBSD.org/src/rev/b1fb54fbb546
branches:  trunk
changeset: 782652:b1fb54fbb546
user:      skrll <skrll%NetBSD.org@localhost>
date:      Mon Nov 12 18:00:34 2012 +0000

description:
C99 types

diffstat:

 sys/arch/arm/arm/cpufunc.c                     |    8 +-
 sys/arch/arm/arm/db_trace.c                    |   20 ++--
 sys/arch/arm/arm/linux_syscall.c               |   12 +-
 sys/arch/arm/arm/undefined.c                   |   12 +-
 sys/arch/arm/arm32/cpu.c                       |    6 +-
 sys/arch/arm/arm32/fault.c                     |   30 +++---
 sys/arch/arm/arm32/pmap.c                      |   10 +-
 sys/arch/arm/arm32/stubs.c                     |    6 +-
 sys/arch/arm/at91/at91aic.c                    |   14 +-
 sys/arch/arm/at91/at91aicvar.h                 |    4 +-
 sys/arch/arm/at91/at91bus.c                    |   10 +-
 sys/arch/arm/at91/at91busvar.h                 |   18 +-
 sys/arch/arm/at91/at91dbgu.c                   |   14 +-
 sys/arch/arm/at91/at91dbgureg.h                |    4 +-
 sys/arch/arm/at91/at91emac.c                   |   26 ++--
 sys/arch/arm/at91/at91emacreg.h                |    8 +-
 sys/arch/arm/at91/at91pdcvar.h                 |    6 +-
 sys/arch/arm/at91/at91pio.c                    |    8 +-
 sys/arch/arm/at91/at91pmc.c                    |    8 +-
 sys/arch/arm/at91/at91st.c                     |    8 +-
 sys/arch/arm/at91/at91streg.h                  |    6 +-
 sys/arch/arm/at91/at91tctmr.c                  |   16 +-
 sys/arch/arm/at91/at91usart.c                  |   14 +-
 sys/arch/arm/at91/at91usartvar.h               |    4 +-
 sys/arch/arm/ep93xx/ep93xx_intr.c              |   22 ++--
 sys/arch/arm/ep93xx/ep93xxvar.h                |    8 +-
 sys/arch/arm/ep93xx/epclk.c                    |    8 +-
 sys/arch/arm/ep93xx/epcom.c                    |    6 +-
 sys/arch/arm/ep93xx/epe.c                      |   84 +++++++++---------
 sys/arch/arm/ep93xx/epevar.h                   |   20 ++--
 sys/arch/arm/ep93xx/epohci.c                   |    6 +-
 sys/arch/arm/ep93xx/eppcicvar.h                |    4 +-
 sys/arch/arm/ep93xx/epsoc.c                    |   10 +-
 sys/arch/arm/ep93xx/epsocvar.h                 |   12 +-
 sys/arch/arm/fpe-arm/armfpe.h                  |   40 ++++----
 sys/arch/arm/imx/imxusb.c                      |    6 +-
 sys/arch/arm/include/arm32/pmap.h              |   14 +-
 sys/arch/arm/include/bus_defs.h                |  114 ++++++++++++------------
 sys/arch/arm/include/cpufunc.h                 |    6 +-
 sys/arch/arm/include/fp.h                      |   10 +-
 sys/arch/arm/ixp12x0/ixp12x0_clk.c             |   22 ++--
 sys/arch/arm/ixp12x0/ixp12x0_com.c             |   12 +-
 sys/arch/arm/ixp12x0/ixp12x0_intr.c            |   32 +++---
 sys/arch/arm/ixp12x0/ixp12x0var.h              |    8 +-
 sys/arch/arm/omap/omap_gpio.c                  |    6 +-
 sys/arch/arm/s3c2xx0/s3c2440_dma.c             |   14 +-
 sys/arch/arm/xscale/ixp425_intr.c              |   10 +-
 sys/arch/arm/xscale/ixp425_intr.h              |    4 +-
 sys/arch/arm/xscale/ixp425_pci.c               |    8 +-
 sys/arch/arm/xscale/ixp425_pci_space.c         |   38 ++++----
 sys/arch/arm/xscale/ixp425_timer.c             |    8 +-
 sys/arch/arm/xscale/ixp425reg.h                |   10 +-
 sys/arch/arm/xscale/ixp425var.h                |   18 +-
 sys/arch/arm/xscale/pxa2x0.c                   |    8 +-
 sys/arch/arm/xscale/pxa2x0_ac97.c              |   26 ++--
 sys/arch/arm/xscale/pxa2x0_apm.c               |   76 ++++++++--------
 sys/arch/arm/xscale/pxa2x0_apm_asm.S           |    2 +-
 sys/arch/arm/xscale/pxa2x0_dmac.c              |   24 ++--
 sys/arch/arm/xscale/pxa2x0_gpio.c              |   30 +++---
 sys/arch/arm/xscale/pxa2x0_i2s.h               |    4 +-
 sys/arch/evbarm/adi_brh/brh_7seg.c             |    6 +-
 sys/arch/evbarm/armadillo/armadillo9_com.c     |    6 +-
 sys/arch/evbarm/armadillo/armadillo9_machdep.c |    8 +-
 sys/arch/evbarm/devkit8000/if_dme_gpmc.c       |    4 +-
 sys/arch/evbarm/g42xxeb/gb225_slhci.c          |    4 +-
 sys/arch/evbarm/imx31/imx31lk_pcic.c           |    8 +-
 sys/arch/evbarm/ixdp425/ixdp425_machdep.c      |    8 +-
 sys/arch/evbarm/ixdp425/ixdp425_pci.c          |    6 +-
 sys/arch/evbarm/ixm1200/ixm1200_machdep.c      |    6 +-
 sys/arch/evbarm/ixm1200/nappi_nppb.c           |    6 +-
 sys/arch/evbarm/lubbock/if_sm_obio.c           |    6 +-
 sys/arch/evbarm/lubbock/sacc_obio.c            |    6 +-
 sys/arch/evbarm/mini2440/if_dm_mini2440.c      |    2 +-
 sys/arch/evbarm/mpcsa/mpcsa_leds.c             |    8 +-
 sys/arch/evbarm/nslu2/nslu2_machdep.c          |    6 +-
 sys/arch/evbarm/nslu2/nslu2_pci.c              |    6 +-
 sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c      |    6 +-
 sys/arch/evbarm/tsarm/epcom_ts.c               |    6 +-
 sys/arch/evbarm/tsarm/toastersensors.c         |   38 ++++----
 sys/arch/evbarm/tsarm/tsarm_machdep.c          |    6 +-
 sys/arch/evbarm/tsarm/tskp.c                   |   10 +-
 sys/arch/evbarm/tsarm/tslcd.c                  |   18 +-
 sys/arch/evbarm/tsarm/tspld.c                  |    6 +-
 83 files changed, 594 insertions(+), 594 deletions(-)

diffs (truncated from 3780 to 300 lines):

diff -r 6058f919c9f4 -r b1fb54fbb546 sys/arch/arm/arm/cpufunc.c
--- a/sys/arch/arm/arm/cpufunc.c        Mon Nov 12 11:00:07 2012 +0000
+++ b/sys/arch/arm/arm/cpufunc.c        Mon Nov 12 18:00:34 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpufunc.c,v 1.117 2012/10/19 13:47:03 matt Exp $       */
+/*     $NetBSD: cpufunc.c,v 1.118 2012/11/12 18:00:34 skrll Exp $      */
 
 /*
  * arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.117 2012/10/19 13:47:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.118 2012/11/12 18:00:34 skrll Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_cpuoptions.h"
@@ -1574,7 +1574,7 @@
     defined(CPU_SA1100) || defined(CPU_SA1110) || defined(CPU_IXP12X0)
 /* Cache information for CPUs without cache type registers. */
 struct cachetab {
-       u_int32_t ct_cpuid;
+       uint32_t ct_cpuid;
        int     ct_pcache_type;
        int     ct_pcache_unified;
        int     ct_pdcache_size;
@@ -1609,7 +1609,7 @@
 get_cachetype_table(void)
 {
        int i;
-       u_int32_t cpuid = cpu_id();
+       uint32_t cpuid = cpu_id();
 
        for (i = 0; cachetab[i].ct_cpuid != 0; i++) {
                if (cachetab[i].ct_cpuid == (cpuid & CPU_ID_CPU_MASK)) {
diff -r 6058f919c9f4 -r b1fb54fbb546 sys/arch/arm/arm/db_trace.c
--- a/sys/arch/arm/arm/db_trace.c       Mon Nov 12 11:00:07 2012 +0000
+++ b/sys/arch/arm/arm/db_trace.c       Mon Nov 12 18:00:34 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_trace.c,v 1.25 2012/09/14 03:58:47 matt Exp $       */
+/*     $NetBSD: db_trace.c,v 1.26 2012/11/12 18:00:34 skrll Exp $      */
 
 /* 
  * Copyright (c) 2000, 2001 Ben Harris
@@ -31,7 +31,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.25 2012/09/14 03:58:47 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.26 2012/11/12 18:00:34 skrll Exp $");
 
 #include <sys/proc.h>
 #include <arm/armreg.h>
@@ -86,7 +86,7 @@
                db_expr_t count, const char *modif,
                void (*pr)(const char *, ...))
 {
-       u_int32_t       *frame, *lastframe;
+       uint32_t        *frame, *lastframe;
        const char      *cp = modif;
        char c;
        bool            kernel_only = true;
@@ -106,7 +106,7 @@
        }
 
        if (!have_addr)
-               frame = (u_int32_t *)(DDB_REGS->tf_r11);
+               frame = (uint32_t *)(DDB_REGS->tf_r11);
        else {
                if (trace_thread) {
                        struct pcb *pcb;
@@ -146,16 +146,16 @@
 #endif
                        (*pr)("at %p\n", frame);
                } else
-                       frame = (u_int32_t *)(addr);
+                       frame = (uint32_t *)(addr);
        }
        lastframe = NULL;
        scp_offset = -(get_pc_str_offset() >> 2);
 
        while (count-- && frame != NULL) {
                db_addr_t       scp;
-               u_int32_t       savecode;
+               uint32_t        savecode;
                int             r;
-               u_int32_t       *rp;
+               uint32_t        *rp;
                const char      *sep;
 
                lastframe = frame;
@@ -190,11 +190,11 @@
                (*pr)("\trsp=0x%08x rfp=0x%08x", frame[FR_RSP], frame[FR_RFP]);
 
 #ifndef _KERNEL
-               db_read_bytes((db_addr_t)((u_int32_t *)scp + scp_offset),
+               db_read_bytes((db_addr_t)((uint32_t *)scp + scp_offset),
                    sizeof(savecode), (void *)&savecode);
 #else
                if ((scp & 3) == 0) {
-                       savecode = ((u_int32_t *)scp)[scp_offset];
+                       savecode = ((uint32_t *)scp)[scp_offset];
                } else {
                        savecode = 0;
                }
@@ -221,7 +221,7 @@
                if (frame[FR_RFP] == 0)
                        break; /* Top of stack */
 
-               frame = (u_int32_t *)(frame[FR_RFP]);
+               frame = (uint32_t *)(frame[FR_RFP]);
 
                if (INKERNEL((int)frame)) {
                        /* staying in kernel */
diff -r 6058f919c9f4 -r b1fb54fbb546 sys/arch/arm/arm/linux_syscall.c
--- a/sys/arch/arm/arm/linux_syscall.c  Mon Nov 12 11:00:07 2012 +0000
+++ b/sys/arch/arm/arm/linux_syscall.c  Mon Nov 12 18:00:34 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_syscall.c,v 1.23 2009/11/21 20:32:17 rmind Exp $ */
+/*     $NetBSD: linux_syscall.c,v 1.24 2012/11/12 18:00:35 skrll Exp $ */
 
 /*-
  * Copyright (c) 2000, 2003 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: linux_syscall.c,v 1.23 2009/11/21 20:32:17 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscall.c,v 1.24 2012/11/12 18:00:35 skrll Exp $");
 
 #include <sys/device.h>
 #include <sys/errno.h>
@@ -94,8 +94,8 @@
 #define LINUX_SYS_ARMBASE      0x000180 /* Must agree with syscalls.master */
 
 void linux_syscall_intern(struct proc *);
-void linux_syscall_plain(struct trapframe *, struct lwp *, u_int32_t);
-void linux_syscall_fancy(struct trapframe *, struct lwp *, u_int32_t);
+void linux_syscall_plain(struct trapframe *, struct lwp *, uint32_t);
+void linux_syscall_fancy(struct trapframe *, struct lwp *, uint32_t);
 
 void
 linux_syscall_intern(struct proc *p)
@@ -108,7 +108,7 @@
 }
 
 void
-linux_syscall_plain(trapframe_t *frame, struct lwp *l, u_int32_t insn)
+linux_syscall_plain(trapframe_t *frame, struct lwp *l, uint32_t insn)
 {
        const struct sysent *callp;
        struct proc *p = l->l_proc;
@@ -153,7 +153,7 @@
 }
 
 void
-linux_syscall_fancy(trapframe_t *frame, struct lwp *l, u_int32_t insn)
+linux_syscall_fancy(trapframe_t *frame, struct lwp *l, uint32_t insn)
 {
        const struct sysent *callp;
        struct proc *p = l->l_proc;
diff -r 6058f919c9f4 -r b1fb54fbb546 sys/arch/arm/arm/undefined.c
--- a/sys/arch/arm/arm/undefined.c      Mon Nov 12 11:00:07 2012 +0000
+++ b/sys/arch/arm/arm/undefined.c      Mon Nov 12 18:00:34 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: undefined.c,v 1.47 2012/08/16 17:35:01 matt Exp $      */
+/*     $NetBSD: undefined.c,v 1.48 2012/11/12 18:00:35 skrll Exp $     */
 
 /*
  * Copyright (c) 2001 Ben Harris.
@@ -54,7 +54,7 @@
 #include <sys/kgdb.h>
 #endif
 
-__KERNEL_RCSID(0, "$NetBSD: undefined.c,v 1.47 2012/08/16 17:35:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: undefined.c,v 1.48 2012/11/12 18:00:35 skrll Exp $");
 
 #include <sys/kmem.h>
 #include <sys/queue.h>
@@ -201,7 +201,7 @@
                                KSI_INIT_TRAP(&ksi);
                                ksi.ksi_signo = SIGTRAP;
                                ksi.ksi_code = TRAP_BRKPT;
-                               ksi.ksi_addr = (u_int32_t *)addr;
+                               ksi.ksi_addr = (uint32_t *)addr;
                                ksi.ksi_trap = 0;
                                trapsignal(l, &ksi);
                                return 0;
@@ -318,7 +318,7 @@
                        KSI_INIT_TRAP(&ksi);
                        ksi.ksi_signo = SIGILL;
                        ksi.ksi_code = ILL_ILLOPC;
-                       ksi.ksi_addr = (u_int32_t *)(intptr_t) fault_pc;
+                       ksi.ksi_addr = (uint32_t *)(intptr_t) fault_pc;
                        trapsignal(l, &ksi);
                        userret(l);
                        return;
@@ -332,7 +332,7 @@
                 * not really matter does it ?
                 */
 
-               fault_instruction = *(u_int32_t *)fault_pc;
+               fault_instruction = *(uint32_t *)fault_pc;
        }
 
        /* Update vmmeter statistics */
@@ -416,7 +416,7 @@
                KSI_INIT_TRAP(&ksi);
                ksi.ksi_signo = SIGILL;
                ksi.ksi_code = ILL_ILLOPC;
-               ksi.ksi_addr = (u_int32_t *)fault_pc;
+               ksi.ksi_addr = (uint32_t *)fault_pc;
                ksi.ksi_trap = fault_instruction;
                trapsignal(l, &ksi);
        }
diff -r 6058f919c9f4 -r b1fb54fbb546 sys/arch/arm/arm32/cpu.c
--- a/sys/arch/arm/arm32/cpu.c  Mon Nov 12 11:00:07 2012 +0000
+++ b/sys/arch/arm/arm32/cpu.c  Mon Nov 12 18:00:34 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.87 2012/09/22 00:33:37 matt Exp $    */
+/*     $NetBSD: cpu.c,v 1.88 2012/11/12 18:00:35 skrll Exp $   */
 
 /*
  * Copyright (c) 1995 Mark Brinicombe.
@@ -46,7 +46,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.87 2012/09/22 00:33:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.88 2012/11/12 18:00:35 skrll Exp $");
 
 #include <sys/systm.h>
 #include <sys/conf.h>
@@ -363,7 +363,7 @@
 };
 
 struct cpuidtab {
-       u_int32_t       cpuid;
+       uint32_t        cpuid;
        enum            cpu_class cpu_class;
        const char      *cpu_classname;
        const char * const *cpu_steppings;
diff -r 6058f919c9f4 -r b1fb54fbb546 sys/arch/arm/arm32/fault.c
--- a/sys/arch/arm/arm32/fault.c        Mon Nov 12 11:00:07 2012 +0000
+++ b/sys/arch/arm/arm32/fault.c        Mon Nov 12 18:00:34 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fault.c,v 1.85 2012/09/07 11:48:59 matt Exp $  */
+/*     $NetBSD: fault.c,v 1.86 2012/11/12 18:00:35 skrll Exp $ */
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -81,7 +81,7 @@
 #include "opt_kgdb.h"
 
 #include <sys/types.h>
-__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.85 2012/09/07 11:48:59 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.86 2012/11/12 18:00:35 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -193,8 +193,8 @@
 #ifdef THUMB_CODE
        if (tf->tf_spsr & PSR_T_bit) {
                printf("pc = 0x%08x, opcode 0x%04x, 0x%04x, insn = ",
-                   tf->tf_pc, *((u_int16 *)(tf->tf_pc & ~1)),
-                   *((u_int16 *)((tf->tf_pc + 2) & ~1)));
+                   tf->tf_pc, *((uint16 *)(tf->tf_pc & ~1)),
+                   *((uint16 *)((tf->tf_pc + 2) & ~1)));
        }
        else
 #endif
@@ -320,7 +320,7 @@
                        KSI_INIT_TRAP(&ksi);
                        ksi.ksi_signo = SIGILL;
                        ksi.ksi_code = ILL_ILLOPC;
-                       ksi.ksi_addr = (u_int32_t *)(intptr_t) far;
+                       ksi.ksi_addr = (uint32_t *)(intptr_t) far;
                        ksi.ksi_trap = fsr;
                        goto do_trapsignal;
                }
@@ -343,7 +343,7 @@
                KSI_INIT_TRAP(&ksi);
                ksi.ksi_signo = SIGILL;
                ksi.ksi_code = ILL_ILLOPC;
-               ksi.ksi_addr = (u_int32_t *)(intptr_t) far;
+               ksi.ksi_addr = (uint32_t *)(intptr_t) far;
                ksi.ksi_trap = fsr;
                goto do_trapsignal;
        default:
@@ -369,7 +369,7 @@
                        KSI_INIT_TRAP(&ksi);
                        ksi.ksi_signo = SIGSEGV;
                        ksi.ksi_code = SEGV_ACCERR;
-                       ksi.ksi_addr = (u_int32_t *)(intptr_t) far;
+                       ksi.ksi_addr = (uint32_t *)(intptr_t) far;
                        ksi.ksi_trap = fsr;
 
                        /*
@@ -495,7 +495,7 @@



Home | Main Index | Thread Index | Old Index