From 7b6f6eb8b6052b86ee45684c0b7574a040867021 Mon Sep 17 00:00:00 2001 From: Lionel Sambuc Date: Tue, 2 Jan 2018 18:57:25 +0100 Subject: [PATCH] Replace u32_t by uint32_t --- minix/commands/autopart/autopart.c | 4 +- minix/commands/minix-service/minix-service.c | 8 +- minix/commands/minix-service/parse.c | 2 +- minix/drivers/audio/als4000/als4000.c | 156 ++++++++-------- minix/drivers/audio/als4000/als4000.h | 22 +-- minix/drivers/audio/als4000/io.h | 22 +-- minix/drivers/audio/als4000/mixer.c | 8 +- minix/drivers/audio/als4000/mixer.h | 4 +- minix/drivers/audio/cmi8738/cmi8738.c | 152 ++++++++-------- minix/drivers/audio/cmi8738/cmi8738.h | 22 +-- minix/drivers/audio/cmi8738/io.h | 22 +-- minix/drivers/audio/cmi8738/mixer.c | 8 +- minix/drivers/audio/cmi8738/mixer.h | 4 +- minix/drivers/audio/cs4281/cs4281.c | 148 +++++++-------- minix/drivers/audio/cs4281/cs4281.h | 24 +-- minix/drivers/audio/cs4281/io.h | 22 +-- minix/drivers/audio/cs4281/mixer.c | 8 +- minix/drivers/audio/cs4281/mixer.h | 4 +- minix/drivers/audio/es1370/es1370.c | 68 +++---- minix/drivers/audio/es1370/es1370.h | 14 +- minix/drivers/audio/es1370/pci_helper.c | 14 +- minix/drivers/audio/es1370/pci_helper.h | 2 +- minix/drivers/audio/es1371/AC97.c | 18 +- minix/drivers/audio/es1371/SRC.c | 14 +- minix/drivers/audio/es1371/codec.c | 18 +- minix/drivers/audio/es1371/es1371.c | 68 +++---- minix/drivers/audio/es1371/es1371.h | 14 +- minix/drivers/audio/es1371/pci_helper.c | 14 +- minix/drivers/audio/es1371/pci_helper.h | 2 +- .../audio/es1371/sample_rate_converter.c | 16 +- minix/drivers/audio/sb16/sb16.c | 20 +-- minix/drivers/audio/trident/io.h | 22 +-- minix/drivers/audio/trident/mixer.c | 8 +- minix/drivers/audio/trident/mixer.h | 4 +- minix/drivers/audio/trident/trident.c | 152 ++++++++-------- minix/drivers/audio/trident/trident.h | 26 +-- minix/drivers/bus/i2c/arch/earm/omap_i2c.c | 2 +- minix/drivers/bus/i2c/i2c.c | 2 +- minix/drivers/bus/pci/main.c | 6 +- minix/drivers/bus/pci/pci.c | 58 +++--- minix/drivers/bus/pci/pci.h | 6 +- minix/drivers/bus/ti1225/ti1225.c | 4 +- minix/drivers/bus/ti1225/ti1225.h | 18 +- .../clock/readclock/arch/earm/omap_rtc.c | 4 +- .../readclock/arch/i386/arch_readclock.c | 2 +- minix/drivers/eeprom/cat24c256/cat24c256.c | 2 +- minix/drivers/examples/hello/hello.c | 2 +- minix/drivers/hid/pckbd/pckbd.c | 10 +- minix/drivers/iommu/amddev/amddev.c | 18 +- minix/drivers/net/dec21140A/dec21140A.c | 26 +-- minix/drivers/net/dec21140A/dec21140A.h | 2 +- minix/drivers/net/dp8390/3c503.c | 2 +- minix/drivers/net/dp8390/dp8390.c | 6 +- minix/drivers/net/dp8390/ne2000.c | 2 +- minix/drivers/net/dp8390/rtl8029.c | 2 +- minix/drivers/net/dpeth/devio.c | 4 +- minix/drivers/net/e1000/e1000.c | 24 +-- minix/drivers/net/e1000/e1000.h | 6 +- minix/drivers/net/e1000/e1000_hw.h | 8 +- minix/drivers/net/fxp/fxp.c | 22 +-- minix/drivers/net/fxp/fxp.h | 56 +++--- minix/drivers/net/ip1000/io.h | 22 +-- minix/drivers/net/ip1000/ip1000.c | 110 ++++++------ minix/drivers/net/ip1000/ip1000.h | 4 +- minix/drivers/net/lan8710a/lan8710a.c | 58 +++--- minix/drivers/net/lan8710a/lan8710a.h | 10 +- minix/drivers/net/lan8710a/lan8710a_reg.h | 168 +++++++++--------- minix/drivers/net/lance/lance.c | 4 +- minix/drivers/net/rtl8139/rtl8139.c | 24 +-- minix/drivers/net/rtl8139/rtl8139.h | 2 +- minix/drivers/net/rtl8169/rtl8169.c | 64 +++---- minix/drivers/net/virtio_net/virtio_net.c | 6 +- minix/drivers/net/virtio_net/virtio_net.h | 2 +- minix/drivers/net/vt6105/io.h | 22 +-- minix/drivers/net/vt6105/vt6105.c | 98 +++++----- minix/drivers/net/vt6105/vt6105.h | 12 +- minix/drivers/power/acpi/osminixxf.c | 16 +- minix/drivers/power/tps65217/tps65217.c | 2 +- minix/drivers/power/tps65950/tps65950.c | 2 +- minix/drivers/printer/printer/printer.c | 4 +- minix/drivers/sensors/bmp085/bmp085.c | 2 +- minix/drivers/sensors/sht21/sht21.c | 2 +- minix/drivers/sensors/tsl2550/tsl2550.c | 2 +- minix/drivers/storage/ahci/ahci.c | 56 +++--- minix/drivers/storage/ahci/ahci.h | 8 +- minix/drivers/storage/at_wini/at_wini.c | 34 ++-- minix/drivers/storage/fbd/action.c | 12 +- minix/drivers/storage/filter/driver.c | 2 +- minix/drivers/storage/floppy/floppy.c | 8 +- minix/drivers/storage/memory/memory.c | 4 +- minix/drivers/storage/mmc/mmchost_mmchs.c | 14 +- minix/drivers/storage/virtio_blk/virtio_blk.c | 4 +- minix/drivers/storage/virtio_blk/virtio_blk.h | 20 +-- minix/drivers/system/random/main.c | 2 +- minix/drivers/system/random/random.c | 4 +- minix/drivers/tty/pty/tty.c | 2 +- minix/drivers/tty/pty/tty.h | 2 +- minix/drivers/tty/tty/arch/earm/rs232.c | 2 +- minix/drivers/tty/tty/arch/i386/console.c | 8 +- minix/drivers/tty/tty/arch/i386/rs232.c | 14 +- minix/drivers/tty/tty/tty.c | 6 +- minix/drivers/tty/tty/tty.h | 2 +- minix/drivers/video/fb/arch/earm/fb_arch.c | 30 ++-- minix/drivers/video/fb/fb.c | 16 +- minix/drivers/video/tda19988/tda19988.c | 2 +- minix/drivers/vmm_guest/vbox/hgcm.c | 2 +- minix/drivers/vmm_guest/vbox/vbox.c | 2 +- minix/drivers/vmm_guest/vbox/vmmdev.h | 42 ++--- minix/fs/ext2/inode.c | 2 +- minix/fs/ext2/inode.h | 36 ++-- minix/fs/ext2/mount.c | 2 +- minix/fs/ext2/super.c | 6 +- minix/fs/ext2/super.h | 80 ++++----- minix/fs/ext2/type.h | 38 ++-- minix/fs/isofs/inode.h | 14 +- minix/fs/isofs/proto.h | 2 +- minix/fs/isofs/super.h | 16 +- minix/fs/isofs/susp.c | 14 +- minix/fs/isofs/susp_rock_ridge.c | 26 +-- minix/fs/mfs/inode.h | 8 +- minix/fs/mfs/super.h | 2 +- minix/fs/procfs/cpuinfo.c | 2 +- minix/fs/procfs/util.c | 2 +- minix/include/arch/earm/include/archtypes.h | 16 +- minix/include/arch/earm/include/multiboot.h | 60 +++---- minix/include/arch/earm/include/stackframe.h | 2 +- minix/include/arch/i386/include/archtypes.h | 10 +- minix/include/arch/i386/include/fpu.h | 16 +- minix/include/minix/acpi.h | 22 +-- minix/include/minix/audio_fw.h | 6 +- minix/include/minix/btrace.h | 10 +- minix/include/minix/clkconf.h | 2 +- minix/include/minix/devio.h | 6 +- minix/include/minix/ds.h | 4 +- minix/include/minix/fb.h | 22 +-- minix/include/minix/hash.h | 4 +- minix/include/minix/ipc.h | 14 +- minix/include/minix/libminixfs.h | 2 +- minix/include/minix/minlib.h | 4 +- minix/include/minix/portio.h | 2 +- minix/include/minix/rs.h | 4 +- minix/include/minix/sffs.h | 2 +- minix/include/minix/spin.h | 4 +- minix/include/minix/syslib.h | 24 +-- minix/include/minix/sysutil.h | 20 +-- minix/include/minix/timers.h | 2 +- minix/include/minix/type.h | 14 +- minix/include/minix/usb.h | 2 +- minix/include/minix/vbox.h | 6 +- minix/include/minix/vboxtype.h | 2 +- minix/include/minix/virtio.h | 8 +- minix/include/minix/vm.h | 8 +- minix/include/net/gen/arp_io.h | 2 +- minix/include/net/gen/dhcp.h | 4 +- minix/include/net/gen/eth_io.h | 2 +- minix/include/net/gen/icmp_hdr.h | 2 +- minix/include/net/gen/in.h | 2 +- minix/include/net/gen/ip_io.h | 6 +- minix/include/net/gen/psip_hdr.h | 2 +- minix/include/net/gen/rip.h | 16 +- minix/include/net/gen/route.h | 12 +- minix/include/net/gen/tcp_hdr.h | 4 +- minix/include/net/gen/tcp_io.h | 6 +- minix/include/net/gen/vjhc.h | 2 +- minix/include/sys/ioc_fbd.h | 4 +- minix/include/sys/ioc_memory.h | 2 +- minix/kernel/arch/earm/arch_do_vmctl.c | 4 +- minix/kernel/arch/earm/arch_system.c | 6 +- .../arch/earm/bsp/include/bsp_padconf.h | 2 +- minix/kernel/arch/earm/bsp/ti/omap_padconf.c | 2 +- minix/kernel/arch/earm/bsp/ti/omap_timer.c | 14 +- minix/kernel/arch/earm/exception.c | 4 +- minix/kernel/arch/earm/include/arch_proto.h | 4 +- minix/kernel/arch/earm/include/cpufunc.h | 128 ++++++------- minix/kernel/arch/earm/include/io.h | 4 +- minix/kernel/arch/earm/memory.c | 52 +++--- minix/kernel/arch/earm/pg_utils.c | 22 +-- minix/kernel/arch/earm/pre_init.c | 14 +- minix/kernel/arch/earm/protect.c | 2 +- minix/kernel/arch/i386/acpi.c | 6 +- minix/kernel/arch/i386/acpi.h | 50 +++--- minix/kernel/arch/i386/apic.c | 104 +++++------ minix/kernel/arch/i386/apic.h | 16 +- minix/kernel/arch/i386/arch_do_vmctl.c | 4 +- minix/kernel/arch/i386/arch_smp.c | 18 +- minix/kernel/arch/i386/arch_system.c | 8 +- minix/kernel/arch/i386/arch_watchdog.c | 6 +- minix/kernel/arch/i386/exception.c | 8 +- minix/kernel/arch/i386/include/arch_proto.h | 30 ++-- minix/kernel/arch/i386/include/arch_smp.h | 2 +- minix/kernel/arch/i386/io_outl.S | 2 +- minix/kernel/arch/i386/klib.S | 6 +- minix/kernel/arch/i386/memory.c | 78 ++++---- minix/kernel/arch/i386/pg_utils.c | 18 +- minix/kernel/arch/i386/pre_init.c | 4 +- minix/kernel/arch/i386/protect.c | 16 +- minix/kernel/debug.c | 4 +- minix/kernel/proc.h | 4 +- minix/kernel/profile.c | 2 +- minix/kernel/proto.h | 16 +- minix/kernel/smp.c | 6 +- minix/kernel/smp.h | 2 +- minix/kernel/system/do_exec.c | 6 +- minix/kernel/system/do_vdevio.c | 2 +- minix/lib/libaudiodriver/audio_fw.c | 4 +- minix/lib/libblockdriver/trace.c | 4 +- minix/lib/libc/arch/arm/read_tsc.c | 4 +- minix/lib/libc/arch/i386/_cpufeature.c | 4 +- minix/lib/libc/arch/i386/_cpuid.S | 2 +- minix/lib/libc/gen/read_tsc_64.c | 2 +- minix/lib/libc/sys/mmap.c | 2 +- minix/lib/libclkconf/clkconf.c | 8 +- minix/lib/libddekit/src/resource.c | 6 +- minix/lib/libfsdriver/call.c | 2 +- minix/lib/libgpio/gpio_omap.c | 4 +- minix/lib/libhgfs/attr.c | 2 +- minix/lib/libhgfs/channel.c | 14 +- minix/lib/libhgfs/const.h | 2 +- minix/lib/libhgfs/dir.c | 4 +- minix/lib/libhgfs/file.c | 16 +- minix/lib/libhgfs/info.c | 2 +- minix/lib/libhgfs/proto.h | 8 +- minix/lib/libhgfs/rpc.c | 2 +- minix/lib/libhgfs/time.c | 4 +- minix/lib/libhgfs/type.h | 4 +- minix/lib/libi2cdriver/i2cdriver.c | 2 +- minix/lib/libmagicrt/include/magic_mem.h | 4 +- minix/lib/libmagicrt/include/st/typedefs.h | 2 +- minix/lib/libmagicrt/magic_mem.c | 4 +- minix/lib/libminixfs/cache.c | 4 +- minix/lib/libsys/arch/earm/frclock_util.c | 20 +-- minix/lib/libsys/arch/earm/spin.c | 2 +- minix/lib/libsys/arch/earm/tsc_util.c | 8 +- minix/lib/libsys/arch/i386/get_randomness.c | 2 +- minix/lib/libsys/arch/i386/ser_putc.c | 2 +- minix/lib/libsys/arch/i386/spin.c | 2 +- minix/lib/libsys/arch/i386/sys_in.c | 2 +- minix/lib/libsys/arch/i386/sys_out.c | 2 +- minix/lib/libsys/arch/i386/tsc_util.c | 10 +- minix/lib/libsys/arch/i386/vbox.c | 6 +- minix/lib/libsys/ds.c | 4 +- minix/lib/libsys/pci_attr_r32.c | 2 +- minix/lib/libsys/pci_attr_w32.c | 2 +- minix/lib/libsys/pci_get_bar.c | 4 +- minix/lib/libsys/sef.c | 2 +- minix/lib/libsys/sqrt_approx.c | 4 +- minix/lib/libsys/sys_fork.c | 2 +- minix/lib/libsys/sys_hz.c | 12 +- minix/lib/libsys/sys_padconf.c | 2 +- minix/lib/libsys/sys_vmctl.c | 4 +- minix/lib/libsys/vm_cache.c | 6 +- minix/lib/libvboxfs/info.c | 2 +- minix/lib/libvboxfs/link.c | 2 +- minix/lib/libvboxfs/proto.h | 2 +- minix/lib/libvboxfs/vboxfs.h | 32 ++-- minix/lib/libvirtio/virtio.c | 12 +- minix/lib/libvirtio/virtio_ring.h | 6 +- minix/man/man2/svrctl.2 | 2 +- minix/servers/ds/store.c | 2 +- minix/servers/input/input.c | 2 +- minix/servers/mib/vm.c | 2 +- minix/servers/pm/glo.h | 2 +- minix/servers/vfs/glo.h | 2 +- minix/servers/vfs/misc.c | 6 +- minix/servers/vm/alloc.c | 6 +- minix/servers/vm/cache.c | 6 +- minix/servers/vm/mem_anon.c | 6 +- minix/servers/vm/mem_anon_contig.c | 2 +- minix/servers/vm/mem_file.c | 2 +- minix/servers/vm/mem_shared.c | 4 +- minix/servers/vm/memtype.h | 2 +- minix/servers/vm/mmap.c | 8 +- minix/servers/vm/pagefaults.c | 6 +- minix/servers/vm/pagetable.c | 50 +++--- minix/servers/vm/pb.c | 2 +- minix/servers/vm/proto.h | 16 +- minix/servers/vm/pt.h | 8 +- minix/servers/vm/region.c | 10 +- minix/servers/vm/region.h | 2 +- minix/servers/vm/rs.c | 2 +- minix/servers/vm/slaballoc.c | 12 +- minix/servers/vm/vfs.c | 2 +- minix/servers/vm/vm.h | 2 +- minix/tests/blocktest/blocktest.c | 60 +++---- minix/tests/ds/dstest.c | 2 +- minix/tests/ds/subs.c | 2 +- minix/tests/safecopy/requestor.c | 4 +- minix/tests/test53.c | 4 +- minix/tests/test71.c | 6 +- minix/tests/test72.c | 12 +- minix/tests/test74.c | 6 +- minix/tests/testcache.c | 16 +- minix/tests/testcache.h | 4 +- minix/tests/testvm.c | 6 +- minix/usr.bin/mtop/mtop.c | 4 +- minix/usr.bin/trace/ioctl/block.c | 2 +- minix/usr.sbin/fbdctl/fbdctl.c | 2 +- 297 files changed, 2110 insertions(+), 2110 deletions(-) diff --git a/minix/commands/autopart/autopart.c b/minix/commands/autopart/autopart.c index d94eab463..c932c28d5 100644 --- a/minix/commands/autopart/autopart.c +++ b/minix/commands/autopart/autopart.c @@ -1523,7 +1523,7 @@ void m_read(int ev, int *biosdrive) { int i, n, v; struct part_entry *pe; - u32_t system_hz; + uint32_t system_hz; if (ev != 'r' || device >= 0) return; @@ -1536,7 +1536,7 @@ void m_read(int ev, int *biosdrive) return; } - system_hz = (u32_t) sysconf(_SC_CLK_TCK); + system_hz = (uint32_t) sysconf(_SC_CLK_TCK); v = 2*system_hz; ioctl(device, DIOCTIMEOUT, &v); diff --git a/minix/commands/minix-service/minix-service.c b/minix/commands/minix-service/minix-service.c index 9b185e30c..31142b826 100644 --- a/minix/commands/minix-service/minix-service.c +++ b/minix/commands/minix-service/minix-service.c @@ -289,7 +289,7 @@ static int parse_ipc_filter(char* str, int type_flag) /* Parse and verify correctness of arguments. Report problem and exit if an * error is found. Store needed parameters in global variables. */ -static int parse_arguments(int argc, char **argv, u32_t *rss_flags) +static int parse_arguments(int argc, char **argv, uint32_t *rss_flags) { struct stat stat_buf; char *hz, *buff; @@ -415,7 +415,7 @@ static int parse_arguments(int argc, char **argv, u32_t *rss_flags) *rss_flags = 0; if (req_nr == RS_UP || req_nr == RS_UPDATE || req_nr == RS_EDIT) { - u32_t system_hz; + uint32_t system_hz; if (c_flag) *rss_flags |= RSS_COPY; @@ -511,7 +511,7 @@ static int parse_arguments(int argc, char **argv, u32_t *rss_flags) } /* Get HZ. */ - system_hz = (u32_t) sysconf(_SC_CLK_TCK); + system_hz = (uint32_t) sysconf(_SC_CLK_TCK); /* Check optional arguments that come in pairs like "-args arglist". */ for (i=optind+MIN_ARG_COUNT+1; i> 8); dev_command(base0, sample_rate & 0xff); } -static u32_t rec_format = 0; +static uint32_t rec_format = 0; /* Set DAC and ADC format (### SET_FORMAT ###)*/ -static void dev_set_format(u32_t *base, u32_t bits, u32_t sign, - u32_t stereo, u32_t sample_count) { - u32_t format = 0, base0 = base[0]; +static void dev_set_format(uint32_t *base, uint32_t bits, uint32_t sign, + uint32_t stereo, uint32_t sample_count) { + uint32_t format = 0, base0 = base[0]; if (bits == 16) { format = CMD_BIT16_AI; rec_format = 0; @@ -171,8 +171,8 @@ static void dev_set_format(u32_t *base, u32_t bits, u32_t sign, } /* Start the channel (### START_CHANNEL ###) */ -static void dev_start_channel(u32_t *base, int sub_dev) { - u32_t base0 = base[0]; +static void dev_start_channel(uint32_t *base, int sub_dev) { + uint32_t base0 = base[0]; dev_command(base0, CMD_SOUND_ON); if (sub_dev == DAC) { dev_command(base0, CMD_BIT16_DMA_ON); @@ -183,8 +183,8 @@ static void dev_start_channel(u32_t *base, int sub_dev) { } /* Stop the channel (### STOP_CHANNEL ###) */ -static void dev_stop_channel(u32_t *base, int sub_dev) { - u32_t base0 = base[0]; +static void dev_stop_channel(uint32_t *base, int sub_dev) { + uint32_t base0 = base[0]; if (sub_dev == DAC) { dev_command(base0, CMD_BIT16_DMA_OFF); dev_command(base0, CMD_BIT8_DMA_OFF); @@ -194,8 +194,8 @@ static void dev_stop_channel(u32_t *base, int sub_dev) { } /* Set DMA address and length (### SET_DMA ###) */ -static void dev_set_dma(u32_t *base, u32_t dma, u32_t len, int sub_dev) { - u32_t base0 = base[0]; +static void dev_set_dma(uint32_t *base, uint32_t dma, uint32_t len, int sub_dev) { + uint32_t base0 = base[0]; if (sub_dev == DAC) { dev_gcr_write(base0, REG_DAC_DMA_ADDR, dma); dev_gcr_write(base0, REG_DAC_DMA_LEN, (len - 1) | 0x180000); @@ -207,8 +207,8 @@ static void dev_set_dma(u32_t *base, u32_t dma, u32_t len, int sub_dev) { } /* Read current address (### READ_DMA_CURRENT_ADDR ###) */ -static u32_t dev_read_dma_current(u32_t *base, int sub_dev) { - u32_t data, base0 = base[0]; +static uint32_t dev_read_dma_current(uint32_t *base, int sub_dev) { + uint32_t data, base0 = base[0]; if (sub_dev == DAC) data = dev_gcr_read(base0, REG_DAC_CUR_ADDR); else if (sub_dev == ADC) @@ -217,8 +217,8 @@ static u32_t dev_read_dma_current(u32_t *base, int sub_dev) { } /* Pause the DMA (### PAUSE_DMA ###) */ -static void dev_pause_dma(u32_t *base, int sub_dev) { - u32_t base0 = base[0]; +static void dev_pause_dma(uint32_t *base, int sub_dev) { + uint32_t base0 = base[0]; if (sub_dev == DAC) { dev_command(base0, CMD_BIT16_DMA_OFF); dev_command(base0, CMD_BIT8_DMA_OFF); @@ -228,8 +228,8 @@ static void dev_pause_dma(u32_t *base, int sub_dev) { } /* Resume the DMA (### RESUME_DMA ###) */ -static void dev_resume_dma(u32_t *base, int sub_dev) { - u32_t base0 = base[0]; +static void dev_resume_dma(uint32_t *base, int sub_dev) { + uint32_t base0 = base[0]; if (sub_dev == DAC) { dev_command(base0, CMD_BIT16_DMA_ON); dev_command(base0, CMD_BIT8_DMA_ON); @@ -240,8 +240,8 @@ static void dev_resume_dma(u32_t *base, int sub_dev) { /* Read and clear interrupt status (### READ_CLEAR_INTR_STS ###) * -- Return interrupt status */ -static u32_t dev_read_clear_intr_status(u32_t *base) { - u32_t data, status, base0 = base[0]; +static uint32_t dev_read_clear_intr_status(uint32_t *base) { + uint32_t data, status, base0 = base[0]; status = sdr_in8(base0, REG_INTR_STS); sdr_out8(base0, REG_INTR_STS, status); data = dev_mixer_read(base, REG_SB_IRQ_STATUS); @@ -255,8 +255,8 @@ static u32_t dev_read_clear_intr_status(u32_t *base) { } /* Enable or disable interrupt (### INTR_ENABLE_DISABLE ###) */ -static void dev_intr_enable(u32_t *base, int flag) { - u32_t data, base0 = base[0]; +static void dev_intr_enable(uint32_t *base, int flag) { + uint32_t data, base0 = base[0]; data = dev_gcr_read(base0, REG_INTR_CTRL); if (flag == INTR_ENABLE) dev_gcr_write(base0, REG_INTR_CTRL, data | CMD_INTR_ENABLE); @@ -268,7 +268,7 @@ static void dev_intr_enable(u32_t *base, int flag) { /* Probe the device */ static int dev_probe(void) { int devind, i, ioflag; - u32_t device, bar, size, base; + uint32_t device, bar, size, base; uint16_t vid, did, temp; uint8_t *reg; @@ -299,7 +299,7 @@ static int dev_probe(void) { printf("SDR: Fail to map hardware registers from PCI\n"); return -EIO; } - dev.base[i] = (u32_t)reg; + dev.base[i] = (uint32_t)reg; } #else /* Get PCI BAR0-5 */ @@ -325,25 +325,25 @@ static int dev_probe(void) { } /* Set sample rate in configuration */ -static int set_sample_rate(u32_t rate, int num) { +static int set_sample_rate(uint32_t rate, int num) { aud_conf[num].sample_rate = rate; return OK; } /* Set stereo in configuration */ -static int set_stereo(u32_t stereo, int num) { +static int set_stereo(uint32_t stereo, int num) { aud_conf[num].stereo = stereo; return OK; } /* Set sample bits in configuration */ -static int set_bits(u32_t bits, int num) { +static int set_bits(uint32_t bits, int num) { aud_conf[num].nr_of_bits = bits; return OK; } /* Set fragment size in configuration */ -static int set_frag_size(u32_t frag_size, int num) { +static int set_frag_size(uint32_t frag_size, int num) { if (frag_size > (sub_dev[num].DmaSize / sub_dev[num].NrOfDmaFragments) || frag_size < sub_dev[num].MinFragmentSize) { return EINVAL; @@ -353,20 +353,20 @@ static int set_frag_size(u32_t frag_size, int num) { } /* Set frame sign in configuration */ -static int set_sign(u32_t val, int num) { +static int set_sign(uint32_t val, int num) { aud_conf[num].sign = val; return OK; } /* Get maximum fragment size */ -static int get_max_frag_size(u32_t *val, int *len, int num) { +static int get_max_frag_size(uint32_t *val, int *len, int num) { *len = sizeof(*val); *val = (sub_dev[num].DmaSize / sub_dev[num].NrOfDmaFragments); return OK; } /* Return 1 if there are free buffers */ -static int free_buf(u32_t *val, int *len, int num) { +static int free_buf(uint32_t *val, int *len, int num) { *len = sizeof(*val); if (sub_dev[num].BufLength == sub_dev[num].NrOfExtraBuffers) *val = 0; @@ -376,11 +376,11 @@ static int free_buf(u32_t *val, int *len, int num) { } /* Get the current sample counter */ -static int get_samples_in_buf(u32_t *result, int *len, int chan) { - u32_t res; +static int get_samples_in_buf(uint32_t *result, int *len, int chan) { + uint32_t res; /* READ_DMA_CURRENT_ADDR */ res = dev_read_dma_current(dev.base, chan); - *result = (u32_t)(sub_dev[chan].BufLength * 8192) + res; + *result = (uint32_t)(sub_dev[chan].BufLength * 8192) + res; return OK; } @@ -503,7 +503,7 @@ int drv_start(int sub_dev, int DmaMode) { /* ======= [Audio interface] Driver start ======= */ int drv_stop(int sub_dev) { - u32_t data; + uint32_t data; /* INTR_ENABLE_DISABLE */ dev_intr_enable(dev.base, INTR_DISABLE); @@ -527,19 +527,19 @@ int drv_io_ctl(unsigned long request, void *val, int *len, int sub_dev) { int status; switch (request) { case DSPIORATE: - status = set_sample_rate(*((u32_t *)val), sub_dev); + status = set_sample_rate(*((uint32_t *)val), sub_dev); break; case DSPIOSTEREO: - status = set_stereo(*((u32_t *)val), sub_dev); + status = set_stereo(*((uint32_t *)val), sub_dev); break; case DSPIOBITS: - status = set_bits(*((u32_t *)val), sub_dev); + status = set_bits(*((uint32_t *)val), sub_dev); break; case DSPIOSIZE: - status = set_frag_size(*((u32_t *)val), sub_dev); + status = set_frag_size(*((uint32_t *)val), sub_dev); break; case DSPIOSIGN: - status = set_sign(*((u32_t *)val), sub_dev); + status = set_sign(*((uint32_t *)val), sub_dev); break; case DSPIOMAX: status = get_max_frag_size(val, len, sub_dev); @@ -581,13 +581,13 @@ int drv_get_irq(char *irq) { } /* ======= [Audio interface] Get fragment size ======= */ -int drv_get_frag_size(u32_t *frag_size, int sub_dev) { +int drv_get_frag_size(uint32_t *frag_size, int sub_dev) { *frag_size = aud_conf[sub_dev].fragment_size; return OK; } /* ======= [Audio interface] Set DMA channel ======= */ -int drv_set_dma(u32_t dma, u32_t length, int chan) { +int drv_set_dma(uint32_t dma, uint32_t length, int chan) { #ifdef DMA_LENGTH_BY_FRAME length = length / (aud_conf[chan].nr_of_bits * (aud_conf[chan].stereo + 1) / 8); #endif @@ -598,7 +598,7 @@ int drv_set_dma(u32_t dma, u32_t length, int chan) { /* ======= [Audio interface] Get interrupt summary status ======= */ int drv_int_sum(void) { - u32_t status; + uint32_t status; /* ### READ_CLEAR_INTR_STS ### */ status = dev_read_clear_intr_status(dev.base); dev.intr_status = status; @@ -610,7 +610,7 @@ int drv_int_sum(void) { /* ======= [Audio interface] Handle interrupt status ======= */ int drv_int(int sub_dev) { - u32_t mask; + uint32_t mask; /* ### CHECK_INTR_DAC ### */ if (sub_dev == DAC) diff --git a/minix/drivers/audio/als4000/als4000.h b/minix/drivers/audio/als4000/als4000.h index a439d03e4..50cf35d23 100644 --- a/minix/drivers/audio/als4000/als4000.h +++ b/minix/drivers/audio/als4000/als4000.h @@ -82,18 +82,18 @@ #define CMD_REC_STEREO 0x20 #define CMD_REC_SIGN 0x10 -static u32_t g_sample_rate[] = { +static uint32_t g_sample_rate[] = { 5512, 11025, 22050, 44100, 8000, 16000, 32000, 48000 }; /* Driver Data Structure */ typedef struct aud_sub_dev_conf_t { - u32_t stereo; + uint32_t stereo; uint16_t sample_rate; - u32_t nr_of_bits; - u32_t sign; - u32_t busy; - u32_t fragment_size; + uint32_t nr_of_bits; + uint32_t sign; + uint32_t busy; + uint32_t fragment_size; uint8_t format; } aud_sub_dev_conf_t; @@ -101,14 +101,14 @@ typedef struct DEV_STRUCT { char *name; uint16_t vid; uint16_t did; - u32_t devind; - u32_t base[6]; + uint32_t devind; + uint32_t base[6]; char irq; char revision; - u32_t intr_status; + uint32_t intr_status; } DEV_STRUCT; -void dev_mixer_write(u32_t *base, u32_t reg, u32_t val); -u32_t dev_mixer_read(u32_t *base, u32_t reg); +void dev_mixer_write(uint32_t *base, uint32_t reg, uint32_t val); +uint32_t dev_mixer_read(uint32_t *base, uint32_t reg); #endif diff --git a/minix/drivers/audio/als4000/io.h b/minix/drivers/audio/als4000/io.h index aaadddfbd..7629db7f5 100644 --- a/minix/drivers/audio/als4000/io.h +++ b/minix/drivers/audio/als4000/io.h @@ -6,8 +6,8 @@ #include "als4000.h" /* I/O function */ -static uint8_t my_inb(u32_t port) { - u32_t value; +static uint8_t my_inb(uint32_t port) { + uint32_t value; int r; #ifdef DMA_BASE_IOMAP value = *(volatile uint8_t *)(port); @@ -19,8 +19,8 @@ static uint8_t my_inb(u32_t port) { } #define sdr_in8(port, offset) (my_inb((port) + (offset))) -static uint16_t my_inw(u32_t port) { - u32_t value; +static uint16_t my_inw(uint32_t port) { + uint32_t value; int r; #ifdef DMA_BASE_IOMAP value = *(volatile uint16_t *)(port); @@ -32,11 +32,11 @@ static uint16_t my_inw(u32_t port) { } #define sdr_in16(port, offset) (my_inw((port) + (offset))) -static u32_t my_inl(u32_t port) { - u32_t value; +static uint32_t my_inl(uint32_t port) { + uint32_t value; int r; #ifdef DMA_BASE_IOMAP - value = *(volatile u32_t *)(port); + value = *(volatile uint32_t *)(port); #else if ((r = sys_inl(port, &value)) != OK) printf("SDR: sys_inl failed: %d\n", r); @@ -45,7 +45,7 @@ static u32_t my_inl(u32_t port) { } #define sdr_in32(port, offset) (my_inl((port) + (offset))) -static void my_outb(u32_t port, u32_t value) { +static void my_outb(uint32_t port, uint32_t value) { int r; #ifdef DMA_BASE_IOMAP *(volatile uint8_t *)(port) = value; @@ -57,7 +57,7 @@ static void my_outb(u32_t port, u32_t value) { #define sdr_out8(port, offset, value) \ (my_outb(((port) + (offset)), (value))) -static void my_outw(u32_t port, u32_t value) { +static void my_outw(uint32_t port, uint32_t value) { int r; #ifdef DMA_BASE_IOMAP *(volatile uint16_t *)(port) = value; @@ -69,10 +69,10 @@ static void my_outw(u32_t port, u32_t value) { #define sdr_out16(port, offset, value) \ (my_outw(((port) + (offset)), (value))) -static void my_outl(u32_t port, u32_t value) { +static void my_outl(uint32_t port, uint32_t value) { int r; #ifdef DMA_BASE_IOMAP - *(volatile u32_t *)(port) = value; + *(volatile uint32_t *)(port) = value; #else if ((r = sys_outl(port, value)) != OK) printf("SDR: sys_outl failed: %d\n", r); diff --git a/minix/drivers/audio/als4000/mixer.c b/minix/drivers/audio/als4000/mixer.c index a99b7061a..ac3490455 100644 --- a/minix/drivers/audio/als4000/mixer.c +++ b/minix/drivers/audio/als4000/mixer.c @@ -7,7 +7,7 @@ uint8_t mixer_value[] = { 0x7e, 0x3d, 0x01, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x01 }; -int get_set_volume(u32_t *base, struct volume_level *level, int flag) { +int get_set_volume(uint32_t *base, struct volume_level *level, int flag) { int max_level, cmd_left, cmd_right; max_level = 0x1f; @@ -76,7 +76,7 @@ int get_set_volume(u32_t *base, struct volume_level *level, int flag) { #endif #ifdef MIXER_SB16 -int get_set_volume(u32_t *base, struct volume_level *level, int flag) { +int get_set_volume(uint32_t *base, struct volume_level *level, int flag) { int max_level, shift, cmd_left, cmd_right; max_level = 0x0f; @@ -155,7 +155,7 @@ int get_set_volume(u32_t *base, struct volume_level *level, int flag) { #endif #ifdef MIXER_AC97 -int get_set_volume(u32_t *base, struct volume_level *level, int flag) { +int get_set_volume(uint32_t *base, struct volume_level *level, int flag) { int max_level, cmd, data; max_level = 0x1f; @@ -223,7 +223,7 @@ int get_set_volume(u32_t *base, struct volume_level *level, int flag) { #endif /* Set default mixer volume */ -void dev_set_default_volume(u32_t *base) { +void dev_set_default_volume(uint32_t *base) { int i; #ifdef MIXER_AK4531 for (i = 0; i <= 0x19; i++) diff --git a/minix/drivers/audio/als4000/mixer.h b/minix/drivers/audio/als4000/mixer.h index d77f1db2f..88c9283bb 100644 --- a/minix/drivers/audio/als4000/mixer.h +++ b/minix/drivers/audio/als4000/mixer.h @@ -56,7 +56,7 @@ #define AC97_RESET 0x00 #endif -int get_set_volume(u32_t *pbase, struct volume_level *level, int flag); -void dev_set_default_volume(u32_t *pbase); +int get_set_volume(uint32_t *pbase, struct volume_level *level, int flag); +void dev_set_default_volume(uint32_t *pbase); #endif diff --git a/minix/drivers/audio/cmi8738/cmi8738.c b/minix/drivers/audio/cmi8738/cmi8738.c index 47c51ee53..a9c74bd1e 100644 --- a/minix/drivers/audio/cmi8738/cmi8738.c +++ b/minix/drivers/audio/cmi8738/cmi8738.c @@ -10,35 +10,35 @@ drv_t drv; /* internal function */ static int dev_probe(void); -static int set_sample_rate(u32_t rate, int num); -static int set_stereo(u32_t stereo, int num); -static int set_bits(u32_t bits, int sub_dev); -static int set_frag_size(u32_t frag_size, int num); -static int set_sign(u32_t val, int num); -static int get_frag_size(u32_t *val, int *len, int num); -static int free_buf(u32_t *val, int *len, int num); +static int set_sample_rate(uint32_t rate, int num); +static int set_stereo(uint32_t stereo, int num); +static int set_bits(uint32_t bits, int sub_dev); +static int set_frag_size(uint32_t frag_size, int num); +static int set_sign(uint32_t val, int num); +static int get_frag_size(uint32_t *val, int *len, int num); +static int free_buf(uint32_t *val, int *len, int num); /* developer interface */ -static int dev_reset(u32_t *base); -static void dev_configure(u32_t *base); -static void dev_init_mixer(u32_t *base); -static void dev_set_sample_rate(u32_t *base, uint16_t sample_rate); -static void dev_set_format(u32_t *base, u32_t bits, u32_t sign, - u32_t stereo, u32_t sample_count); -static void dev_start_channel(u32_t *base, int sub_dev); -static void dev_stop_channel(u32_t *base, int sub_dev); -static void dev_set_dma(u32_t *base, u32_t dma, u32_t len, int sub_dev); -static u32_t dev_read_dma_current(u32_t *base, int sub_dev); -static void dev_pause_dma(u32_t *base, int sub_dev); -static void dev_resume_dma(u32_t *base, int sub_dev); -static void dev_intr_other(u32_t *base, u32_t status); -static u32_t dev_read_clear_intr_status(u32_t *base); -static void dev_intr_enable(u32_t *base, int flag); +static int dev_reset(uint32_t *base); +static void dev_configure(uint32_t *base); +static void dev_init_mixer(uint32_t *base); +static void dev_set_sample_rate(uint32_t *base, uint16_t sample_rate); +static void dev_set_format(uint32_t *base, uint32_t bits, uint32_t sign, + uint32_t stereo, uint32_t sample_count); +static void dev_start_channel(uint32_t *base, int sub_dev); +static void dev_stop_channel(uint32_t *base, int sub_dev); +static void dev_set_dma(uint32_t *base, uint32_t dma, uint32_t len, int sub_dev); +static uint32_t dev_read_dma_current(uint32_t *base, int sub_dev); +static void dev_pause_dma(uint32_t *base, int sub_dev); +static void dev_resume_dma(uint32_t *base, int sub_dev); +static void dev_intr_other(uint32_t *base, uint32_t status); +static uint32_t dev_read_clear_intr_status(uint32_t *base); +static void dev_intr_enable(uint32_t *base, int flag); /* ======= Developer implemented function ======= */ /* ====== Self-defined function ====== */ -void dev_io_set_clear(u32_t base, u32_t reg, u32_t val, int flag) { - u32_t data; +void dev_io_set_clear(uint32_t base, uint32_t reg, uint32_t val, int flag) { + uint32_t data; data = sdr_in32(base, reg); if (flag == 0) data &= ~val; @@ -49,15 +49,15 @@ void dev_io_set_clear(u32_t base, u32_t reg, u32_t val, int flag) { /* ====== Mixer handling interface ======*/ /* Write the data to mixer register (### WRITE_MIXER_REG ###) */ -void dev_mixer_write(u32_t *base, u32_t reg, u32_t val) { - u32_t base0 = base[0]; +void dev_mixer_write(uint32_t *base, uint32_t reg, uint32_t val) { + uint32_t base0 = base[0]; sdr_out8(base0, REG_SB_ADDR, reg); sdr_out8(base0, REG_SB_DATA, val); } /* Read the data from mixer register (### READ_MIXER_REG ###) */ -u32_t dev_mixer_read(u32_t *base, u32_t reg) { - u32_t base0 = base[0]; +uint32_t dev_mixer_read(uint32_t *base, uint32_t reg) { + uint32_t base0 = base[0]; sdr_out8(base0, REG_SB_ADDR, reg); return sdr_in8(base0, REG_SB_DATA); } @@ -66,8 +66,8 @@ u32_t dev_mixer_read(u32_t *base, u32_t reg) { /* Reset the device (### RESET_HARDWARE_CAN_FAIL ###) * -- Return OK means success, Others means failure */ -static int dev_reset(u32_t *base) { - u32_t data, base0 = base[0]; +static int dev_reset(uint32_t *base) { + uint32_t data, base0 = base[0]; dev_io_set_clear(base0, REG_MISC_CTRL, CMD_POWER_DOWN, 0); dev_io_set_clear(base0, REG_MISC_CTRL, CMD_RESET, 1); micro_delay(100); @@ -76,8 +76,8 @@ static int dev_reset(u32_t *base) { } /* Configure hardware registers (### CONF_HARDWARE ###) */ -static void dev_configure(u32_t *base) { - u32_t data, base0 = base[0]; +static void dev_configure(uint32_t *base) { + uint32_t data, base0 = base[0]; dev_io_set_clear(base0, REG_FUNC_CTRL, CMD_ADC_C0, 0); dev_io_set_clear(base0, REG_FUNC_CTRL, CMD_ADC_C1, 1); dev_io_set_clear(base0, REG_MISC_CTRL, CMD_N4SPK3D, 1); @@ -88,7 +88,7 @@ static void dev_configure(u32_t *base) { } /* Initialize the mixer (### INIT_MIXER ###) */ -static void dev_init_mixer(u32_t *base) { +static void dev_init_mixer(uint32_t *base) { dev_mixer_write(base, 0, 0); dev_mixer_write(base, MIXER_ADCL, 0x1f); dev_mixer_write(base, MIXER_ADCR, 0x7f); @@ -96,9 +96,9 @@ static void dev_init_mixer(u32_t *base) { } /* Set DAC and ADC sample rate (### SET_SAMPLE_RATE ###) */ -static void dev_set_sample_rate(u32_t *base, uint16_t sample_rate) { +static void dev_set_sample_rate(uint32_t *base, uint16_t sample_rate) { int i; - u32_t data, rate = 0, base0 = base[0]; + uint32_t data, rate = 0, base0 = base[0]; for (i = 0; i < 8; i++) { if (sample_rate == g_sample_rate[i]) { rate = i; @@ -113,9 +113,9 @@ static void dev_set_sample_rate(u32_t *base, uint16_t sample_rate) { } /* Set DAC and ADC format (### SET_FORMAT ###)*/ -static void dev_set_format(u32_t *base, u32_t bits, u32_t sign, - u32_t stereo, u32_t sample_count) { - u32_t format = 0, data, base0 = base[0]; +static void dev_set_format(uint32_t *base, uint32_t bits, uint32_t sign, + uint32_t stereo, uint32_t sample_count) { + uint32_t format = 0, data, base0 = base[0]; if (stereo == 1) format |= FMT_STEREO; if (bits == 16) @@ -132,8 +132,8 @@ static void dev_set_format(u32_t *base, u32_t bits, u32_t sign, } /* Start the channel (### START_CHANNEL ###) */ -static void dev_start_channel(u32_t *base, int sub_dev) { - u32_t data, base0 = base[0]; +static void dev_start_channel(uint32_t *base, int sub_dev) { + uint32_t data, base0 = base[0]; if (sub_dev == DAC) { dev_io_set_clear(base0, REG_FUNC_CTRL, CMD_ENA_C0, 1); } @@ -143,8 +143,8 @@ static void dev_start_channel(u32_t *base, int sub_dev) { } /* Stop the channel (### STOP_CHANNEL ###) */ -static void dev_stop_channel(u32_t *base, int sub_dev) { - u32_t data, base0 = base[0]; +static void dev_stop_channel(uint32_t *base, int sub_dev) { + uint32_t data, base0 = base[0]; if (sub_dev == DAC) { dev_io_set_clear(base0, REG_FUNC_CTRL, CMD_ENA_C0, 0); dev_io_set_clear(base0, REG_FUNC_CTRL, CMD_RESET_C0, 1); @@ -160,8 +160,8 @@ static void dev_stop_channel(u32_t *base, int sub_dev) { } /* Set DMA address and length (### SET_DMA ###) */ -static void dev_set_dma(u32_t *base, u32_t dma, u32_t len, int sub_dev) { - u32_t base0 = base[0]; +static void dev_set_dma(uint32_t *base, uint32_t dma, uint32_t len, int sub_dev) { + uint32_t base0 = base[0]; if (sub_dev == DAC) { sdr_out32(base0, REG_DAC_DMA_ADDR, dma); sdr_out16(base0, REG_DAC_DMA_LEN, len - 1); @@ -173,8 +173,8 @@ static void dev_set_dma(u32_t *base, u32_t dma, u32_t len, int sub_dev) { } /* Read current address (### READ_DMA_CURRENT_ADDR ###) */ -static u32_t dev_read_dma_current(u32_t *base, int sub_dev) { - u32_t data, base0 = base[0]; +static uint32_t dev_read_dma_current(uint32_t *base, int sub_dev) { + uint32_t data, base0 = base[0]; if (sub_dev == DAC) data = sdr_in16(base0, REG_DAC_CUR_ADDR); else if (sub_dev == ADC) @@ -183,8 +183,8 @@ static u32_t dev_read_dma_current(u32_t *base, int sub_dev) { } /* Pause the DMA (### PAUSE_DMA ###) */ -static void dev_pause_dma(u32_t *base, int sub_dev) { - u32_t base0 = base[0]; +static void dev_pause_dma(uint32_t *base, int sub_dev) { + uint32_t base0 = base[0]; if (sub_dev == DAC) dev_io_set_clear(base0, REG_FUNC_CTRL, CMD_PAUSE_C0, 1); else if (sub_dev == ADC) @@ -192,8 +192,8 @@ static void dev_pause_dma(u32_t *base, int sub_dev) { } /* Resume the DMA (### RESUME_DMA ###) */ -static void dev_resume_dma(u32_t *base, int sub_dev) { - u32_t base0 = base[0]; +static void dev_resume_dma(uint32_t *base, int sub_dev) { + uint32_t base0 = base[0]; if (sub_dev == DAC) dev_io_set_clear(base0, REG_FUNC_CTRL, CMD_PAUSE_C0, 0); else if (sub_dev == ADC) @@ -202,8 +202,8 @@ static void dev_resume_dma(u32_t *base, int sub_dev) { /* Read and clear interrupt status (### READ_CLEAR_INTR_STS ###) * -- Return interrupt status */ -static u32_t dev_read_clear_intr_status(u32_t *base) { - u32_t data, base0 = base[0]; +static uint32_t dev_read_clear_intr_status(uint32_t *base) { + uint32_t data, base0 = base[0]; data = sdr_in32(base0, REG_INTR_STS); dev_intr_enable(base, INTR_DISABLE); dev_intr_enable(base, INTR_ENABLE); @@ -211,8 +211,8 @@ static u32_t dev_read_clear_intr_status(u32_t *base) { } /* Enable or disable interrupt (### INTR_ENBALE_DISABLE ###) */ -static void dev_intr_enable(u32_t *base, int flag) { - u32_t data, base0 = base[0]; +static void dev_intr_enable(uint32_t *base, int flag) { + uint32_t data, base0 = base[0]; data = sdr_in32(base0, REG_INTR_STS); if (flag == INTR_ENABLE) sdr_out32(base0, REG_INTR_CTRL, data | CMD_INTR_ENABLE); @@ -224,7 +224,7 @@ static void dev_intr_enable(u32_t *base, int flag) { /* Probe the device */ static int dev_probe(void) { int devind, i, ioflag; - u32_t device, bar, size, base; + uint32_t device, bar, size, base; uint16_t vid, did, temp; uint8_t *reg; @@ -255,7 +255,7 @@ static int dev_probe(void) { printf("SDR: Fail to map hardware registers from PCI\n"); return -EIO; } - dev.base[i] = (u32_t)reg; + dev.base[i] = (uint32_t)reg; } #else /* Get PCI BAR0-5 */ @@ -281,25 +281,25 @@ static int dev_probe(void) { } /* Set sample rate in configuration */ -static int set_sample_rate(u32_t rate, int num) { +static int set_sample_rate(uint32_t rate, int num) { aud_conf[num].sample_rate = rate; return OK; } /* Set stereo in configuration */ -static int set_stereo(u32_t stereo, int num) { +static int set_stereo(uint32_t stereo, int num) { aud_conf[num].stereo = stereo; return OK; } /* Set sample bits in configuration */ -static int set_bits(u32_t bits, int num) { +static int set_bits(uint32_t bits, int num) { aud_conf[num].nr_of_bits = bits; return OK; } /* Set fragment size in configuration */ -static int set_frag_size(u32_t frag_size, int num) { +static int set_frag_size(uint32_t frag_size, int num) { if (frag_size > (sub_dev[num].DmaSize / sub_dev[num].NrOfDmaFragments) || frag_size < sub_dev[num].MinFragmentSize) { return EINVAL; @@ -309,20 +309,20 @@ static int set_frag_size(u32_t frag_size, int num) { } /* Set frame sign in configuration */ -static int set_sign(u32_t val, int num) { +static int set_sign(uint32_t val, int num) { aud_conf[num].sign = val; return OK; } /* Get maximum fragment size */ -static int get_max_frag_size(u32_t *val, int *len, int num) { +static int get_max_frag_size(uint32_t *val, int *len, int num) { *len = sizeof(*val); *val = (sub_dev[num].DmaSize / sub_dev[num].NrOfDmaFragments); return OK; } /* Return 1 if there are free buffers */ -static int free_buf(u32_t *val, int *len, int num) { +static int free_buf(uint32_t *val, int *len, int num) { *len = sizeof(*val); if (sub_dev[num].BufLength == sub_dev[num].NrOfExtraBuffers) *val = 0; @@ -332,11 +332,11 @@ static int free_buf(u32_t *val, int *len, int num) { } /* Get the current sample counter */ -static int get_samples_in_buf(u32_t *result, int *len, int chan) { - u32_t res; +static int get_samples_in_buf(uint32_t *result, int *len, int chan) { + uint32_t res; /* READ_DMA_CURRENT_ADDR */ res = dev_read_dma_current(dev.base, chan); - *result = (u32_t)(sub_dev[chan].BufLength * 8192) + res; + *result = (uint32_t)(sub_dev[chan].BufLength * 8192) + res; return OK; } @@ -459,7 +459,7 @@ int drv_start(int sub_dev, int DmaMode) { /* ======= [Audio interface] Driver start ======= */ int drv_stop(int sub_dev) { - u32_t data; + uint32_t data; /* INTR_ENABLE_DISABLE */ dev_intr_enable(dev.base, INTR_DISABLE); @@ -483,19 +483,19 @@ int drv_io_ctl(unsigned long request, void *val, int *len, int sub_dev) { int status; switch (request) { case DSPIORATE: - status = set_sample_rate(*((u32_t *)val), sub_dev); + status = set_sample_rate(*((uint32_t *)val), sub_dev); break; case DSPIOSTEREO: - status = set_stereo(*((u32_t *)val), sub_dev); + status = set_stereo(*((uint32_t *)val), sub_dev); break; case DSPIOBITS: - status = set_bits(*((u32_t *)val), sub_dev); + status = set_bits(*((uint32_t *)val), sub_dev); break; case DSPIOSIZE: - status = set_frag_size(*((u32_t *)val), sub_dev); + status = set_frag_size(*((uint32_t *)val), sub_dev); break; case DSPIOSIGN: - status = set_sign(*((u32_t *)val), sub_dev); + status = set_sign(*((uint32_t *)val), sub_dev); break; case DSPIOMAX: status = get_max_frag_size(val, len, sub_dev); @@ -537,13 +537,13 @@ int drv_get_irq(char *irq) { } /* ======= [Audio interface] Get fragment size ======= */ -int drv_get_frag_size(u32_t *frag_size, int sub_dev) { +int drv_get_frag_size(uint32_t *frag_size, int sub_dev) { *frag_size = aud_conf[sub_dev].fragment_size; return OK; } /* ======= [Audio interface] Set DMA channel ======= */ -int drv_set_dma(u32_t dma, u32_t length, int chan) { +int drv_set_dma(uint32_t dma, uint32_t length, int chan) { #ifdef DMA_LENGTH_BY_FRAME length = length / (aud_conf[chan].nr_of_bits * (aud_conf[chan].stereo + 1) / 8); #endif @@ -554,7 +554,7 @@ int drv_set_dma(u32_t dma, u32_t length, int chan) { /* ======= [Audio interface] Get interrupt summary status ======= */ int drv_int_sum(void) { - u32_t status; + uint32_t status; /* ### READ_CLEAR_INTR_STS ### */ status = dev_read_clear_intr_status(dev.base); dev.intr_status = status; @@ -566,7 +566,7 @@ int drv_int_sum(void) { /* ======= [Audio interface] Handle interrupt status ======= */ int drv_int(int sub_dev) { - u32_t mask; + uint32_t mask; /* ### CHECK_INTR_DAC ### */ if (sub_dev == DAC) diff --git a/minix/drivers/audio/cmi8738/cmi8738.h b/minix/drivers/audio/cmi8738/cmi8738.h index 2bc0fb55b..42c7e92c5 100644 --- a/minix/drivers/audio/cmi8738/cmi8738.h +++ b/minix/drivers/audio/cmi8738/cmi8738.h @@ -81,18 +81,18 @@ #define CMD_INTR_ENABLE 0x00030000 -static u32_t g_sample_rate[] = { +static uint32_t g_sample_rate[] = { 5512, 11025, 22050, 44100, 8000, 16000, 32000, 48000 }; /* Driver Data Structure */ typedef struct aud_sub_dev_conf_t { - u32_t stereo; + uint32_t stereo; uint16_t sample_rate; - u32_t nr_of_bits; - u32_t sign; - u32_t busy; - u32_t fragment_size; + uint32_t nr_of_bits; + uint32_t sign; + uint32_t busy; + uint32_t fragment_size; uint8_t format; } aud_sub_dev_conf_t; @@ -100,14 +100,14 @@ typedef struct DEV_STRUCT { char *name; uint16_t vid; uint16_t did; - u32_t devind; - u32_t base[6]; + uint32_t devind; + uint32_t base[6]; char irq; char revision; - u32_t intr_status; + uint32_t intr_status; } DEV_STRUCT; -void dev_mixer_write(u32_t *base, u32_t reg, u32_t val); -u32_t dev_mixer_read(u32_t *base, u32_t reg); +void dev_mixer_write(uint32_t *base, uint32_t reg, uint32_t val); +uint32_t dev_mixer_read(uint32_t *base, uint32_t reg); #endif diff --git a/minix/drivers/audio/cmi8738/io.h b/minix/drivers/audio/cmi8738/io.h index 0e08243ad..72636818f 100644 --- a/minix/drivers/audio/cmi8738/io.h +++ b/minix/drivers/audio/cmi8738/io.h @@ -6,8 +6,8 @@ #include "cmi8738.h" /* I/O function */ -static uint8_t my_inb(u32_t port) { - u32_t value; +static uint8_t my_inb(uint32_t port) { + uint32_t value; int r; #ifdef DMA_BASE_IOMAP value = *(volatile uint8_t *)(port); @@ -19,8 +19,8 @@ static uint8_t my_inb(u32_t port) { } #define sdr_in8(port, offset) (my_inb((port) + (offset))) -static uint16_t my_inw(u32_t port) { - u32_t value; +static uint16_t my_inw(uint32_t port) { + uint32_t value; int r; #ifdef DMA_BASE_IOMAP value = *(volatile uint16_t *)(port); @@ -32,11 +32,11 @@ static uint16_t my_inw(u32_t port) { } #define sdr_in16(port, offset) (my_inw((port) + (offset))) -static u32_t my_inl(u32_t port) { - u32_t value; +static uint32_t my_inl(uint32_t port) { + uint32_t value; int r; #ifdef DMA_BASE_IOMAP - value = *(volatile u32_t *)(port); + value = *(volatile uint32_t *)(port); #else if ((r = sys_inl(port, &value)) != OK) printf("SDR: sys_inl failed: %d\n", r); @@ -45,7 +45,7 @@ static u32_t my_inl(u32_t port) { } #define sdr_in32(port, offset) (my_inl((port) + (offset))) -static void my_outb(u32_t port, u32_t value) { +static void my_outb(uint32_t port, uint32_t value) { int r; #ifdef DMA_BASE_IOMAP *(volatile uint8_t *)(port) = value; @@ -57,7 +57,7 @@ static void my_outb(u32_t port, u32_t value) { #define sdr_out8(port, offset, value) \ (my_outb(((port) + (offset)), (value))) -static void my_outw(u32_t port, u32_t value) { +static void my_outw(uint32_t port, uint32_t value) { int r; #ifdef DMA_BASE_IOMAP *(volatile uint16_t *)(port) = value; @@ -69,10 +69,10 @@ static void my_outw(u32_t port, u32_t value) { #define sdr_out16(port, offset, value) \ (my_outw(((port) + (offset)), (value))) -static void my_outl(u32_t port, u32_t value) { +static void my_outl(uint32_t port, uint32_t value) { int r; #ifdef DMA_BASE_IOMAP - *(volatile u32_t *)(port) = value; + *(volatile uint32_t *)(port) = value; #else if ((r = sys_outl(port, value)) != OK) printf("SDR: sys_outl failed: %d\n", r); diff --git a/minix/drivers/audio/cmi8738/mixer.c b/minix/drivers/audio/cmi8738/mixer.c index a99b7061a..ac3490455 100644 --- a/minix/drivers/audio/cmi8738/mixer.c +++ b/minix/drivers/audio/cmi8738/mixer.c @@ -7,7 +7,7 @@ uint8_t mixer_value[] = { 0x7e, 0x3d, 0x01, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x01 }; -int get_set_volume(u32_t *base, struct volume_level *level, int flag) { +int get_set_volume(uint32_t *base, struct volume_level *level, int flag) { int max_level, cmd_left, cmd_right; max_level = 0x1f; @@ -76,7 +76,7 @@ int get_set_volume(u32_t *base, struct volume_level *level, int flag) { #endif #ifdef MIXER_SB16 -int get_set_volume(u32_t *base, struct volume_level *level, int flag) { +int get_set_volume(uint32_t *base, struct volume_level *level, int flag) { int max_level, shift, cmd_left, cmd_right; max_level = 0x0f; @@ -155,7 +155,7 @@ int get_set_volume(u32_t *base, struct volume_level *level, int flag) { #endif #ifdef MIXER_AC97 -int get_set_volume(u32_t *base, struct volume_level *level, int flag) { +int get_set_volume(uint32_t *base, struct volume_level *level, int flag) { int max_level, cmd, data; max_level = 0x1f; @@ -223,7 +223,7 @@ int get_set_volume(u32_t *base, struct volume_level *level, int flag) { #endif /* Set default mixer volume */ -void dev_set_default_volume(u32_t *base) { +void dev_set_default_volume(uint32_t *base) { int i; #ifdef MIXER_AK4531 for (i = 0; i <= 0x19; i++) diff --git a/minix/drivers/audio/cmi8738/mixer.h b/minix/drivers/audio/cmi8738/mixer.h index e5d0d2144..1c9cad977 100644 --- a/minix/drivers/audio/cmi8738/mixer.h +++ b/minix/drivers/audio/cmi8738/mixer.h @@ -56,7 +56,7 @@ #define AC97_RESET 0x00 #endif -int get_set_volume(u32_t *pbase, struct volume_level *level, int flag); -void dev_set_default_volume(u32_t *pbase); +int get_set_volume(uint32_t *pbase, struct volume_level *level, int flag); +void dev_set_default_volume(uint32_t *pbase); #endif diff --git a/minix/drivers/audio/cs4281/cs4281.c b/minix/drivers/audio/cs4281/cs4281.c index 6852c6361..8c9ec5efc 100644 --- a/minix/drivers/audio/cs4281/cs4281.c +++ b/minix/drivers/audio/cs4281/cs4281.c @@ -10,38 +10,38 @@ drv_t drv; /* internal function */ static int dev_probe(void); -static int set_sample_rate(u32_t rate, int num); -static int set_stereo(u32_t stereo, int num); -static int set_bits(u32_t bits, int sub_dev); -static int set_frag_size(u32_t frag_size, int num); -static int set_sign(u32_t val, int num); -static int get_frag_size(u32_t *val, int *len, int num); -static int free_buf(u32_t *val, int *len, int num); +static int set_sample_rate(uint32_t rate, int num); +static int set_stereo(uint32_t stereo, int num); +static int set_bits(uint32_t bits, int sub_dev); +static int set_frag_size(uint32_t frag_size, int num); +static int set_sign(uint32_t val, int num); +static int get_frag_size(uint32_t *val, int *len, int num); +static int free_buf(uint32_t *val, int *len, int num); /* developer interface */ -static int dev_reset(u32_t *base); -static void dev_configure(u32_t *base); -static void dev_init_mixer(u32_t *base); -static void dev_set_sample_rate(u32_t *base, uint16_t sample_rate); -static void dev_set_format(u32_t *base, u32_t bits, u32_t sign, - u32_t stereo, u32_t sample_count); -static void dev_start_channel(u32_t *base, int sub_dev); -static void dev_stop_channel(u32_t *base, int sub_dev); -static void dev_set_dma(u32_t *base, u32_t dma, u32_t len, int sub_dev); -static u32_t dev_read_dma_current(u32_t *base, int sub_dev); -static void dev_pause_dma(u32_t *base, int sub_dev); -static void dev_resume_dma(u32_t *base, int sub_dev); -static void dev_intr_other(u32_t *base, u32_t status); -static u32_t dev_read_clear_intr_status(u32_t *base); -static void dev_intr_enable(u32_t *base, int flag); +static int dev_reset(uint32_t *base); +static void dev_configure(uint32_t *base); +static void dev_init_mixer(uint32_t *base); +static void dev_set_sample_rate(uint32_t *base, uint16_t sample_rate); +static void dev_set_format(uint32_t *base, uint32_t bits, uint32_t sign, + uint32_t stereo, uint32_t sample_count); +static void dev_start_channel(uint32_t *base, int sub_dev); +static void dev_stop_channel(uint32_t *base, int sub_dev); +static void dev_set_dma(uint32_t *base, uint32_t dma, uint32_t len, int sub_dev); +static uint32_t dev_read_dma_current(uint32_t *base, int sub_dev); +static void dev_pause_dma(uint32_t *base, int sub_dev); +static void dev_resume_dma(uint32_t *base, int sub_dev); +static void dev_intr_other(uint32_t *base, uint32_t status); +static uint32_t dev_read_clear_intr_status(uint32_t *base); +static void dev_intr_enable(uint32_t *base, int flag); /* ======= Developer implemented function ======= */ /* ====== Self-defined function ====== */ /* ====== Mixer handling interface ======*/ /* Write the data to mixer register (### WRITE_MIXER_REG ###) */ -void dev_mixer_write(u32_t *base, u32_t reg, u32_t val) { - u32_t i, data, base0 = base[0]; +void dev_mixer_write(uint32_t *base, uint32_t reg, uint32_t val) { + uint32_t i, data, base0 = base[0]; sdr_out32(base0, REG_CODEC_ADDR, reg); sdr_out32(base0, REG_CODEC_DATA, val); sdr_out32(base0, REG_CODEC_CTRL, 0x0e); @@ -57,8 +57,8 @@ void dev_mixer_write(u32_t *base, u32_t reg, u32_t val) { } /* Read the data from mixer register (### READ_MIXER_REG ###) */ -u32_t dev_mixer_read(u32_t *base, u32_t reg) { - u32_t i, data, base0 = base[0]; +uint32_t dev_mixer_read(uint32_t *base, uint32_t reg) { + uint32_t i, data, base0 = base[0]; sdr_in32(base0, REG_CODEC_SDA); sdr_out32(base0, REG_CODEC_ADDR, reg & 0xff); sdr_out32(base0, REG_CODEC_DATA, 0); @@ -86,8 +86,8 @@ u32_t dev_mixer_read(u32_t *base, u32_t reg) { /* Reset the device (### RESET_HARDWARE_CAN_FAIL ###) * -- Return OK means success, Others means failure */ -static int dev_reset(u32_t *base) { - u32_t data, base0 = base[0]; +static int dev_reset(uint32_t *base) { + uint32_t data, base0 = base[0]; data = sdr_in32(base0, REG_POWER_EXT); if (data & CMD_POWER_DOWN) sdr_out32(base0, REG_POWER_EXT, data & ~CMD_POWER_DOWN); @@ -109,8 +109,8 @@ static int dev_reset(u32_t *base) { } /* Configure hardware registers (### CONF_HARDWARE ###) */ -static void dev_configure(u32_t *base) { - u32_t i, data, base0 = base[0]; +static void dev_configure(uint32_t *base) { + uint32_t i, data, base0 = base[0]; sdr_out32(base0, REG_MASTER_CTRL, CMD_PORT_TIMING | CMD_AC97_MODE | CMD_MASTER_SERIAL); sdr_out32(base0, REG_CLK_CTRL, 0x10); @@ -127,13 +127,13 @@ static void dev_configure(u32_t *base) { } /* Initialize the mixer (### INIT_MIXER ###) */ -static void dev_init_mixer(u32_t *base) { +static void dev_init_mixer(uint32_t *base) { dev_mixer_write(base, 0, 0); } /* Set DAC and ADC sample rate (### SET_SAMPLE_RATE ###) */ -static void dev_set_sample_rate(u32_t *base, uint16_t sample_rate) { - u32_t i, data = 0, base0 = base[0]; +static void dev_set_sample_rate(uint32_t *base, uint16_t sample_rate) { + uint32_t i, data = 0, base0 = base[0]; for (i = 0; i < 6; i++) { if (g_sample_rate[i] == sample_rate) { data = i; @@ -145,9 +145,9 @@ static void dev_set_sample_rate(u32_t *base, uint16_t sample_rate) { } /* Set DAC and ADC format (### SET_FORMAT ###)*/ -static void dev_set_format(u32_t *base, u32_t bits, u32_t sign, - u32_t stereo, u32_t sample_count) { - u32_t base0 = base[0]; +static void dev_set_format(uint32_t *base, uint32_t bits, uint32_t sign, + uint32_t stereo, uint32_t sample_count) { + uint32_t base0 = base[0]; dmr_data = CMD_DMR_INIT; if (stereo == 0) dmr_data |= CMD_DMR_MONO; @@ -163,8 +163,8 @@ static void dev_set_format(u32_t *base, u32_t bits, u32_t sign, } /* Start the channel (### START_CHANNEL ###) */ -static void dev_start_channel(u32_t *base, int sub_dev) { - u32_t temp, base0 = base[0]; +static void dev_start_channel(uint32_t *base, int sub_dev) { + uint32_t temp, base0 = base[0]; dcr_data = 0x30001; if (sub_dev == DAC) @@ -194,8 +194,8 @@ static void dev_start_channel(u32_t *base, int sub_dev) { } /* Stop the channel (### STOP_CHANNEL ###) */ -static void dev_stop_channel(u32_t *base, int sub_dev) { - u32_t base0 = base[0]; +static void dev_stop_channel(uint32_t *base, int sub_dev) { + uint32_t base0 = base[0]; dmr_data &= ~(CMD_DMR_DMA | CMD_DMR_POLL); dcr_data |= ~CMD_DCR_MASK; fcr_data &= ~CMD_FCR_FEN; @@ -212,8 +212,8 @@ static void dev_stop_channel(u32_t *base, int sub_dev) { } /* Set DMA address and length (### SET_DMA ###) */ -static void dev_set_dma(u32_t *base, u32_t dma, u32_t len, int sub_dev) { - u32_t base0 = base[0]; +static void dev_set_dma(uint32_t *base, uint32_t dma, uint32_t len, int sub_dev) { + uint32_t base0 = base[0]; if (sub_dev == DAC) { sdr_out32(base0, REG_DAC_DMA_ADDR, dma); @@ -226,8 +226,8 @@ static void dev_set_dma(u32_t *base, u32_t dma, u32_t len, int sub_dev) { } /* Read current address (### READ_DMA_CURRENT_ADDR ###) */ -static u32_t dev_read_dma_current(u32_t *base, int sub_dev) { - u32_t data, base0 = base[0]; +static uint32_t dev_read_dma_current(uint32_t *base, int sub_dev) { + uint32_t data, base0 = base[0]; if (sub_dev == DAC) data = sdr_in32(base0, REG_DAC_DCC); else if (sub_dev == ADC) @@ -237,8 +237,8 @@ static u32_t dev_read_dma_current(u32_t *base, int sub_dev) { } /* Pause the DMA (### PAUSE_DMA ###) */ -static void dev_pause_dma(u32_t *base, int sub_dev) { - u32_t base0 = base[0]; +static void dev_pause_dma(uint32_t *base, int sub_dev) { + uint32_t base0 = base[0]; dcr_data |= CMD_DCR_MASK; fcr_data |= CMD_FCR_FEN; if (sub_dev == DAC) { @@ -254,8 +254,8 @@ static void dev_pause_dma(u32_t *base, int sub_dev) { } /* Resume the DMA (### RESUME_DMA ###) */ -static void dev_resume_dma(u32_t *base, int sub_dev) { - u32_t base0 = base[0]; +static void dev_resume_dma(uint32_t *base, int sub_dev) { + uint32_t base0 = base[0]; dcr_data &= ~CMD_DCR_MASK; fcr_data &= ~CMD_FCR_FEN; if (sub_dev == DAC) { @@ -272,8 +272,8 @@ static void dev_resume_dma(u32_t *base, int sub_dev) { /* Read and clear interrupt stats (### READ_CLEAR_INTR_STS ###) * -- Return interrupt status */ -static u32_t dev_read_clear_intr_status(u32_t *base) { - u32_t status, base0 = base[0]; +static uint32_t dev_read_clear_intr_status(uint32_t *base) { + uint32_t status, base0 = base[0]; status = sdr_in32(base0, REG_INTR_STS); sdr_in32(base0, REG_DAC_HDSR); sdr_in32(base0, REG_ADC_HDSR); @@ -282,8 +282,8 @@ static u32_t dev_read_clear_intr_status(u32_t *base) { } /* Enable or disable interrupt (### INTR_ENABLE_DISABLE ###) */ -static void dev_intr_enable(u32_t *base, int flag) { - u32_t data, base0 = base[0]; +static void dev_intr_enable(uint32_t *base, int flag) { + uint32_t data, base0 = base[0]; if (flag == INTR_ENABLE) { sdr_out32(base0, REG_INTR_CTRL, CMD_INTR_ENABLE); sdr_out32(base0, REG_INTR_MASK, ~(CMD_INTR_DMA | CMD_INTR_DMA0 | @@ -299,7 +299,7 @@ static void dev_intr_enable(u32_t *base, int flag) { /* Probe the device */ static int dev_probe(void) { int devind, i, ioflag; - u32_t device, bar, size, base; + uint32_t device, bar, size, base; uint16_t vid, did, temp; uint8_t *reg; @@ -330,7 +330,7 @@ static int dev_probe(void) { printf("SDR: Fail to map hardware registers from PCI\n"); return -EIO; } - dev.base[i] = (u32_t)reg; + dev.base[i] = (uint32_t)reg; } #else /* Get PCI BAR0-5 */ @@ -356,25 +356,25 @@ static int dev_probe(void) { } /* Set sample rate in configuration */ -static int set_sample_rate(u32_t rate, int num) { +static int set_sample_rate(uint32_t rate, int num) { aud_conf[num].sample_rate = rate; return OK; } /* Set stereo in configuration */ -static int set_stereo(u32_t stereo, int num) { +static int set_stereo(uint32_t stereo, int num) { aud_conf[num].stereo = stereo; return OK; } /* Set sample bits in configuration */ -static int set_bits(u32_t bits, int num) { +static int set_bits(uint32_t bits, int num) { aud_conf[num].nr_of_bits = bits; return OK; } /* Set fragment size in configuration */ -static int set_frag_size(u32_t frag_size, int num) { +static int set_frag_size(uint32_t frag_size, int num) { if (frag_size > (sub_dev[num].DmaSize / sub_dev[num].NrOfDmaFragments) || frag_size < sub_dev[num].MinFragmentSize) { return EINVAL; @@ -384,20 +384,20 @@ static int set_frag_size(u32_t frag_size, int num) { } /* Set frame sign in configuration */ -static int set_sign(u32_t val, int num) { +static int set_sign(uint32_t val, int num) { aud_conf[num].sign = val; return OK; } /* Get maximum fragment size */ -static int get_max_frag_size(u32_t *val, int *len, int num) { +static int get_max_frag_size(uint32_t *val, int *len, int num) { *len = sizeof(*val); *val = (sub_dev[num].DmaSize / sub_dev[num].NrOfDmaFragments); return OK; } /* Return 1 if there are free buffers */ -static int free_buf(u32_t *val, int *len, int num) { +static int free_buf(uint32_t *val, int *len, int num) { *len = sizeof(*val); if (sub_dev[num].BufLength == sub_dev[num].NrOfExtraBuffers) *val = 0; @@ -407,11 +407,11 @@ static int free_buf(u32_t *val, int *len, int num) { } /* Get the current sample counter */ -static int get_samples_in_buf(u32_t *result, int *len, int chan) { - u32_t res; +static int get_samples_in_buf(uint32_t *result, int *len, int chan) { + uint32_t res; /* READ_DMA_CURRENT_ADDR */ res = dev_read_dma_current(dev.base, chan); - *result = (u32_t)(sub_dev[chan].BufLength * 8192) + res; + *result = (uint32_t)(sub_dev[chan].BufLength * 8192) + res; return OK; } @@ -534,7 +534,7 @@ int drv_start(int sub_dev, int DmaMode) { /* ======= [Audio interface] Driver start ======= */ int drv_stop(int sub_dev) { - u32_t data; + uint32_t data; /* INTR_ENABLE_DISABLE */ dev_intr_enable(dev.base, INTR_DISABLE); @@ -558,19 +558,19 @@ int drv_io_ctl(unsigned long request, void *val, int *len, int sub_dev) { int status; switch (request) { case DSPIORATE: - status = set_sample_rate(*((u32_t *)val), sub_dev); + status = set_sample_rate(*((uint32_t *)val), sub_dev); break; case DSPIOSTEREO: - status = set_stereo(*((u32_t *)val), sub_dev); + status = set_stereo(*((uint32_t *)val), sub_dev); break; case DSPIOBITS: - status = set_bits(*((u32_t *)val), sub_dev); + status = set_bits(*((uint32_t *)val), sub_dev); break; case DSPIOSIZE: - status = set_frag_size(*((u32_t *)val), sub_dev); + status = set_frag_size(*((uint32_t *)val), sub_dev); break; case DSPIOSIGN: - status = set_sign(*((u32_t *)val), sub_dev); + status = set_sign(*((uint32_t *)val), sub_dev); break; case DSPIOMAX: status = get_max_frag_size(val, len, sub_dev); @@ -612,13 +612,13 @@ int drv_get_irq(char *irq) { } /* ======= [Audio interface] Get fragment size ======= */ -int drv_get_frag_size(u32_t *frag_size, int sub_dev) { +int drv_get_frag_size(uint32_t *frag_size, int sub_dev) { *frag_size = aud_conf[sub_dev].fragment_size; return OK; } /* ======= [Audio interface] Set DMA channel ======= */ -int drv_set_dma(u32_t dma, u32_t length, int chan) { +int drv_set_dma(uint32_t dma, uint32_t length, int chan) { #ifdef DMA_LENGTH_BY_FRAME length = length / (aud_conf[chan].nr_of_bits * (aud_conf[chan].stereo + 1) / 8); #endif @@ -629,7 +629,7 @@ int drv_set_dma(u32_t dma, u32_t length, int chan) { /* ======= [Audio interface] Get interrupt summary status ======= */ int drv_int_sum(void) { - u32_t status; + uint32_t status; /* ### READ_CLEAR_INTR_STS ### */ status = dev_read_clear_intr_status(dev.base); dev.intr_status = status; @@ -641,7 +641,7 @@ int drv_int_sum(void) { /* ======= [Audio interface] Handle interrupt status ======= */ int drv_int(int sub_dev) { - u32_t mask; + uint32_t mask; /* ### CHECK_INTR_DAC ### */ if (sub_dev == DAC) diff --git a/minix/drivers/audio/cs4281/cs4281.h b/minix/drivers/audio/cs4281/cs4281.h index 0fd04c49d..0139bfed2 100644 --- a/minix/drivers/audio/cs4281/cs4281.h +++ b/minix/drivers/audio/cs4281/cs4281.h @@ -106,19 +106,19 @@ #define CMD_DAC_FCR_INIT 0x01002000 #define CMD_ADC_FCR_INIT 0x0b0a2020 -static u32_t dcr_data, dmr_data, fcr_data; -static u32_t g_sample_rate[] = { +static uint32_t dcr_data, dmr_data, fcr_data; +static uint32_t g_sample_rate[] = { 48000, 44100, 22050, 16000, 11025, 8000 }; /* Driver Data Structure */ typedef struct aud_sub_dev_conf_t { - u32_t stereo; + uint32_t stereo; uint16_t sample_rate; - u32_t nr_of_bits; - u32_t sign; - u32_t busy; - u32_t fragment_size; + uint32_t nr_of_bits; + uint32_t sign; + uint32_t busy; + uint32_t fragment_size; uint8_t format; } aud_sub_dev_conf_t; @@ -126,14 +126,14 @@ typedef struct DEV_STRUCT { char *name; uint16_t vid; uint16_t did; - u32_t devind; - u32_t base[6]; + uint32_t devind; + uint32_t base[6]; char irq; char revision; - u32_t intr_status; + uint32_t intr_status; } DEV_STRUCT; -void dev_mixer_write(u32_t *base, u32_t reg, u32_t val); -u32_t dev_mixer_read(u32_t *base, u32_t reg); +void dev_mixer_write(uint32_t *base, uint32_t reg, uint32_t val); +uint32_t dev_mixer_read(uint32_t *base, uint32_t reg); #endif diff --git a/minix/drivers/audio/cs4281/io.h b/minix/drivers/audio/cs4281/io.h index d2a48ff9c..63f406d49 100644 --- a/minix/drivers/audio/cs4281/io.h +++ b/minix/drivers/audio/cs4281/io.h @@ -6,8 +6,8 @@ #include "cs4281.h" /* I/O function */ -static uint8_t my_inb(u32_t port) { - u32_t value; +static uint8_t my_inb(uint32_t port) { + uint32_t value; int r; #ifdef DMA_BASE_IOMAP value = *(volatile uint8_t *)(port); @@ -19,8 +19,8 @@ static uint8_t my_inb(u32_t port) { } #define sdr_in8(port, offset) (my_inb((port) + (offset))) -static uint16_t my_inw(u32_t port) { - u32_t value; +static uint16_t my_inw(uint32_t port) { + uint32_t value; int r; #ifdef DMA_BASE_IOMAP value = *(volatile uint16_t *)(port); @@ -32,11 +32,11 @@ static uint16_t my_inw(u32_t port) { } #define sdr_in16(port, offset) (my_inw((port) + (offset))) -static u32_t my_inl(u32_t port) { - u32_t value; +static uint32_t my_inl(uint32_t port) { + uint32_t value; int r; #ifdef DMA_BASE_IOMAP - value = *(volatile u32_t *)(port); + value = *(volatile uint32_t *)(port); #else if ((r = sys_inl(port, &value)) != OK) printf("SDR: sys_inl failed: %d\n", r); @@ -45,7 +45,7 @@ static u32_t my_inl(u32_t port) { } #define sdr_in32(port, offset) (my_inl((port) + (offset))) -static void my_outb(u32_t port, u32_t value) { +static void my_outb(uint32_t port, uint32_t value) { int r; #ifdef DMA_BASE_IOMAP *(volatile uint8_t *)(port) = value; @@ -57,7 +57,7 @@ static void my_outb(u32_t port, u32_t value) { #define sdr_out8(port, offset, value) \ (my_outb(((port) + (offset)), (value))) -static void my_outw(u32_t port, u32_t value) { +static void my_outw(uint32_t port, uint32_t value) { int r; #ifdef DMA_BASE_IOMAP *(volatile uint16_t *)(port) = value; @@ -69,10 +69,10 @@ static void my_outw(u32_t port, u32_t value) { #define sdr_out16(port, offset, value) \ (my_outw(((port) + (offset)), (value))) -static void my_outl(u32_t port, u32_t value) { +static void my_outl(uint32_t port, uint32_t value) { int r; #ifdef DMA_BASE_IOMAP - *(volatile u32_t *)(port) = value; + *(volatile uint32_t *)(port) = value; #else if ((r = sys_outl(port, value)) != OK) printf("SDR: sys_outl failed: %d\n", r); diff --git a/minix/drivers/audio/cs4281/mixer.c b/minix/drivers/audio/cs4281/mixer.c index a99b7061a..ac3490455 100644 --- a/minix/drivers/audio/cs4281/mixer.c +++ b/minix/drivers/audio/cs4281/mixer.c @@ -7,7 +7,7 @@ uint8_t mixer_value[] = { 0x7e, 0x3d, 0x01, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x01 }; -int get_set_volume(u32_t *base, struct volume_level *level, int flag) { +int get_set_volume(uint32_t *base, struct volume_level *level, int flag) { int max_level, cmd_left, cmd_right; max_level = 0x1f; @@ -76,7 +76,7 @@ int get_set_volume(u32_t *base, struct volume_level *level, int flag) { #endif #ifdef MIXER_SB16 -int get_set_volume(u32_t *base, struct volume_level *level, int flag) { +int get_set_volume(uint32_t *base, struct volume_level *level, int flag) { int max_level, shift, cmd_left, cmd_right; max_level = 0x0f; @@ -155,7 +155,7 @@ int get_set_volume(u32_t *base, struct volume_level *level, int flag) { #endif #ifdef MIXER_AC97 -int get_set_volume(u32_t *base, struct volume_level *level, int flag) { +int get_set_volume(uint32_t *base, struct volume_level *level, int flag) { int max_level, cmd, data; max_level = 0x1f; @@ -223,7 +223,7 @@ int get_set_volume(u32_t *base, struct volume_level *level, int flag) { #endif /* Set default mixer volume */ -void dev_set_default_volume(u32_t *base) { +void dev_set_default_volume(uint32_t *base) { int i; #ifdef MIXER_AK4531 for (i = 0; i <= 0x19; i++) diff --git a/minix/drivers/audio/cs4281/mixer.h b/minix/drivers/audio/cs4281/mixer.h index 8d042426b..7951f4631 100644 --- a/minix/drivers/audio/cs4281/mixer.h +++ b/minix/drivers/audio/cs4281/mixer.h @@ -56,7 +56,7 @@ #define AC97_RESET 0x00 #endif -int get_set_volume(u32_t *pbase, struct volume_level *level, int flag); -void dev_set_default_volume(u32_t *pbase); +int get_set_volume(uint32_t *pbase, struct volume_level *level, int flag); +void dev_set_default_volume(uint32_t *pbase); #endif diff --git a/minix/drivers/audio/es1370/es1370.c b/minix/drivers/audio/es1370/es1370.c index 76c2e3ad6..3a1ba0f1d 100644 --- a/minix/drivers/audio/es1370/es1370.c +++ b/minix/drivers/audio/es1370/es1370.c @@ -30,15 +30,15 @@ /* prototypes of private functions */ static int detect_hw(void); static int disable_int(int sub_dev); -static int set_stereo(u32_t stereo, int sub_dev); -static int set_bits(u32_t nr_of_bits, int sub_dev); -static int set_sample_rate(u32_t rate, int sub_dev); -static int set_sign(u32_t val, int sub_dev); -static int get_max_frag_size(u32_t * val, int *len, int sub_dev); -static int set_frag_size(u32_t fragment_size, int sub_dev); +static int set_stereo(uint32_t stereo, int sub_dev); +static int set_bits(uint32_t nr_of_bits, int sub_dev); +static int set_sample_rate(uint32_t rate, int sub_dev); +static int set_sign(uint32_t val, int sub_dev); +static int get_max_frag_size(uint32_t * val, int *len, int sub_dev); +static int set_frag_size(uint32_t fragment_size, int sub_dev); static int set_int_cnt(int sub_dev); -static int free_buf(u32_t *val, int *len, int sub_dev); -static int get_samples_in_buf(u32_t *val, int *len, int sub_dev); +static int free_buf(uint32_t *val, int *len, int sub_dev); +static int get_samples_in_buf(uint32_t *val, int *len, int sub_dev); static int get_set_volume(struct volume_level *level, int *len, int sub_dev, int flag); static int reset(int sub_dev); @@ -168,7 +168,7 @@ int drv_init_hw (void) { static int detect_hw(void) { - u32_t device; + uint32_t device; int devind; uint16_t v_id, d_id; @@ -224,7 +224,7 @@ int drv_reset() { int drv_start(int sub_dev, int UNUSED(DmaMode)) { - u32_t enable_bit, result = 0; + uint32_t enable_bit, result = 0; /* Write default values to device in case user failed to configure. If user did configure properly, everything is written twice. @@ -265,7 +265,7 @@ int drv_start(int sub_dev, int UNUSED(DmaMode)) { int drv_stop(int sub_dev) { - u32_t enable_bit; + uint32_t enable_bit; int status; switch(sub_dev) { @@ -292,15 +292,15 @@ int drv_io_ctl(unsigned long request, void * val, int * len, int sub_dev) { switch(request) { case DSPIORATE: - status = set_sample_rate(*((u32_t *) val), sub_dev); break; + status = set_sample_rate(*((uint32_t *) val), sub_dev); break; case DSPIOSTEREO: - status = set_stereo(*((u32_t *) val), sub_dev); break; + status = set_stereo(*((uint32_t *) val), sub_dev); break; case DSPIOBITS: - status = set_bits(*((u32_t *) val), sub_dev); break; + status = set_bits(*((uint32_t *) val), sub_dev); break; case DSPIOSIZE: - status = set_frag_size(*((u32_t *) val), sub_dev); break; + status = set_frag_size(*((uint32_t *) val), sub_dev); break; case DSPIOSIGN: - status = set_sign(*((u32_t *) val), sub_dev); break; + status = set_sign(*((uint32_t *) val), sub_dev); break; case DSPIOMAX: status = get_max_frag_size(val, len, sub_dev); break; case DSPIORESET: @@ -331,16 +331,16 @@ int drv_get_irq(char *irq) { } -int drv_get_frag_size(u32_t *frag_size, int sub_dev) { +int drv_get_frag_size(uint32_t *frag_size, int sub_dev) { *frag_size = aud_conf[sub_dev].fragment_size; return OK; } -int drv_set_dma(u32_t dma, u32_t length, int chan) { +int drv_set_dma(uint32_t dma, uint32_t length, int chan) { /* dma length in bytes, max is 64k long words for es1370 = 256k bytes */ - u32_t page, frame_count_reg, dma_add_reg; + uint32_t page, frame_count_reg, dma_add_reg; switch(chan) { case ADC1_CHAN: page = ADC_MEM_PAGE; @@ -368,7 +368,7 @@ int drv_set_dma(u32_t dma, u32_t length, int chan) { * addressable. * It expects length -1 */ - pci_outl(reg(frame_count_reg), (u32_t) (length - 1)); + pci_outl(reg(frame_count_reg), (uint32_t) (length - 1)); return OK; } @@ -381,8 +381,8 @@ int drv_int_sum(void) { int drv_int(int sub_dev) { - u32_t int_status; - u32_t bit; + uint32_t int_status; + uint32_t bit; /* return status of interrupt bit of specified channel*/ switch (sub_dev) { @@ -418,7 +418,7 @@ int drv_reenable_int(int chan) { int drv_pause(int sub_dev) { - u32_t pause_bit; + uint32_t pause_bit; disable_int(sub_dev); /* don't send interrupts */ @@ -437,7 +437,7 @@ int drv_pause(int sub_dev) { int drv_resume(int sub_dev) { - u32_t pause_bit = 0; + uint32_t pause_bit = 0; drv_reenable_int(sub_dev); /* enable interrupts */ @@ -455,7 +455,7 @@ int drv_resume(int sub_dev) { } -static int set_bits(u32_t nr_of_bits, int sub_dev) { +static int set_bits(uint32_t nr_of_bits, int sub_dev) { /* set format bits for specified channel. */ uint16_t size_16_bit, ser_interface; @@ -479,7 +479,7 @@ static int set_bits(u32_t nr_of_bits, int sub_dev) { } -static int set_stereo(u32_t stereo, int sub_dev) { +static int set_stereo(uint32_t stereo, int sub_dev) { /* set format bits for specified channel. */ uint16_t stereo_bit, ser_interface; @@ -501,12 +501,12 @@ static int set_stereo(u32_t stereo, int sub_dev) { } -static int set_sign(u32_t UNUSED(val), int UNUSED(sub_dev)) { +static int set_sign(uint32_t UNUSED(val), int UNUSED(sub_dev)) { return OK; } -static int set_frag_size(u32_t fragment_size, int sub_dev_nr) { +static int set_frag_size(uint32_t fragment_size, int sub_dev_nr) { if (fragment_size > (sub_dev[sub_dev_nr].DmaSize / sub_dev[sub_dev_nr].NrOfDmaFragments) || fragment_size < sub_dev[sub_dev_nr].MinFragmentSize) { @@ -518,9 +518,9 @@ static int set_frag_size(u32_t fragment_size, int sub_dev_nr) { } -static int set_sample_rate(u32_t rate, int sub_dev) { +static int set_sample_rate(uint32_t rate, int sub_dev) { /* currently only 44.1kHz */ - u32_t controlRegister; + uint32_t controlRegister; if (rate > MAX_RATE || rate < MIN_RATE) { return EINVAL; @@ -573,7 +573,7 @@ static int set_int_cnt(int chan) { } -static int get_max_frag_size(u32_t * val, int * len, int sub_dev_nr) { +static int get_max_frag_size(uint32_t * val, int * len, int sub_dev_nr) { *len = sizeof(*val); *val = (sub_dev[sub_dev_nr].DmaSize / sub_dev[sub_dev_nr].NrOfDmaFragments); @@ -597,7 +597,7 @@ static int disable_int(int chan) { } -static int get_samples_in_buf (u32_t *samples_in_buf, int *len, int chan) { +static int get_samples_in_buf (uint32_t *samples_in_buf, int *len, int chan) { uint16_t samp_ct_reg; uint16_t curr_samp_ct_reg; uint16_t curr_samp_ct; /* counts back from SAMP_CT till 0 */ @@ -621,7 +621,7 @@ static int get_samples_in_buf (u32_t *samples_in_buf, int *len, int chan) { (void) pci_inw(reg(samp_ct_reg)); curr_samp_ct = pci_inw(reg(curr_samp_ct_reg)); - *samples_in_buf = (u32_t) (sub_dev[chan].BufLength * 8192) + + *samples_in_buf = (uint32_t) (sub_dev[chan].BufLength * 8192) + curr_samp_ct; return OK; @@ -629,7 +629,7 @@ static int get_samples_in_buf (u32_t *samples_in_buf, int *len, int chan) { /* returns 1 if there are free buffers */ -static int free_buf (u32_t *val, int *len, int sub_dev_nr) { +static int free_buf (uint32_t *val, int *len, int sub_dev_nr) { *len = sizeof(*val); if (sub_dev[sub_dev_nr].BufLength == sub_dev[sub_dev_nr].NrOfExtraBuffers) { diff --git a/minix/drivers/audio/es1370/es1370.h b/minix/drivers/audio/es1370/es1370.h index 2bc4cea99..0af080dd6 100644 --- a/minix/drivers/audio/es1370/es1370.h +++ b/minix/drivers/audio/es1370/es1370.h @@ -92,12 +92,12 @@ typedef struct { - u32_t stereo; + uint32_t stereo; uint16_t sample_rate; - u32_t nr_of_bits; - u32_t sign; - u32_t busy; - u32_t fragment_size; + uint32_t nr_of_bits; + uint32_t sign; + uint32_t busy; + uint32_t fragment_size; } aud_sub_dev_conf_t; /* Some defaults for the aud_sub_dev_conf_t*/ @@ -113,9 +113,9 @@ typedef struct DEVSTRUCT { char* name; uint16_t v_id; /* vendor id */ uint16_t d_id; /* device id */ - u32_t devind; /* minix pci device id, for + uint32_t devind; /* minix pci device id, for * pci configuration space */ - u32_t base; /* changed to 32 bits */ + uint32_t base; /* changed to 32 bits */ char irq; char revision; /* version of the device */ } DEV_STRUCT; diff --git a/minix/drivers/audio/es1370/pci_helper.c b/minix/drivers/audio/es1370/pci_helper.c index 26b6bdfd1..e2e07ccef 100644 --- a/minix/drivers/audio/es1370/pci_helper.c +++ b/minix/drivers/audio/es1370/pci_helper.c @@ -14,8 +14,8 @@ /*===========================================================================* * helper functions for I/O * *===========================================================================*/ -u32_t pci_inb(uint16_t port) { - u32_t value; +uint32_t pci_inb(uint16_t port) { + uint32_t value; int s; if ((s=sys_inb(port, &value)) !=OK) printf("%s: warning, sys_inb failed: %d\n", DRIVER_NAME, s); @@ -23,8 +23,8 @@ u32_t pci_inb(uint16_t port) { } -u32_t pci_inw(uint16_t port) { - u32_t value; +uint32_t pci_inw(uint16_t port) { + uint32_t value; int s; if ((s=sys_inw(port, &value)) !=OK) printf("%s: warning, sys_inw failed: %d\n", DRIVER_NAME, s); @@ -32,8 +32,8 @@ u32_t pci_inw(uint16_t port) { } -u32_t pci_inl(uint16_t port) { - u32_t value; +uint32_t pci_inl(uint16_t port) { + uint32_t value; int s; if ((s=sys_inl(port, &value)) !=OK) printf("%s: warning, sys_inl failed: %d\n", DRIVER_NAME, s); @@ -55,7 +55,7 @@ void pci_outw(uint16_t port, uint16_t value) { } -void pci_outl(uint16_t port, u32_t value) { +void pci_outl(uint16_t port, uint32_t value) { int s; if ((s=sys_outl(port, value)) !=OK) printf("%s: warning, sys_outl failed: %d\n", DRIVER_NAME, s); diff --git a/minix/drivers/audio/es1370/pci_helper.h b/minix/drivers/audio/es1370/pci_helper.h index 54a745609..977335b59 100644 --- a/minix/drivers/audio/es1370/pci_helper.h +++ b/minix/drivers/audio/es1370/pci_helper.h @@ -7,6 +7,6 @@ unsigned pci_inl(uint16_t port); void pci_outb(uint16_t port, uint8_t value); void pci_outw(uint16_t port, uint16_t value); -void pci_outl(uint16_t port, u32_t value); +void pci_outl(uint16_t port, uint32_t value); #endif diff --git a/minix/drivers/audio/es1371/AC97.c b/minix/drivers/audio/es1371/AC97.c index 7c3ae5a92..14fbb4113 100644 --- a/minix/drivers/audio/es1371/AC97.c +++ b/minix/drivers/audio/es1371/AC97.c @@ -51,7 +51,7 @@ static int AC97_set_volume(const struct volume_level *level); if you change this ! */ #define SRC_UNSYNCED 0xffffffffUL -static u32_t SrcSyncState = 0x00010000UL; +static uint32_t SrcSyncState = 0x00010000UL; static DEV_STRUCT *dev; @@ -61,7 +61,7 @@ static void set_src_sync_state (int state) if (state < 0) SrcSyncState = SRC_UNSYNCED; else { - SrcSyncState = (u32_t)state << 16; + SrcSyncState = (uint32_t)state << 16; SrcSyncState &= 0x00070000Ul; } } @@ -70,7 +70,7 @@ static void set_src_sync_state (int state) static int AC97_write (const DEV_STRUCT * pCC, uint16_t wAddr, uint16_t wData) { -u32_t dtemp, i; +uint32_t dtemp, i; uint16_t wBaseAddr = pCC->base; /* wait for WIP bit (Write In Progress) to go away */ @@ -106,7 +106,7 @@ uint16_t wBaseAddr = pCC->base; /* A test for 5880 - prime the PCI data bus */ { - u32_t dat = ((u32_t) wAddr << 16) | wData; + uint32_t dat = ((uint32_t) wAddr << 16) | wData; char page = pci_inb(wBaseAddr + MEM_PAGE); pci_outl (wBaseAddr + MEM_PAGE, dat); @@ -135,7 +135,7 @@ uint16_t wBaseAddr = pCC->base; #if 0 static int AC97_read (const DEV_STRUCT * pCC, uint16_t wAddr, uint16_t *data) { -u32_t dtemp, i; +uint32_t dtemp, i; uint16_t base = pCC->base; /* wait for WIP to go away */ @@ -169,7 +169,7 @@ uint16_t base = pCC->base; /* A test for 5880 - prime the PCI data bus */ { /* set bit 23, this means read in stead of write. */ - u32_t dat = ((u32_t) wAddr << 16) | (1UL << 23); + uint32_t dat = ((uint32_t) wAddr << 16) | (1UL << 23); char page = pci_inb(base + MEM_PAGE); /* todo: why are we putting data in the mem page register??? */ @@ -215,7 +215,7 @@ static int AC97_write_unsynced (const DEV_STRUCT * pCC, uint16_t wAddr, return (AC97_ERR_WIP_TIMEOUT); /* write addr and data */ - pci_outl(pCC->base + CODEC_READ, ((u32_t) wAddr << 16) | wData); + pci_outl(pCC->base + CODEC_READ, ((uint32_t) wAddr << 16) | wData); return 0; } @@ -223,14 +223,14 @@ static int AC97_write_unsynced (const DEV_STRUCT * pCC, uint16_t wAddr, static int AC97_read_unsynced (const DEV_STRUCT * pCC, uint16_t wAddr, uint16_t *data) { -u32_t dtemp; +uint32_t dtemp; /* wait for WIP to go away */ if (WaitBitd (pCC->base + CODEC_READ, 30, 0, WIP_TIMEOUT)) return (AC97_ERR_WIP_TIMEOUT); /* write addr w/data=0 and assert read request */ - pci_outl(pCC->base + CODEC_READ, ((u32_t) wAddr << 16) | (1UL << 23)); + pci_outl(pCC->base + CODEC_READ, ((uint32_t) wAddr << 16) | (1UL << 23)); /* now wait for the stinkin' data (RDY) */ if (WaitBitd (pCC->base + CODEC_READ, 31, 1, DRDY_TIMEOUT)) diff --git a/minix/drivers/audio/es1371/SRC.c b/minix/drivers/audio/es1371/SRC.c index 98c0ef058..76e19908f 100644 --- a/minix/drivers/audio/es1371/SRC.c +++ b/minix/drivers/audio/es1371/SRC.c @@ -6,7 +6,7 @@ int SRCInit ( DEV_STRUCT * DSP ) { - u32_t i; + uint32_t i; int retVal; /* Clear all SRC RAM then init - keep SRC disabled until done */ @@ -57,7 +57,7 @@ int SRCInit ( DEV_STRUCT * DSP ) int SRCRegRead(DEV_STRUCT * DSP, uint16_t reg, uint16_t *data) { - u32_t dtemp; + uint32_t dtemp; /* wait for ready */ if (WaitBitd (reg(CONC_dSRCIO_OFF), SRC_BUSY_BIT, 0, 1000)) @@ -67,7 +67,7 @@ int SRCRegRead(DEV_STRUCT * DSP, uint16_t reg, uint16_t *data) /* assert a read request */ pci_outl(reg(CONC_dSRCIO_OFF), - (dtemp & SRC_CTLMASK) | ((u32_t) reg << 25)); + (dtemp & SRC_CTLMASK) | ((uint32_t) reg << 25)); /* now wait for the data */ if (WaitBitd (reg(CONC_dSRCIO_OFF), SRC_BUSY_BIT, 0, 1000)) @@ -82,7 +82,7 @@ int SRCRegRead(DEV_STRUCT * DSP, uint16_t reg, uint16_t *data) int SRCRegWrite(DEV_STRUCT * DSP, uint16_t reg, uint16_t val) { - u32_t dtemp; + uint32_t dtemp; /* wait for ready */ @@ -93,7 +93,7 @@ int SRCRegWrite(DEV_STRUCT * DSP, uint16_t reg, uint16_t val) /* assert the write request */ pci_outl(reg(CONC_dSRCIO_OFF), - (dtemp & SRC_CTLMASK) | SRC_WENABLE | ((u32_t) reg << 25) | val); + (dtemp & SRC_CTLMASK) | SRC_WENABLE | ((uint32_t) reg << 25) | val); return 0; } @@ -101,7 +101,7 @@ int SRCRegWrite(DEV_STRUCT * DSP, uint16_t reg, uint16_t val) void SRCSetRate(DEV_STRUCT * DSP, char base, uint16_t rate) { - u32_t freq, dtemp, i; + uint32_t freq, dtemp, i; uint16_t N, truncM, truncStart, wtemp; @@ -118,7 +118,7 @@ void SRCSetRate(DEV_STRUCT * DSP, char base, uint16_t rate) /* calculate new frequency and write it - preserve accum */ /* please don't try to understand. */ - freq = ((u32_t) rate << 16) / 3000U; + freq = ((uint32_t) rate << 16) / 3000U; SRCRegRead(DSP, base + SRC_INT_REGS_OFF, &wtemp); SRCRegWrite(DSP, base + SRC_INT_REGS_OFF, diff --git a/minix/drivers/audio/es1371/codec.c b/minix/drivers/audio/es1371/codec.c index 9fafb9a07..7fb1f3567 100644 --- a/minix/drivers/audio/es1371/codec.c +++ b/minix/drivers/audio/es1371/codec.c @@ -12,7 +12,7 @@ if you change this ! */ #define SRC_UNSYNCED 0xffffffffUL -static u32_t SrcSyncState = 0x00010000UL; +static uint32_t SrcSyncState = 0x00010000UL; void CodecSetSrcSyncState (int state) @@ -20,7 +20,7 @@ void CodecSetSrcSyncState (int state) if (state < 0) SrcSyncState = SRC_UNSYNCED; else { - SrcSyncState = (u32_t)state << 16; + SrcSyncState = (uint32_t)state << 16; SrcSyncState &= 0x00070000Ul; } } @@ -28,7 +28,7 @@ void CodecSetSrcSyncState (int state) int CodecWrite (DEV_STRUCT * pCC, uint16_t wAddr, uint16_t wData) { -u32_t dtemp, i; +uint32_t dtemp, i; uint16_t wBaseAddr = pCC->base; /* wait for WIP bit (Write In Progress) to go away */ @@ -64,7 +64,7 @@ uint16_t wBaseAddr = pCC->base; /* A test for 5880 - prime the PCI data bus */ { - u32_t dat = ((u32_t) wAddr << 16) | wData; + uint32_t dat = ((uint32_t) wAddr << 16) | wData; char page = pci_inb(wBaseAddr + CONC_bMEMPAGE_OFF); pci_outl (wBaseAddr + CONC_bMEMPAGE_OFF, dat); @@ -91,7 +91,7 @@ uint16_t wBaseAddr = pCC->base; int CodecRead (DEV_STRUCT * pCC, uint16_t wAddr, uint16_t *data) { -u32_t dtemp, i; +uint32_t dtemp, i; uint16_t base = pCC->base; /* wait for WIP to go away */ @@ -125,7 +125,7 @@ uint16_t base = pCC->base; /* A test for 5880 - prime the PCI data bus */ { /* set bit 23, this means read in stead of write. */ - u32_t dat = ((u32_t) wAddr << 16) | (1UL << 23); + uint32_t dat = ((uint32_t) wAddr << 16) | (1UL << 23); char page = pci_inb(base + CONC_bMEMPAGE_OFF); /* todo: why are we putting data in the mem page register??? */ @@ -169,21 +169,21 @@ int CodecWriteUnsynced (DEV_STRUCT * pCC, uint16_t wAddr, uint16_t wData) return (CODEC_ERR_WIP_TIMEOUT); /* write addr and data */ - pci_outl(pCC->base + CONC_dCODECCTL_OFF, ((u32_t) wAddr << 16) | wData); + pci_outl(pCC->base + CONC_dCODECCTL_OFF, ((uint32_t) wAddr << 16) | wData); return 0; } int CodecReadUnsynced (DEV_STRUCT * pCC, uint16_t wAddr, uint16_t *data) { -u32_t dtemp; +uint32_t dtemp; /* wait for WIP to go away */ if (WaitBitd (pCC->base + CONC_dCODECCTL_OFF, 30, 0, WIP_TIMEOUT)) return (CODEC_ERR_WIP_TIMEOUT); /* write addr w/data=0 and assert read request */ - pci_outl(pCC->base + CONC_dCODECCTL_OFF, ((u32_t) wAddr << 16) | (1UL << 23)); + pci_outl(pCC->base + CONC_dCODECCTL_OFF, ((uint32_t) wAddr << 16) | (1UL << 23)); /* now wait for the stinkin' data (RDY) */ if (WaitBitd (pCC->base + CONC_dCODECCTL_OFF, 31, 1, DRDY_TIMEOUT)) diff --git a/minix/drivers/audio/es1371/es1371.c b/minix/drivers/audio/es1371/es1371.c index ca5f3c655..c0ebe04bb 100644 --- a/minix/drivers/audio/es1371/es1371.c +++ b/minix/drivers/audio/es1371/es1371.c @@ -36,15 +36,15 @@ /* prototypes of private functions */ static int detect_hw(void); static int disable_int(int sub_dev); -static int set_stereo(u32_t stereo, int sub_dev); -static int set_bits(u32_t nr_of_bits, int sub_dev); -static int set_sample_rate(u32_t rate, int sub_dev); -static int set_sign(u32_t val, int sub_dev); -static int get_max_frag_size(u32_t * val, int *len, int sub_dev); -static int set_frag_size(u32_t fragment_size, int sub_dev); +static int set_stereo(uint32_t stereo, int sub_dev); +static int set_bits(uint32_t nr_of_bits, int sub_dev); +static int set_sample_rate(uint32_t rate, int sub_dev); +static int set_sign(uint32_t val, int sub_dev); +static int get_max_frag_size(uint32_t * val, int *len, int sub_dev); +static int set_frag_size(uint32_t fragment_size, int sub_dev); static int set_int_cnt(int sub_dev); -static int free_buf(u32_t *val, int *len, int sub_dev); -static int get_samples_in_buf(u32_t *val, int *len, int sub_dev); +static int free_buf(uint32_t *val, int *len, int sub_dev); +static int get_samples_in_buf(uint32_t *val, int *len, int sub_dev); static int get_set_volume(struct volume_level *level, int *len, int sub_dev, int flag); static int reset(int sub_dev); @@ -170,7 +170,7 @@ int drv_init_hw (void) { static int detect_hw(void) { - u32_t device; + uint32_t device; int devind; uint16_t v_id, d_id; @@ -226,7 +226,7 @@ int drv_reset() { int drv_start(int sub_dev, int UNUSED(DmaMode)) { - u32_t enable_bit, result = 0; + uint32_t enable_bit, result = 0; /* Write default values to device in case user failed to configure. If user did configure properly, everything is written twice. @@ -267,7 +267,7 @@ int drv_start(int sub_dev, int UNUSED(DmaMode)) { int drv_stop(int sub_dev) { - u32_t enable_bit; + uint32_t enable_bit; switch(sub_dev) { case ADC1_CHAN: enable_bit = ADC1_EN;break; @@ -293,15 +293,15 @@ int drv_io_ctl(unsigned long request, void * val, int * len, int sub_dev) { switch(request) { case DSPIORATE: - status = set_sample_rate(*((u32_t *) val), sub_dev); break; + status = set_sample_rate(*((uint32_t *) val), sub_dev); break; case DSPIOSTEREO: - status = set_stereo(*((u32_t *) val), sub_dev); break; + status = set_stereo(*((uint32_t *) val), sub_dev); break; case DSPIOBITS: - status = set_bits(*((u32_t *) val), sub_dev); break; + status = set_bits(*((uint32_t *) val), sub_dev); break; case DSPIOSIZE: - status = set_frag_size(*((u32_t *) val), sub_dev); break; + status = set_frag_size(*((uint32_t *) val), sub_dev); break; case DSPIOSIGN: - status = set_sign(*((u32_t *) val), sub_dev); break; + status = set_sign(*((uint32_t *) val), sub_dev); break; case DSPIOMAX: status = get_max_frag_size(val, len, sub_dev); break; case DSPIORESET: @@ -332,16 +332,16 @@ int drv_get_irq(char *irq) { } -int drv_get_frag_size(u32_t *frag_size, int sub_dev) { +int drv_get_frag_size(uint32_t *frag_size, int sub_dev) { *frag_size = aud_conf[sub_dev].fragment_size; return OK; } -int drv_set_dma(u32_t dma, u32_t length, int chan) { +int drv_set_dma(uint32_t dma, uint32_t length, int chan) { /* dma length in bytes, max is 64k long words for es1371 = 256k bytes */ - u32_t page, frame_count_reg, dma_add_reg; + uint32_t page, frame_count_reg, dma_add_reg; switch(chan) { case ADC1_CHAN: page = ADC_MEM_PAGE; @@ -369,7 +369,7 @@ int drv_set_dma(u32_t dma, u32_t length, int chan) { * addressable. * It expects length -1 */ - pci_outl(reg(frame_count_reg), (u32_t) (length - 1)); + pci_outl(reg(frame_count_reg), (uint32_t) (length - 1)); return OK; } @@ -382,8 +382,8 @@ int drv_int_sum(void) { int drv_int(int sub_dev) { - u32_t int_status; - u32_t bit; + uint32_t int_status; + uint32_t bit; /* return status of interrupt bit of specified channel*/ switch (sub_dev) { @@ -419,7 +419,7 @@ int drv_reenable_int(int chan) { int drv_pause(int sub_dev) { - u32_t pause_bit; + uint32_t pause_bit; disable_int(sub_dev); /* don't send interrupts */ @@ -438,7 +438,7 @@ int drv_pause(int sub_dev) { int drv_resume(int sub_dev) { - u32_t pause_bit = 0; + uint32_t pause_bit = 0; drv_reenable_int(sub_dev); /* enable interrupts */ @@ -456,7 +456,7 @@ int drv_resume(int sub_dev) { } -static int set_bits(u32_t nr_of_bits, int sub_dev) { +static int set_bits(uint32_t nr_of_bits, int sub_dev) { /* set format bits for specified channel. */ uint16_t size_16_bit, ser_interface; @@ -480,7 +480,7 @@ static int set_bits(u32_t nr_of_bits, int sub_dev) { } -static int set_stereo(u32_t stereo, int sub_dev) { +static int set_stereo(uint32_t stereo, int sub_dev) { /* set format bits for specified channel. */ uint16_t stereo_bit, ser_interface; @@ -502,12 +502,12 @@ static int set_stereo(u32_t stereo, int sub_dev) { } -static int set_sign(u32_t UNUSED(val), int UNUSED(sub_dev)) { +static int set_sign(uint32_t UNUSED(val), int UNUSED(sub_dev)) { return OK; } -static int set_frag_size(u32_t fragment_size, int sub_dev_nr) { +static int set_frag_size(uint32_t fragment_size, int sub_dev_nr) { if (fragment_size > (sub_dev[sub_dev_nr].DmaSize / sub_dev[sub_dev_nr].NrOfDmaFragments) || fragment_size < sub_dev[sub_dev_nr].MinFragmentSize) { @@ -519,8 +519,8 @@ static int set_frag_size(u32_t fragment_size, int sub_dev_nr) { } -static int set_sample_rate(u32_t rate, int sub_dev) { - u32_t src_base_reg; +static int set_sample_rate(uint32_t rate, int sub_dev) { + uint32_t src_base_reg; if (rate > MAX_RATE || rate < MIN_RATE) { return EINVAL; @@ -575,7 +575,7 @@ static int set_int_cnt(int chan) { } -static int get_max_frag_size(u32_t * val, int * len, int sub_dev_nr) { +static int get_max_frag_size(uint32_t * val, int * len, int sub_dev_nr) { *len = sizeof(*val); *val = (sub_dev[sub_dev_nr].DmaSize / sub_dev[sub_dev_nr].NrOfDmaFragments); @@ -599,7 +599,7 @@ static int disable_int(int chan) { } -static int get_samples_in_buf (u32_t *samples_in_buf, int *len, int chan) { +static int get_samples_in_buf (uint32_t *samples_in_buf, int *len, int chan) { uint16_t samp_ct_reg; uint16_t curr_samp_ct_reg; uint16_t curr_samp_ct; /* counts back from SAMP_CT till 0 */ @@ -623,7 +623,7 @@ static int get_samples_in_buf (u32_t *samples_in_buf, int *len, int chan) { (void) pci_inw(reg(samp_ct_reg)); curr_samp_ct = pci_inw(reg(curr_samp_ct_reg)); - *samples_in_buf = (u32_t) (sub_dev[chan].BufLength * 8192) + + *samples_in_buf = (uint32_t) (sub_dev[chan].BufLength * 8192) + curr_samp_ct; return OK; @@ -631,7 +631,7 @@ static int get_samples_in_buf (u32_t *samples_in_buf, int *len, int chan) { /* returns 1 if there are free buffers */ -static int free_buf (u32_t *val, int *len, int sub_dev_nr) { +static int free_buf (uint32_t *val, int *len, int sub_dev_nr) { *len = sizeof(*val); if (sub_dev[sub_dev_nr].BufLength == sub_dev[sub_dev_nr].NrOfExtraBuffers) { diff --git a/minix/drivers/audio/es1371/es1371.h b/minix/drivers/audio/es1371/es1371.h index 452ef8a43..d853ed9b3 100644 --- a/minix/drivers/audio/es1371/es1371.h +++ b/minix/drivers/audio/es1371/es1371.h @@ -94,12 +94,12 @@ typedef struct { - u32_t stereo; + uint32_t stereo; uint16_t sample_rate; - u32_t nr_of_bits; - u32_t sign; - u32_t busy; - u32_t fragment_size; + uint32_t nr_of_bits; + uint32_t sign; + uint32_t busy; + uint32_t fragment_size; } aud_sub_dev_conf_t; /* Some defaults for the aud_sub_dev_conf_t*/ @@ -115,9 +115,9 @@ typedef struct DEVSTRUCT { char* name; uint16_t v_id; /* vendor id */ uint16_t d_id; /* device id */ - u32_t devind; /* minix pci device id, for + uint32_t devind; /* minix pci device id, for * pci configuration space */ - u32_t base; /* changed to 32 bits */ + uint32_t base; /* changed to 32 bits */ char irq; char revision; /* version of the device */ } DEV_STRUCT; diff --git a/minix/drivers/audio/es1371/pci_helper.c b/minix/drivers/audio/es1371/pci_helper.c index 76b058471..9713c795c 100644 --- a/minix/drivers/audio/es1371/pci_helper.c +++ b/minix/drivers/audio/es1371/pci_helper.c @@ -14,8 +14,8 @@ /*===========================================================================* * helper functions for I/O * *===========================================================================*/ -u32_t pci_inb(uint16_t port) { - u32_t value; +uint32_t pci_inb(uint16_t port) { + uint32_t value; int s; if ((s=sys_inb(port, &value)) !=OK) printf("%s: warning, sys_inb failed: %d\n", DRIVER_NAME, s); @@ -23,8 +23,8 @@ u32_t pci_inb(uint16_t port) { } -u32_t pci_inw(uint16_t port) { - u32_t value; +uint32_t pci_inw(uint16_t port) { + uint32_t value; int s; if ((s=sys_inw(port, &value)) !=OK) printf("%s: warning, sys_inw failed: %d\n", DRIVER_NAME, s); @@ -32,8 +32,8 @@ u32_t pci_inw(uint16_t port) { } -u32_t pci_inl(uint16_t port) { - u32_t value; +uint32_t pci_inl(uint16_t port) { + uint32_t value; int s; if ((s=sys_inl(port, &value)) !=OK) printf("%s: warning, sys_inl failed: %d\n", DRIVER_NAME, s); @@ -55,7 +55,7 @@ void pci_outw(uint16_t port, uint16_t value) { } -void pci_outl(uint16_t port, u32_t value) { +void pci_outl(uint16_t port, uint32_t value) { int s; if ((s=sys_outl(port, value)) !=OK) printf("%s: warning, sys_outl failed: %d\n", DRIVER_NAME, s); diff --git a/minix/drivers/audio/es1371/pci_helper.h b/minix/drivers/audio/es1371/pci_helper.h index 54a745609..977335b59 100644 --- a/minix/drivers/audio/es1371/pci_helper.h +++ b/minix/drivers/audio/es1371/pci_helper.h @@ -7,6 +7,6 @@ unsigned pci_inl(uint16_t port); void pci_outb(uint16_t port, uint8_t value); void pci_outw(uint16_t port, uint16_t value); -void pci_outl(uint16_t port, u32_t value); +void pci_outl(uint16_t port, uint32_t value); #endif diff --git a/minix/drivers/audio/es1371/sample_rate_converter.c b/minix/drivers/audio/es1371/sample_rate_converter.c index c9f8c7b89..aca24b1d7 100644 --- a/minix/drivers/audio/es1371/sample_rate_converter.c +++ b/minix/drivers/audio/es1371/sample_rate_converter.c @@ -40,7 +40,7 @@ static int src_reg_write(const DEV_STRUCT * DSP, uint16_t reg, uint16_t val); int src_init ( DEV_STRUCT * DSP ) { - u32_t i; + uint32_t i; int retVal; /* Clear all SRC RAM then init - keep SRC disabled until done */ @@ -104,7 +104,7 @@ int src_init ( DEV_STRUCT * DSP ) { static int src_reg_read(const DEV_STRUCT * DSP, uint16_t reg, uint16_t *data) { - u32_t dtemp; + uint32_t dtemp; /* wait for ready */ if (WaitBitd (reg(SAMPLE_RATE_CONV), SRC_BUSY_BIT, 0, 1000)) @@ -114,9 +114,9 @@ static int src_reg_read(const DEV_STRUCT * DSP, uint16_t reg, uint16_t *data) { /* assert a read request */ /*pci_outl(reg(SAMPLE_RATE_CONV), - (dtemp & SRC_CTLMASK) | ((u32_t) reg << 25));*/ + (dtemp & SRC_CTLMASK) | ((uint32_t) reg << 25));*/ pci_outl(reg(SAMPLE_RATE_CONV), (dtemp & - (DIS_REC|DIS_P2|DIS_P1|SRC_DISABLE)) | ((u32_t) reg << 25)); + (DIS_REC|DIS_P2|DIS_P1|SRC_DISABLE)) | ((uint32_t) reg << 25)); /* now wait for the data */ if (WaitBitd (reg(SAMPLE_RATE_CONV), SRC_BUSY_BIT, 0, 1000)) @@ -130,7 +130,7 @@ static int src_reg_read(const DEV_STRUCT * DSP, uint16_t reg, uint16_t *data) { static int src_reg_write(const DEV_STRUCT * DSP, uint16_t reg, uint16_t val) { - u32_t dtemp; + uint32_t dtemp; /* wait for ready */ if (WaitBitd (reg(SAMPLE_RATE_CONV), SRC_BUSY_BIT, 0, 1000)) @@ -140,14 +140,14 @@ static int src_reg_write(const DEV_STRUCT * DSP, uint16_t reg, uint16_t val) { /* assert the write request */ pci_outl(reg(SAMPLE_RATE_CONV), - (dtemp & SRC_CTLMASK) | SRC_RAM_WE | ((u32_t) reg << 25) | val); + (dtemp & SRC_CTLMASK) | SRC_RAM_WE | ((uint32_t) reg << 25) | val); return 0; } void src_set_rate(const DEV_STRUCT * DSP, char base, uint16_t rate) { - u32_t freq, dtemp, i; + uint32_t freq, dtemp, i; uint16_t N, truncM, truncStart, wtemp; @@ -164,7 +164,7 @@ void src_set_rate(const DEV_STRUCT * DSP, char base, uint16_t rate) { /* calculate new frequency and write it - preserve accum */ /* please don't try to understand. */ - freq = ((u32_t) rate << 16) / 3000U; + freq = ((uint32_t) rate << 16) / 3000U; src_reg_read(DSP, base + SRC_INT_REGS_OFF, &wtemp); src_reg_write(DSP, base + SRC_INT_REGS_OFF, diff --git a/minix/drivers/audio/sb16/sb16.c b/minix/drivers/audio/sb16/sb16.c index 7ab7606b4..d1da05a88 100644 --- a/minix/drivers/audio/sb16/sb16.c +++ b/minix/drivers/audio/sb16/sb16.c @@ -19,7 +19,7 @@ static int dsp_set_speed(unsigned int speed); static int dsp_set_stereo(unsigned int stereo); static int dsp_set_bits(unsigned int bits); static int dsp_set_sign(unsigned int sign); -static int dsp_get_max_frag_size(u32_t *val, int *len); +static int dsp_get_max_frag_size(uint32_t *val, int *len); static unsigned int DspStereo = DEFAULT_STEREO; @@ -190,7 +190,7 @@ int drv_stop(int sub_dev) { -int drv_set_dma(u32_t dma, u32_t UNUSED(length), int UNUSED(chan)) { +int drv_set_dma(uint32_t dma, uint32_t UNUSED(length), int UNUSED(chan)) { Dprint(("drv_set_dma():\n")); DmaPhys = dma; return OK; @@ -255,7 +255,7 @@ int drv_get_irq(char *irq) { -int drv_get_frag_size(u32_t *frag_size, int UNUSED(sub_dev)) { +int drv_get_frag_size(uint32_t *frag_size, int UNUSED(sub_dev)) { Dprint(("drv_get_frag_size():\n")); *frag_size = DspFragmentSize; return OK; @@ -267,11 +267,11 @@ static int dsp_ioctl(unsigned long request, void *val, int *len) { int status; switch(request) { - case DSPIORATE: status = dsp_set_speed(*((u32_t*) val)); break; - case DSPIOSTEREO: status = dsp_set_stereo(*((u32_t*) val)); break; - case DSPIOBITS: status = dsp_set_bits(*((u32_t*) val)); break; - case DSPIOSIZE: status = dsp_set_size(*((u32_t*) val)); break; - case DSPIOSIGN: status = dsp_set_sign(*((u32_t*) val)); break; + case DSPIORATE: status = dsp_set_speed(*((uint32_t*) val)); break; + case DSPIOSTEREO: status = dsp_set_stereo(*((uint32_t*) val)); break; + case DSPIOBITS: status = dsp_set_bits(*((uint32_t*) val)); break; + case DSPIOSIZE: status = dsp_set_size(*((uint32_t*) val)); break; + case DSPIOSIGN: status = dsp_set_sign(*((uint32_t*) val)); break; case DSPIOMAX: status = dsp_get_max_frag_size(val, len); break; case DSPIORESET: status = drv_reset(); break; default: status = ENOTTY; break; @@ -405,7 +405,7 @@ static int dsp_set_sign(unsigned int sign) { -static int dsp_get_max_frag_size(u32_t *val, int *len) { +static int dsp_get_max_frag_size(uint32_t *val, int *len) { *len = sizeof(*val); *val = sub_dev[AUDIO].DmaSize / sub_dev[AUDIO].NrOfDmaFragments; return OK; @@ -431,7 +431,7 @@ int dsp_command(int value) { int sb16_inb(int port) { int s; - u32_t value; + uint32_t value; if ((s=sys_inb(port, &value)) != OK) panic("sys_inb() failed: %d", s); diff --git a/minix/drivers/audio/trident/io.h b/minix/drivers/audio/trident/io.h index 1a6c67efe..a6b7bf1a9 100644 --- a/minix/drivers/audio/trident/io.h +++ b/minix/drivers/audio/trident/io.h @@ -6,8 +6,8 @@ #include "trident.h" /* I/O function */ -static uint8_t my_inb(u32_t port) { - u32_t value; +static uint8_t my_inb(uint32_t port) { + uint32_t value; int r; #ifdef DMA_BASE_IOMAP value = *(volatile uint8_t *)(port); @@ -19,8 +19,8 @@ static uint8_t my_inb(u32_t port) { } #define sdr_in8(port, offset) (my_inb((port) + (offset))) -static uint16_t my_inw(u32_t port) { - u32_t value; +static uint16_t my_inw(uint32_t port) { + uint32_t value; int r; #ifdef DMA_BASE_IOMAP value = *(volatile uint16_t *)(port); @@ -32,11 +32,11 @@ static uint16_t my_inw(u32_t port) { } #define sdr_in16(port, offset) (my_inw((port) + (offset))) -static u32_t my_inl(u32_t port) { - u32_t value; +static uint32_t my_inl(uint32_t port) { + uint32_t value; int r; #ifdef DMA_BASE_IOMAP - value = *(volatile u32_t *)(port); + value = *(volatile uint32_t *)(port); #else if ((r = sys_inl(port, &value)) != OK) printf("SDR: sys_inl failed: %d\n", r); @@ -45,7 +45,7 @@ static u32_t my_inl(u32_t port) { } #define sdr_in32(port, offset) (my_inl((port) + (offset))) -static void my_outb(u32_t port, u32_t value) { +static void my_outb(uint32_t port, uint32_t value) { int r; #ifdef DMA_BASE_IOMAP *(volatile uint8_t *)(port) = value; @@ -57,7 +57,7 @@ static void my_outb(u32_t port, u32_t value) { #define sdr_out8(port, offset, value) \ (my_outb(((port) + (offset)), (value))) -static void my_outw(u32_t port, u32_t value) { +static void my_outw(uint32_t port, uint32_t value) { int r; #ifdef DMA_BASE_IOMAP *(volatile uint16_t *)(port) = value; @@ -69,10 +69,10 @@ static void my_outw(u32_t port, u32_t value) { #define sdr_out16(port, offset, value) \ (my_outw(((port) + (offset)), (value))) -static void my_outl(u32_t port, u32_t value) { +static void my_outl(uint32_t port, uint32_t value) { int r; #ifdef DMA_BASE_IOMAP - *(volatile u32_t *)(port) = value; + *(volatile uint32_t *)(port) = value; #else if ((r = sys_outl(port, value)) != OK) printf("SDR: sys_outl failed: %d\n", r); diff --git a/minix/drivers/audio/trident/mixer.c b/minix/drivers/audio/trident/mixer.c index a99b7061a..ac3490455 100644 --- a/minix/drivers/audio/trident/mixer.c +++ b/minix/drivers/audio/trident/mixer.c @@ -7,7 +7,7 @@ uint8_t mixer_value[] = { 0x7e, 0x3d, 0x01, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x01 }; -int get_set_volume(u32_t *base, struct volume_level *level, int flag) { +int get_set_volume(uint32_t *base, struct volume_level *level, int flag) { int max_level, cmd_left, cmd_right; max_level = 0x1f; @@ -76,7 +76,7 @@ int get_set_volume(u32_t *base, struct volume_level *level, int flag) { #endif #ifdef MIXER_SB16 -int get_set_volume(u32_t *base, struct volume_level *level, int flag) { +int get_set_volume(uint32_t *base, struct volume_level *level, int flag) { int max_level, shift, cmd_left, cmd_right; max_level = 0x0f; @@ -155,7 +155,7 @@ int get_set_volume(u32_t *base, struct volume_level *level, int flag) { #endif #ifdef MIXER_AC97 -int get_set_volume(u32_t *base, struct volume_level *level, int flag) { +int get_set_volume(uint32_t *base, struct volume_level *level, int flag) { int max_level, cmd, data; max_level = 0x1f; @@ -223,7 +223,7 @@ int get_set_volume(u32_t *base, struct volume_level *level, int flag) { #endif /* Set default mixer volume */ -void dev_set_default_volume(u32_t *base) { +void dev_set_default_volume(uint32_t *base) { int i; #ifdef MIXER_AK4531 for (i = 0; i <= 0x19; i++) diff --git a/minix/drivers/audio/trident/mixer.h b/minix/drivers/audio/trident/mixer.h index 06cdd44fa..48118c698 100644 --- a/minix/drivers/audio/trident/mixer.h +++ b/minix/drivers/audio/trident/mixer.h @@ -56,7 +56,7 @@ #define AC97_RESET 0x00 #endif -int get_set_volume(u32_t *pbase, struct volume_level *level, int flag); -void dev_set_default_volume(u32_t *pbase); +int get_set_volume(uint32_t *pbase, struct volume_level *level, int flag); +void dev_set_default_volume(uint32_t *pbase); #endif diff --git a/minix/drivers/audio/trident/trident.c b/minix/drivers/audio/trident/trident.c index 0a1dce2d1..92e5c5eab 100644 --- a/minix/drivers/audio/trident/trident.c +++ b/minix/drivers/audio/trident/trident.c @@ -10,35 +10,35 @@ drv_t drv; /* internal function */ static int dev_probe(void); -static int set_sample_rate(u32_t rate, int num); -static int set_stereo(u32_t stereo, int num); -static int set_bits(u32_t bits, int sub_dev); -static int set_frag_size(u32_t frag_size, int num); -static int set_sign(u32_t val, int num); -static int get_frag_size(u32_t *val, int *len, int num); -static int free_buf(u32_t *val, int *len, int num); +static int set_sample_rate(uint32_t rate, int num); +static int set_stereo(uint32_t stereo, int num); +static int set_bits(uint32_t bits, int sub_dev); +static int set_frag_size(uint32_t frag_size, int num); +static int set_sign(uint32_t val, int num); +static int get_frag_size(uint32_t *val, int *len, int num); +static int free_buf(uint32_t *val, int *len, int num); /* developer interface */ -static int dev_reset(u32_t *base); -static void dev_configure(u32_t *base); -static void dev_init_mixer(u32_t *base); -static void dev_set_sample_rate(u32_t *base, uint16_t sample_rate); -static void dev_set_format(u32_t *base, u32_t bits, u32_t sign, - u32_t stereo, u32_t sample_count); -static void dev_start_channel(u32_t *base, int sub_dev); -static void dev_stop_channel(u32_t *base, int sub_dev); -static void dev_set_dma(u32_t *base, u32_t dma, u32_t len, int sub_dev); -static u32_t dev_read_dma_current(u32_t *base, int sub_dev); -static void dev_pause_dma(u32_t *base, int sub_dev); -static void dev_resume_dma(u32_t *base, int sub_dev); -static void dev_intr_other(u32_t *base, u32_t status); -static u32_t dev_read_clear_intr_status(u32_t *base); -static void dev_intr_enable(u32_t *base, int flag); +static int dev_reset(uint32_t *base); +static void dev_configure(uint32_t *base); +static void dev_init_mixer(uint32_t *base); +static void dev_set_sample_rate(uint32_t *base, uint16_t sample_rate); +static void dev_set_format(uint32_t *base, uint32_t bits, uint32_t sign, + uint32_t stereo, uint32_t sample_count); +static void dev_start_channel(uint32_t *base, int sub_dev); +static void dev_stop_channel(uint32_t *base, int sub_dev); +static void dev_set_dma(uint32_t *base, uint32_t dma, uint32_t len, int sub_dev); +static uint32_t dev_read_dma_current(uint32_t *base, int sub_dev); +static void dev_pause_dma(uint32_t *base, int sub_dev); +static void dev_resume_dma(uint32_t *base, int sub_dev); +static void dev_intr_other(uint32_t *base, uint32_t status); +static uint32_t dev_read_clear_intr_status(uint32_t *base); +static void dev_intr_enable(uint32_t *base, int flag); /* ======= Developer implemented function ======= */ /* ====== Self-defined function ====== */ -static void dev_write_chan_reg(u32_t base) { - u32_t reg[5], i, data; +static void dev_write_chan_reg(uint32_t base) { + uint32_t reg[5], i, data; reg[0] = (my_chan.cso << 16) | (my_chan.alpha << 4) | my_chan.fms; reg[1] = my_chan.dma; reg[2] = (my_chan.eso << 16) | my_chan.delta; @@ -51,8 +51,8 @@ static void dev_write_chan_reg(u32_t base) { /* ====== Mixer handling interface ======*/ /* Write the data to mixer register (### WRITE_MIXER_REG ###) */ -void dev_mixer_write(u32_t *base, u32_t reg, u32_t val) { - u32_t i, data, base0 = base[0]; +void dev_mixer_write(uint32_t *base, uint32_t reg, uint32_t val) { + uint32_t i, data, base0 = base[0]; for (i = 0; i < 50000; i++) { data = sdr_in16(base0, REG_CODEC_WRITE); if (!(data & STS_CODEC_BUSY)) @@ -65,8 +65,8 @@ void dev_mixer_write(u32_t *base, u32_t reg, u32_t val) { } /* Read the data from mixer register (### READ_MIXER_REG ###) */ -u32_t dev_mixer_read(u32_t *base, u32_t reg) { - u32_t i, data, base0 = base[0]; +uint32_t dev_mixer_read(uint32_t *base, uint32_t reg) { + uint32_t i, data, base0 = base[0]; data = (reg & 0x00ff) | STS_CODEC_BUSY; sdr_out32(base0, REG_CODEC_READ, data); for (i = 0; i < 50000; i++) { @@ -83,34 +83,34 @@ u32_t dev_mixer_read(u32_t *base, u32_t reg) { /* Reset the device (### RESET_HARDWARE_CAN_FAIL ###) * -- Return OK means success, Others means failure */ -static int dev_reset(u32_t *base) { - u32_t base0 = base[0]; +static int dev_reset(uint32_t *base) { + uint32_t base0 = base[0]; sdr_out32(base0, REG_CODEC_CTRL, 0x000a); return OK; } /* Configure hardware registers (### CONF_HARDWARE ###) */ -static void dev_configure(u32_t *base) { - u32_t base0 = base[0]; +static void dev_configure(uint32_t *base) { + uint32_t base0 = base[0]; sdr_out32(base0, REG_GCTRL, 0x3000); } /* Initialize the mixer (### INIT_MIXER ###) */ -static void dev_init_mixer(u32_t *base) { +static void dev_init_mixer(uint32_t *base) { dev_mixer_write(base, 0, 0); } /* Set DAC and ADC sample rate (### SET_SAMPLE_RATE ###) */ -static void dev_set_sample_rate(u32_t *base, uint16_t sample_rate) { - u32_t base0 = base[0]; +static void dev_set_sample_rate(uint32_t *base, uint16_t sample_rate) { + uint32_t base0 = base[0]; my_chan.delta = (sample_rate << 12) / 48000; sdr_out16(base0, REG_SB_DELTA, (48000 << 12) / sample_rate); } /* Set DAC and ADC format (### SET_FORMAT ###)*/ -static void dev_set_format(u32_t *base, u32_t bits, u32_t sign, - u32_t stereo, u32_t sample_count) { - u32_t data = 0, base0 = base[0]; +static void dev_set_format(uint32_t *base, uint32_t bits, uint32_t sign, + uint32_t stereo, uint32_t sample_count) { + uint32_t data = 0, base0 = base[0]; if (bits == 16) data |= CMD_FORMAT_BIT16; if (sign == 1) @@ -128,8 +128,8 @@ static void dev_set_format(u32_t *base, u32_t bits, u32_t sign, } /* Start the channel (### START_CHANNEL ###) */ -static void dev_start_channel(u32_t *base, int sub_dev) { - u32_t data, base0 = base[0]; +static void dev_start_channel(uint32_t *base, int sub_dev) { + uint32_t data, base0 = base[0]; if (sub_dev == DAC) { my_chan.fmc = 3; my_chan.fms = 0; my_chan.ec = 0; my_chan.alpha = 0; my_chan.cso = 0; @@ -147,8 +147,8 @@ static void dev_start_channel(u32_t *base, int sub_dev) { } /* Stop the channel (### STOP_CHANNEL ###) */ -static void dev_stop_channel(u32_t *base, int sub_dev) { - u32_t data, base0 = base[0]; +static void dev_stop_channel(uint32_t *base, int sub_dev) { + uint32_t data, base0 = base[0]; if (sub_dev == DAC) sdr_out32(base0, REG_STOP_A, 1); else if (sub_dev == ADC) @@ -156,8 +156,8 @@ static void dev_stop_channel(u32_t *base, int sub_dev) { } /* Set DMA address and length (### SET_DMA ###) */ -static void dev_set_dma(u32_t *base, u32_t dma, u32_t len, int sub_dev) { - u32_t data, base0 = base[0]; +static void dev_set_dma(uint32_t *base, uint32_t dma, uint32_t len, int sub_dev) { + uint32_t data, base0 = base[0]; my_chan.dma = dma; my_chan.eso = len - 1; if (sub_dev == ADC) { @@ -170,8 +170,8 @@ static void dev_set_dma(u32_t *base, u32_t dma, u32_t len, int sub_dev) { } /* Read current address (### READ_DMA_CURRENT_ADDR ###) */ -static u32_t dev_read_dma_current(u32_t *base, int sub_dev) { - u32_t data, base0 = base[0]; +static uint32_t dev_read_dma_current(uint32_t *base, int sub_dev) { + uint32_t data, base0 = base[0]; sdr_out8(base0, REG_GCTRL, 0); if (sub_dev == DAC) data = sdr_in16(base0, REG_CHAN_BASE + 0x02); @@ -182,8 +182,8 @@ static u32_t dev_read_dma_current(u32_t *base, int sub_dev) { } /* Pause the DMA (### PAUSE_DMA ###) */ -static void dev_pause_dma(u32_t *base, int sub_dev) { - u32_t data, base0 = base[0]; +static void dev_pause_dma(uint32_t *base, int sub_dev) { + uint32_t data, base0 = base[0]; if (sub_dev == DAC) sdr_out32(base0, REG_STOP_A, 1); else if (sub_dev == ADC) { @@ -193,8 +193,8 @@ static void dev_pause_dma(u32_t *base, int sub_dev) { } /* Resume the DMA (### RESUME_DMA ###) */ -static void dev_resume_dma(u32_t *base, int sub_dev) { - u32_t data, base0 = base[0]; +static void dev_resume_dma(uint32_t *base, int sub_dev) { + uint32_t data, base0 = base[0]; if (sub_dev == DAC) { data = sdr_in32(base0, REG_START_A); sdr_out32(base0, REG_START_A, data | 0x01); @@ -207,8 +207,8 @@ static void dev_resume_dma(u32_t *base, int sub_dev) { /* Read and clear interrupt stats (### READ_CLEAR_INTR_STS ###) * -- Return interrupt status */ -static u32_t dev_read_clear_intr_status(u32_t *base) { - u32_t status, base0 = base[0]; +static uint32_t dev_read_clear_intr_status(uint32_t *base) { + uint32_t status, base0 = base[0]; status = sdr_in32(base0, REG_INTR_STS); if (status & INTR_STS_ADC) { sdr_in8(base0, 0x1e); @@ -218,8 +218,8 @@ static u32_t dev_read_clear_intr_status(u32_t *base) { } /* Enable or disable interrupt (### INTR_ENABLE_DISABLE ###) */ -static void dev_intr_enable(u32_t *base, int flag) { - u32_t data, base0 = base[0]; +static void dev_intr_enable(uint32_t *base, int flag) { + uint32_t data, base0 = base[0]; data = sdr_in32(base0, REG_INTR_CTRL_A); data &= 0xfffe; if (flag == INTR_ENABLE) @@ -232,7 +232,7 @@ static void dev_intr_enable(u32_t *base, int flag) { /* Probe the device */ static int dev_probe(void) { int devind, i, ioflag; - u32_t device, bar, size, base; + uint32_t device, bar, size, base; uint16_t vid, did, temp; uint8_t *reg; @@ -263,7 +263,7 @@ static int dev_probe(void) { printf("SDR: Fail to map hardware registers from PCI\n"); return -EIO; } - dev.base[i] = (u32_t)reg; + dev.base[i] = (uint32_t)reg; } #else /* Get PCI BAR0-5 */ @@ -289,25 +289,25 @@ static int dev_probe(void) { } /* Set sample rate in configuration */ -static int set_sample_rate(u32_t rate, int num) { +static int set_sample_rate(uint32_t rate, int num) { aud_conf[num].sample_rate = rate; return OK; } /* Set stereo in configuration */ -static int set_stereo(u32_t stereo, int num) { +static int set_stereo(uint32_t stereo, int num) { aud_conf[num].stereo = stereo; return OK; } /* Set sample bits in configuration */ -static int set_bits(u32_t bits, int num) { +static int set_bits(uint32_t bits, int num) { aud_conf[num].nr_of_bits = bits; return OK; } /* Set fragment size in configuration */ -static int set_frag_size(u32_t frag_size, int num) { +static int set_frag_size(uint32_t frag_size, int num) { if (frag_size > (sub_dev[num].DmaSize / sub_dev[num].NrOfDmaFragments) || frag_size < sub_dev[num].MinFragmentSize) { return EINVAL; @@ -317,20 +317,20 @@ static int set_frag_size(u32_t frag_size, int num) { } /* Set frame sign in configuration */ -static int set_sign(u32_t val, int num) { +static int set_sign(uint32_t val, int num) { aud_conf[num].sign = val; return OK; } /* Get maximum fragment size */ -static int get_max_frag_size(u32_t *val, int *len, int num) { +static int get_max_frag_size(uint32_t *val, int *len, int num) { *len = sizeof(*val); *val = (sub_dev[num].DmaSize / sub_dev[num].NrOfDmaFragments); return OK; } /* Return 1 if there are free buffers */ -static int free_buf(u32_t *val, int *len, int num) { +static int free_buf(uint32_t *val, int *len, int num) { *len = sizeof(*val); if (sub_dev[num].BufLength == sub_dev[num].NrOfExtraBuffers) *val = 0; @@ -340,11 +340,11 @@ static int free_buf(u32_t *val, int *len, int num) { } /* Get the current sample counter */ -static int get_samples_in_buf(u32_t *result, int *len, int chan) { - u32_t res; +static int get_samples_in_buf(uint32_t *result, int *len, int chan) { + uint32_t res; /* READ_DMA_CURRENT_ADDR */ res = dev_read_dma_current(dev.base, chan); - *result = (u32_t)(sub_dev[chan].BufLength * 8192) + res; + *result = (uint32_t)(sub_dev[chan].BufLength * 8192) + res; return OK; } @@ -467,7 +467,7 @@ int drv_start(int sub_dev, int DmaMode) { /* ======= [Audio interface] Driver start ======= */ int drv_stop(int sub_dev) { - u32_t data; + uint32_t data; /* INTR_ENABLE_DISABLE */ dev_intr_enable(dev.base, INTR_DISABLE); @@ -491,19 +491,19 @@ int drv_io_ctl(unsigned long request, void *val, int *len, int sub_dev) { int status; switch (request) { case DSPIORATE: - status = set_sample_rate(*((u32_t *)val), sub_dev); + status = set_sample_rate(*((uint32_t *)val), sub_dev); break; case DSPIOSTEREO: - status = set_stereo(*((u32_t *)val), sub_dev); + status = set_stereo(*((uint32_t *)val), sub_dev); break; case DSPIOBITS: - status = set_bits(*((u32_t *)val), sub_dev); + status = set_bits(*((uint32_t *)val), sub_dev); break; case DSPIOSIZE: - status = set_frag_size(*((u32_t *)val), sub_dev); + status = set_frag_size(*((uint32_t *)val), sub_dev); break; case DSPIOSIGN: - status = set_sign(*((u32_t *)val), sub_dev); + status = set_sign(*((uint32_t *)val), sub_dev); break; case DSPIOMAX: status = get_max_frag_size(val, len, sub_dev); @@ -545,13 +545,13 @@ int drv_get_irq(char *irq) { } /* ======= [Audio interface] Get fragment size ======= */ -int drv_get_frag_size(u32_t *frag_size, int sub_dev) { +int drv_get_frag_size(uint32_t *frag_size, int sub_dev) { *frag_size = aud_conf[sub_dev].fragment_size; return OK; } /* ======= [Audio interface] Set DMA channel ======= */ -int drv_set_dma(u32_t dma, u32_t length, int chan) { +int drv_set_dma(uint32_t dma, uint32_t length, int chan) { #ifdef DMA_LENGTH_BY_FRAME length = length / (aud_conf[chan].nr_of_bits * (aud_conf[chan].stereo + 1) / 8); #endif @@ -562,7 +562,7 @@ int drv_set_dma(u32_t dma, u32_t length, int chan) { /* ======= [Audio interface] Get interrupt summary status ======= */ int drv_int_sum(void) { - u32_t status; + uint32_t status; /* ### READ_CLEAR_INTR_STS ### */ status = dev_read_clear_intr_status(dev.base); dev.intr_status = status; @@ -574,7 +574,7 @@ int drv_int_sum(void) { /* ======= [Audio interface] Handle interrupt status ======= */ int drv_int(int sub_dev) { - u32_t mask; + uint32_t mask; /* ### CHECK_INTR_DAC ### */ if (sub_dev == DAC) diff --git a/minix/drivers/audio/trident/trident.h b/minix/drivers/audio/trident/trident.h index b8f4f7b49..3c89c3696 100644 --- a/minix/drivers/audio/trident/trident.h +++ b/minix/drivers/audio/trident/trident.h @@ -69,20 +69,20 @@ #define CMD_FORMAT_STEREO 0x04 typedef struct channel_info { - u32_t cso, alpha, fms, fmc, ec; - u32_t dma, eso, delta, bufhalf, index; - u32_t rvol, cvol, gvsel, pan, vol, ctrl; + uint32_t cso, alpha, fms, fmc, ec; + uint32_t dma, eso, delta, bufhalf, index; + uint32_t rvol, cvol, gvsel, pan, vol, ctrl; } channel_info; static channel_info my_chan; /* Driver Data Structure */ typedef struct aud_sub_dev_conf_t { - u32_t stereo; + uint32_t stereo; uint16_t sample_rate; - u32_t nr_of_bits; - u32_t sign; - u32_t busy; - u32_t fragment_size; + uint32_t nr_of_bits; + uint32_t sign; + uint32_t busy; + uint32_t fragment_size; uint8_t format; } aud_sub_dev_conf_t; @@ -90,14 +90,14 @@ typedef struct DEV_STRUCT { char *name; uint16_t vid; uint16_t did; - u32_t devind; - u32_t base[6]; + uint32_t devind; + uint32_t base[6]; char irq; char revision; - u32_t intr_status; + uint32_t intr_status; } DEV_STRUCT; -void dev_mixer_write(u32_t *base, u32_t reg, u32_t val); -u32_t dev_mixer_read(u32_t *base, u32_t reg); +void dev_mixer_write(uint32_t *base, uint32_t reg, uint32_t val); +uint32_t dev_mixer_read(uint32_t *base, uint32_t reg); #endif diff --git a/minix/drivers/bus/i2c/arch/earm/omap_i2c.c b/minix/drivers/bus/i2c/arch/earm/omap_i2c.c index cc571c509..5f6e2b966 100644 --- a/minix/drivers/bus/i2c/arch/earm/omap_i2c.c +++ b/minix/drivers/bus/i2c/arch/earm/omap_i2c.c @@ -394,7 +394,7 @@ static void omap_i2c_padconf(int i2c_bus_id) { int r; - u32_t pinopts; + uint32_t pinopts; if (omap_i2c_bus->bus_type == AM335X_I2C_BUS) { diff --git a/minix/drivers/bus/i2c/i2c.c b/minix/drivers/bus/i2c/i2c.c index 3714d8a42..a804603bb 100644 --- a/minix/drivers/bus/i2c/i2c.c +++ b/minix/drivers/bus/i2c/i2c.c @@ -368,7 +368,7 @@ static void ds_event(void) { char key[DS_MAX_KEYLEN]; - u32_t value; + uint32_t value; int type; endpoint_t owner_endpoint; int r; diff --git a/minix/drivers/bus/pci/main.c b/minix/drivers/bus/pci/main.c index eedd97dd4..250795bf0 100644 --- a/minix/drivers/bus/pci/main.c +++ b/minix/drivers/bus/pci/main.c @@ -393,7 +393,7 @@ static void do_attr_r32(message *mp) { int r, devind, port; - u32_t v; + uint32_t v; devind= mp->m2_i1; port= mp->m2_i2; @@ -459,7 +459,7 @@ static void do_attr_w32(message *mp) { int r, devind, port; - u32_t v; + uint32_t v; devind= mp->m2_i1; port= mp->m2_i2; @@ -479,7 +479,7 @@ static void do_get_bar(message *mp) { int r, devind, port, ioflag; - u32_t base, size; + uint32_t base, size; devind= mp->m_lsys_pci_busc_get_bar.devind; port= mp->m_lsys_pci_busc_get_bar.port; diff --git a/minix/drivers/bus/pci/pci.c b/minix/drivers/bus/pci/pci.c index 9d8c8ffa0..f90e225e6 100644 --- a/minix/drivers/bus/pci/pci.c +++ b/minix/drivers/bus/pci/pci.c @@ -50,10 +50,10 @@ static struct pcibus int pb_busnr; uint8_t (*pb_rreg8)(int busind, int devind, int port); uint16_t (*pb_rreg16)(int busind, int devind, int port); - u32_t (*pb_rreg32)(int busind, int devind, int port); + uint32_t (*pb_rreg32)(int busind, int devind, int port); void (*pb_wreg8)(int busind, int devind, int port, uint8_t value); void (*pb_wreg16)(int busind, int devind, int port, uint16_t value); - void (*pb_wreg32)(int busind, int devind, int port, u32_t value); + void (*pb_wreg32)(int busind, int devind, int port, uint32_t value); uint16_t (*pb_rsts)(int busind); void (*pb_wsts)(int busind, uint16_t value); } pcibus[NR_PCIBUS]; @@ -80,8 +80,8 @@ static struct pcidev { int pb_flags; int pb_nr; - u32_t pb_base; - u32_t pb_size; + uint32_t pb_base; + uint32_t pb_size; } pd_bar[BAM_NR]; int pd_bar_nr; } pcidev[NR_PCIDEV]; @@ -99,7 +99,7 @@ static struct machine machine; *===========================================================================*/ static unsigned pci_inb(uint16_t port) { - u32_t value; + uint32_t value; int s; if ((s=sys_inb(port, &value)) !=OK) printf("PCI: warning, sys_inb failed: %d\n", s); @@ -108,7 +108,7 @@ pci_inb(uint16_t port) { static unsigned pci_inw(uint16_t port) { - u32_t value; + uint32_t value; int s; if ((s=sys_inw(port, &value)) !=OK) printf("PCI: warning, sys_inw failed: %d\n", s); @@ -117,7 +117,7 @@ pci_inw(uint16_t port) { static unsigned pci_inl(uint16_t port) { - u32_t value; + uint32_t value; int s; if ((s=sys_inl(port, &value)) !=OK) printf("PCI: warning, sys_inl failed: %d\n", s); @@ -139,7 +139,7 @@ pci_outw(uint16_t port, uint16_t value) { } static void -pci_outl(uint16_t port, u32_t value) { +pci_outl(uint16_t port, uint32_t value) { int s; if ((s=sys_outl(port, value)) !=OK) printf("PCI: warning, sys_outl failed: %d\n", s); @@ -185,10 +185,10 @@ pcii_rreg16(int busind, int devind, int port) return v; } -static u32_t +static uint32_t pcii_rreg32(int busind, int devind, int port) { - u32_t v; + uint32_t v; int s; v= PCII_RREG32_(pcibus[busind].pb_busnr, @@ -240,7 +240,7 @@ pcii_wreg16(int busind, int devind, int port, uint16_t value) } static void -pcii_wreg32(int busind, int devind, int port, u32_t value) +pcii_wreg32(int busind, int devind, int port, uint32_t value) { int s; #if 0 @@ -332,7 +332,7 @@ __pci_attr_r16(int devind, int port) return pcibus[busind].pb_rreg16(busind, devind, port); } -static u32_t +static uint32_t __pci_attr_r32(int devind, int port) { int busnr, busind; @@ -363,7 +363,7 @@ __pci_attr_w16(int devind, int port, uint16_t value) } static void -__pci_attr_w32(int devind, int port, u32_t value) +__pci_attr_w32(int devind, int port, uint32_t value) { int busnr, busind; @@ -465,7 +465,7 @@ pci_vid_name(uint16_t vid) static void print_hyper_cap(int devind, uint8_t capptr) { - u32_t v; + uint32_t v; uint16_t cmd; int type0, type1; @@ -580,7 +580,7 @@ print_capabilities(int devind) * ISA Bridge Helpers * *===========================================================================*/ static void -update_bridge4dev_io(int devind, u32_t io_base, u32_t io_size) +update_bridge4dev_io(int devind, uint32_t io_base, uint32_t io_size) { int busnr, busind, type, br_devind; uint16_t v16; @@ -617,7 +617,7 @@ static int do_piix(int devind) { int i, s, irqrc, irq; - u32_t elcr1, elcr2, elcr; + uint32_t elcr1, elcr2, elcr; #if DEBUG printf("in piix\n"); @@ -789,7 +789,7 @@ do_isabridge(int busind) { int i, j, r, type, busnr, unknown_bridge, bridge_dev; uint16_t vid, did; - u32_t t3; + uint32_t t3; const char *dstr; unknown_bridge= -1; @@ -1009,7 +1009,7 @@ static int record_bar(int devind, int bar_nr, int last) { int reg, prefetch, type, dev_bar_nr, width; - u32_t bar, bar2; + uint32_t bar, bar2; uint16_t cmd; /* Start by assuming that this is a 32-bit bar, taking up one DWORD. */ @@ -1221,7 +1221,7 @@ record_bars_normal(int devind) static void record_bars_bridge(int devind) { - u32_t base, limit, size; + uint32_t base, limit, size; /* The generic BAR area of PCI-to-PCI bridges is two DWORDs in size. * It may contain up to two 32-bit BARs, or one 64-bit BAR. @@ -1270,7 +1270,7 @@ record_bars_bridge(int devind) static void record_bars_cardbus(int devind) { - u32_t base, limit, size; + uint32_t base, limit, size; /* The generic BAR area of CardBus devices is one DWORD in size. */ record_bars(devind, PCI_BAR); @@ -1320,7 +1320,7 @@ static void complete_bars(void) { int i, j, bar_nr, reg; - u32_t memgap_low, memgap_high, iogap_low, iogap_high, io_high, + uint32_t memgap_low, memgap_high, iogap_low, iogap_high, io_high, base, size, v32, diff1, diff2; kinfo_t kinfo; @@ -1437,7 +1437,7 @@ complete_bars(void) if (size < PAGE_SIZE) size= PAGE_SIZE; base= memgap_high-size; - base &= ~(u32_t)(size-1); + base &= ~(uint32_t)(size-1); if (base < memgap_low) panic("memory base too low: %d", base); memgap_high= base; @@ -1466,7 +1466,7 @@ complete_bars(void) continue; size= pcidev[i].pd_bar[j].pb_size; base= iogap_high-size; - base &= ~(u32_t)(size-1); + base &= ~(uint32_t)(size-1); /* Assume that ISA compatibility is required. Only * use the lowest 256 bytes out of every 1024 bytes. @@ -1786,7 +1786,7 @@ do_pcibridge(int busind) int ind, type; uint16_t vid, did; uint8_t sbusn, baseclass, subclass, infclass, headt; - u32_t t3; + uint32_t t3; vid= did= 0; /* lint */ busnr= pcibus[busind].pb_busnr; @@ -1927,7 +1927,7 @@ pci_intel_init(void) * Two times the value 0xffff suggests a system without a (compatible) * PCI controller. */ - u32_t bus, dev, func; + uint32_t bus, dev, func; uint16_t vid, did; int s, i, r, busind, busnr; const char *dstr; @@ -2040,7 +2040,7 @@ visible(struct rs_pci *aclp, int devind) { uint16_t acl_sub_vid, acl_sub_did; int i; - u32_t class_id; + uint32_t class_id; if (!aclp) return TRUE; /* Should be changed when ACLs become @@ -2441,7 +2441,7 @@ _pci_dev_name(uint16_t vid, uint16_t did) * _pci_get_bar * *===========================================================================*/ int -_pci_get_bar(int devind, int port, u32_t *base, u32_t *size, +_pci_get_bar(int devind, int port, uint32_t *base, uint32_t *size, int *ioflag) { int i, reg; @@ -2502,7 +2502,7 @@ _pci_attr_r16(int devind, int port, uint16_t *vp) * _pci_attr_r32 * *===========================================================================*/ int -_pci_attr_r32(int devind, int port, u32_t *vp) +_pci_attr_r32(int devind, int port, uint32_t *vp) { if (devind < 0 || devind >= nr_pcidev) return EINVAL; @@ -2547,7 +2547,7 @@ _pci_attr_w16(int devind, int port, uint16_t value) * _pci_attr_w32 * *===========================================================================*/ int -_pci_attr_w32(int devind, int port, u32_t value) +_pci_attr_w32(int devind, int port, uint32_t value) { if (devind < 0 || devind >= nr_pcidev) return EINVAL; diff --git a/minix/drivers/bus/pci/pci.h b/minix/drivers/bus/pci/pci.h index 2adc98be2..0da3883ac 100644 --- a/minix/drivers/bus/pci/pci.h +++ b/minix/drivers/bus/pci/pci.h @@ -53,7 +53,7 @@ void _pci_rescan_bus(uint8_t busnr); const char *_pci_dev_name(uint16_t vid, uint16_t did); -int _pci_get_bar(int devind, int port, u32_t *base, u32_t *size, int +int _pci_get_bar(int devind, int port, uint32_t *base, uint32_t *size, int *ioflag); int _pci_slot_name(int devind, char **cpp); int _pci_ids(int devind, uint16_t *vidp, uint16_t *didp); @@ -61,12 +61,12 @@ int _pci_ids(int devind, uint16_t *vidp, uint16_t *didp); /* PCI Config Read functions */ int _pci_attr_r8(int devind, int port, uint8_t *vp); int _pci_attr_r16(int devind, int port, uint16_t *vp); -int _pci_attr_r32(int devind, int port, u32_t *vp); +int _pci_attr_r32(int devind, int port, uint32_t *vp); /* PCI Config Write functions */ int _pci_attr_w8(int devind, int port, uint8_t value); int _pci_attr_w16(int devind, int port, uint16_t value); -int _pci_attr_w32(int devind, int port, u32_t value); +int _pci_attr_w32(int devind, int port, uint32_t value); /* minix hooks into NetBSD PCI IDS DB */ typedef uint32_t pcireg_t; diff --git a/minix/drivers/bus/ti1225/ti1225.c b/minix/drivers/bus/ti1225/ti1225.c index 272406f51..656edc1e0 100644 --- a/minix/drivers/bus/ti1225/ti1225.c +++ b/minix/drivers/bus/ti1225/ti1225.c @@ -140,7 +140,7 @@ static void hw_init(struct port *pp, int devind) { uint8_t v8; uint16_t v16; - u32_t v32; + uint32_t v32; #if USE_INTS int r, irq; #endif @@ -249,7 +249,7 @@ static void do_int(struct port *pp) int devind, vcc_5v, vcc_3v, vcc_Xv, vcc_Yv, socket_5v, socket_3v, socket_Xv, socket_Yv; spin_t spin; - u32_t csr_event, csr_present, csr_control; + uint32_t csr_event, csr_present, csr_control; uint8_t v8; uint16_t v16; #if USE_INTS diff --git a/minix/drivers/bus/ti1225/ti1225.h b/minix/drivers/bus/ti1225/ti1225.h index 261adf2fd..0376236ba 100644 --- a/minix/drivers/bus/ti1225/ti1225.h +++ b/minix/drivers/bus/ti1225/ti1225.h @@ -19,15 +19,15 @@ Created: Dec 2005 by Philip Homburg /* CardBus Socket Registers */ struct csr { -/*00*/ u32_t csr_event; -/*04*/ u32_t csr_mask; -/*08*/ u32_t csr_present; -/*0C*/ u32_t csr_force_event; -/*10*/ u32_t csr_control; -/*14*/ u32_t csr_res0; -/*18*/ u32_t csr_res1; -/*1C*/ u32_t csr_res2; -/*20*/ u32_t csr_power; +/*00*/ uint32_t csr_event; +/*04*/ uint32_t csr_mask; +/*08*/ uint32_t csr_present; +/*0C*/ uint32_t csr_force_event; +/*10*/ uint32_t csr_control; +/*14*/ uint32_t csr_res0; +/*18*/ uint32_t csr_res1; +/*1C*/ uint32_t csr_res2; +/*20*/ uint32_t csr_power; }; /* csr_mask */ diff --git a/minix/drivers/clock/readclock/arch/earm/omap_rtc.c b/minix/drivers/clock/readclock/arch/earm/omap_rtc.c index 8fb312275..14275a8bf 100644 --- a/minix/drivers/clock/readclock/arch/earm/omap_rtc.c +++ b/minix/drivers/clock/readclock/arch/earm/omap_rtc.c @@ -122,8 +122,8 @@ static struct log log = { .log_func = default_log }; -static u32_t use_count = 0; -static u32_t pwr_off_in_progress = 0; +static uint32_t use_count = 0; +static uint32_t pwr_off_in_progress = 0; static void omap_rtc_unlock(void); static void omap_rtc_lock(void); diff --git a/minix/drivers/clock/readclock/arch/i386/arch_readclock.c b/minix/drivers/clock/readclock/arch/i386/arch_readclock.c index 07efbca69..5495e2469 100644 --- a/minix/drivers/clock/readclock/arch/i386/arch_readclock.c +++ b/minix/drivers/clock/readclock/arch/i386/arch_readclock.c @@ -213,7 +213,7 @@ arch_get_time(struct tm *t, int flags) static int read_register(int reg_addr) { - u32_t r; + uint32_t r; if (sys_outb(RTC_INDEX, reg_addr) != OK) { log_warn(&log, "outb failed of %x\n", RTC_INDEX); diff --git a/minix/drivers/eeprom/cat24c256/cat24c256.c b/minix/drivers/eeprom/cat24c256/cat24c256.c index 4b02a32c4..5d5647638 100644 --- a/minix/drivers/eeprom/cat24c256/cat24c256.c +++ b/minix/drivers/eeprom/cat24c256/cat24c256.c @@ -401,7 +401,7 @@ static int lu_state_restore(void) { /* Restore the state. */ - u32_t value; + uint32_t value; ds_retrieve_u32("bus", &value); ds_delete_u32("bus"); diff --git a/minix/drivers/examples/hello/hello.c b/minix/drivers/examples/hello/hello.c index 5b9e63b4c..6769521ee 100644 --- a/minix/drivers/examples/hello/hello.c +++ b/minix/drivers/examples/hello/hello.c @@ -82,7 +82,7 @@ static int sef_cb_lu_state_save(int UNUSED(state), int UNUSED(flags)) { static int lu_state_restore() { /* Restore the state. */ - u32_t value; + uint32_t value; ds_retrieve_u32("open_counter", &value); ds_delete_u32("open_counter"); diff --git a/minix/drivers/hid/pckbd/pckbd.c b/minix/drivers/hid/pckbd/pckbd.c index ca56657d2..e0cd90655 100644 --- a/minix/drivers/hid/pckbd/pckbd.c +++ b/minix/drivers/hid/pckbd/pckbd.c @@ -65,7 +65,7 @@ kbd_watchdog(int arg __unused) static void kbd_send(void) { - u32_t sb; + uint32_t sb; int r; if (!kbdout.avail) @@ -110,7 +110,7 @@ kbd_send(void) static int scan_keyboard(unsigned char *bp, int *isauxp) { - u32_t b, sb; + uint32_t b, sb; int r; if ((r = sys_inb(KB_STATUS, &sb)) != OK) { @@ -151,7 +151,7 @@ static int kb_wait(void) { spin_t spin; - u32_t status; + uint32_t status; int r, isaux; unsigned char byte; @@ -226,7 +226,7 @@ kbc_cmd1(int cmd, int data) static int kbc_read(void) { - u32_t byte, status; + uint32_t byte, status; spin_t spin; int r; @@ -373,7 +373,7 @@ kbd_process(unsigned char scode) static void kbdaux_process(unsigned char scode) { - u32_t delta; + uint32_t delta; int i; if (aux_counter == 0 && !(scode & 0x08)) diff --git a/minix/drivers/iommu/amddev/amddev.c b/minix/drivers/iommu/amddev/amddev.c index 44228ec60..57574aab6 100644 --- a/minix/drivers/iommu/amddev/amddev.c +++ b/minix/drivers/iommu/amddev/amddev.c @@ -50,8 +50,8 @@ static uint8_t dev_capptr; static uint8_t *table; static int find_dev(int *devindp, uint8_t *capaddrp); -static u32_t read_reg(int function, int index); -static void write_reg(int function, int index, u32_t value); +static uint32_t read_reg(int function, int index); +static void write_reg(int function, int index, uint32_t value); static void init_domain(int index); static void init_map(unsigned int ix); static int do_add4pci(const message *m); @@ -119,7 +119,7 @@ static int sef_cb_init_fresh(int UNUSED(type), sef_init_info_t *UNUSED(info)) /* Initialize the amddev driver. */ int r, n_maps, n_domains, revision; uint16_t flags; - u32_t bits; + uint32_t bits; printf("amddev: starting\n"); @@ -266,14 +266,14 @@ uint8_t *capaddrp; return 0; } -static u32_t read_reg(int function, int index) +static uint32_t read_reg(int function, int index) { pci_attr_w32(dev_devind, dev_capptr + DEV_OP, ((function << DEV_OP_FUNC_SHIFT) | index)); return pci_attr_r32(dev_devind, dev_capptr + DEV_DATA); } -static void write_reg(int function, int index, u32_t value) +static void write_reg(int function, int index, uint32_t value) { pci_attr_w32(dev_devind, dev_capptr + DEV_OP, ((function << DEV_OP_FUNC_SHIFT) | index)); @@ -313,7 +313,7 @@ printf("init_domain: busaddr = 0x%lx\n", busaddr); static void init_map(unsigned int ix) { - u32_t v, dom, busno, unit0, unit1; + uint32_t v, dom, busno, unit0, unit1; dom= 1; busno= 7; @@ -441,7 +441,7 @@ static void add_range(phys_bytes busaddr, phys_bytes size) for (o= 0; odescr->des[DES_BUF1])); if(r != OK) panic("umap failed: %d", r); loc_descr->descr->des[DES_BUF2] = 0; - memset(&loc_descr->descr->des[DES0],0,sizeof(u32_t)); + memset(&loc_descr->descr->des[DES0],0,sizeof(uint32_t)); loc_descr->descr->des[DES1] = temp; if(j==( (i==DESCR_RECV?DE_NB_RECV_DESCR:DE_NB_SEND_DESCR)-1)) loc_descr->descr->des[DES1] |= DES1_ER; @@ -361,7 +361,7 @@ static void de_init_buf(dpeth_t *dep) static void do_intr(unsigned int __unused mask) { dpeth_t *dep; - u32_t val; + uint32_t val; dep = &de_state; @@ -395,7 +395,7 @@ static void do_stop(void) static void de_hw_conf(const dpeth_t *dep) { - u32_t val; + uint32_t val; /* CSR0 - global host bus prop */ val = CSR0_BAR | CSR0_CAL_8; @@ -421,7 +421,7 @@ static void de_hw_conf(const dpeth_t *dep) static void de_start(const dpeth_t *dep) { - u32_t val; + uint32_t val; val = io_inl(CSR_ADDR(dep, CSR6)) | CSR6_ST | CSR6_SR; io_outl(CSR_ADDR(dep, CSR6), val); } @@ -429,7 +429,7 @@ static void de_start(const dpeth_t *dep) static void de_setup_frame(const dpeth_t *dep, const netdriver_addr_t *addr) { int i; - u32_t val; + uint32_t val; /* this is not perfect... we assume pass all multicast and only filter non-multicast frames */ @@ -492,16 +492,16 @@ static int do_send(struct netdriver_data *data, size_t size) return OK; } -static u32_t io_inl(uint16_t port) +static uint32_t io_inl(uint16_t port) { - u32_t value; + uint32_t value; int rc; if ((rc = sys_inl(port, &value)) != OK) panic("sys_inl failed: %d", rc); return value; } -static void io_outl(uint16_t port, u32_t value) +static void io_outl(uint16_t port, uint32_t value) { int rc; if ((rc = sys_outl(port, value)) != OK) diff --git a/minix/drivers/net/dec21140A/dec21140A.h b/minix/drivers/net/dec21140A/dec21140A.h index 6ef143a6f..8369353a5 100644 --- a/minix/drivers/net/dec21140A/dec21140A.h +++ b/minix/drivers/net/dec21140A/dec21140A.h @@ -27,7 +27,7 @@ Created: 09/01/2009 Nicolas Tittley (first.last @ gmail DOT com) #define DE_SETUP_FRAME_SIZE 192 typedef struct de_descr { - u32_t des[4]; + uint32_t des[4]; } de_descr_t; typedef struct de_local_descr { diff --git a/minix/drivers/net/dp8390/3c503.c b/minix/drivers/net/dp8390/3c503.c index d88505fd9..283d53d5f 100644 --- a/minix/drivers/net/dp8390/3c503.c +++ b/minix/drivers/net/dp8390/3c503.c @@ -20,7 +20,7 @@ #if ENABLE_3C503 -extern u32_t system_hz; +extern uint32_t system_hz; #define MILLIS_TO_TICKS(m) (((m)*system_hz/1000)+1) diff --git a/minix/drivers/net/dp8390/dp8390.c b/minix/drivers/net/dp8390/dp8390.c index 0ade59135..9fec4f4b3 100644 --- a/minix/drivers/net/dp8390/dp8390.c +++ b/minix/drivers/net/dp8390/dp8390.c @@ -24,7 +24,7 @@ static dpeth_t de_state; -u32_t system_hz; +uint32_t system_hz; /* Configuration */ typedef struct dp_conf @@ -935,7 +935,7 @@ static void map_hw_buffer(dpeth_t *dep) uint8_t inb(port_t port) { int r; - u32_t value; + uint32_t value; r= sys_inb(port, &value); if (r != OK) @@ -949,7 +949,7 @@ uint8_t inb(port_t port) uint16_t inw(port_t port) { int r; - u32_t value; + uint32_t value; r= sys_inw(port, &value); if (r != OK) diff --git a/minix/drivers/net/dp8390/ne2000.c b/minix/drivers/net/dp8390/ne2000.c index cf05a3692..1b1f53401 100644 --- a/minix/drivers/net/dp8390/ne2000.c +++ b/minix/drivers/net/dp8390/ne2000.c @@ -18,7 +18,7 @@ Created: March 15, 1994 by Philip Homburg #define N 100 -extern u32_t system_hz; +extern uint32_t system_hz; #define MILLIS_TO_TICKS(m) (((m)*system_hz/1000)+1) diff --git a/minix/drivers/net/dp8390/rtl8029.c b/minix/drivers/net/dp8390/rtl8029.c index 5a0ec01e4..71e8c79a6 100644 --- a/minix/drivers/net/dp8390/rtl8029.c +++ b/minix/drivers/net/dp8390/rtl8029.c @@ -33,7 +33,7 @@ int skip; { int r, devind; uint16_t vid, did; - u32_t bar; + uint32_t bar; uint8_t ilr; const char *dname; diff --git a/minix/drivers/net/dpeth/devio.c b/minix/drivers/net/dpeth/devio.c index 14e701723..4f5b4327b 100644 --- a/minix/drivers/net/dpeth/devio.c +++ b/minix/drivers/net/dpeth/devio.c @@ -25,7 +25,7 @@ static void warning(const char *type, int err) */ unsigned int inb(unsigned short port) { - u32_t value; + uint32_t value; int rc; if ((rc = sys_inb(port, &value)) != OK) warning("inb", rc); @@ -38,7 +38,7 @@ unsigned int inb(unsigned short port) */ unsigned int inw(unsigned short port) { - u32_t value; + uint32_t value; int rc; if ((rc = sys_inw(port, &value)) != OK) warning("inw", rc); diff --git a/minix/drivers/net/e1000/e1000.c b/minix/drivers/net/e1000/e1000.c index dbcdb0550..a80653280 100644 --- a/minix/drivers/net/e1000/e1000.c +++ b/minix/drivers/net/e1000/e1000.c @@ -30,7 +30,7 @@ static void e1000_reg_unset(e1000_t *e, uint32_t reg, uint32_t value); static uint16_t eeprom_eerd(e1000_t *e, int reg); static uint16_t eeprom_ich(e1000_t *e, int reg); static int eeprom_ich_init(e1000_t *e); -static int eeprom_ich_cycle(e1000_t *e, u32_t timeout); +static int eeprom_ich_cycle(e1000_t *e, uint32_t timeout); static int e1000_instance; static e1000_t e1000_state; @@ -102,7 +102,7 @@ e1000_init(unsigned int instance, netdriver_addr_t * addr, uint32_t * caps, static void e1000_map_flash(e1000_t * e, int devind, int did) { - u32_t flash_addr, gfpreg, sector_base_addr; + uint32_t flash_addr, gfpreg, sector_base_addr; size_t flash_size; /* The flash memory is pointed to by BAR2. It may not be present. */ @@ -146,8 +146,8 @@ e1000_probe(e1000_t * e, int skip) { int r, devind, ioflag; uint16_t vid, did, cr; - u32_t status; - u32_t base, size; + uint32_t status; + uint32_t base, size; const char *dname; E1000_DEBUG(3, ("%s: probe()\n", netdriver_name())); @@ -448,7 +448,7 @@ e1000_set_hwaddr(const netdriver_addr_t * hwaddr) e = &e1000_state; e1000_reg_write(e, E1000_REG_RAL, - *(const u32_t *)(&hwaddr->na_addr[0])); + *(const uint32_t *)(&hwaddr->na_addr[0])); e1000_reg_write(e, E1000_REG_RAH, *(const uint16_t *)(&hwaddr->na_addr[4])); e1000_reg_set(e, E1000_REG_RAH, E1000_REG_RAH_AV); @@ -603,7 +603,7 @@ static void e1000_intr(unsigned int __unused mask) { e1000_t *e; - u32_t cause; + uint32_t cause; E1000_DEBUG(3, ("e1000: interrupt\n")); @@ -687,7 +687,7 @@ e1000_reg_write(e1000_t * e, uint32_t reg, uint32_t value) assert(reg < 0x1ffff); /* Write to memory mapped register. */ - *(volatile u32_t *)(e->regs + reg) = value; + *(volatile uint32_t *)(e->regs + reg) = value; } /* @@ -726,7 +726,7 @@ e1000_reg_unset(e1000_t * e, uint32_t reg, uint32_t value) static uint16_t eeprom_eerd(e1000_t * e, int reg) { - u32_t data; + uint32_t data; /* Request EEPROM read. */ e1000_reg_write(e, E1000_REG_EERD, @@ -815,12 +815,12 @@ eeprom_ich_init(e1000_t * e) * Start ICH8 flash cycle. */ static int -eeprom_ich_cycle(e1000_t * e, u32_t timeout) +eeprom_ich_cycle(e1000_t * e, uint32_t timeout) { union ich8_hws_flash_ctrl hsflctl; union ich8_hws_flash_status hsfsts; int ret_val = -1; - u32_t i = 0; + uint32_t i = 0; E1000_DEBUG(3, ("e1000_flash_cycle_ich8lan")); @@ -851,8 +851,8 @@ eeprom_ich(e1000_t * e, int reg) { union ich8_hws_flash_status hsfsts; union ich8_hws_flash_ctrl hsflctl; - u32_t flash_linear_addr; - u32_t flash_data = 0; + uint32_t flash_linear_addr; + uint32_t flash_data = 0; int ret_val = -1; uint8_t count = 0; uint16_t data = 0; diff --git a/minix/drivers/net/e1000/e1000.h b/minix/drivers/net/e1000/e1000.h index d681143e3..774dcfd6f 100644 --- a/minix/drivers/net/e1000/e1000.h +++ b/minix/drivers/net/e1000/e1000.h @@ -75,7 +75,7 @@ * @param reg Register offset. */ #define E1000_READ_FLASH_REG(e,reg) \ - *(u32_t *) (((e)->flash) + (reg)) + *(uint32_t *) (((e)->flash) + (reg)) /** * Read a 16-bit word from flash memory. @@ -92,7 +92,7 @@ * @param value New value. */ #define E1000_WRITE_FLASH_REG(e,reg,value) \ - *((u32_t *) (((e)->flash) + (reg))) = (value) + *((uint32_t *) (((e)->flash) + (reg))) = (value) /** * Write a 16-bit word to flash memory. @@ -116,7 +116,7 @@ typedef struct e1000 int irq_hook; /**< Interrupt Request Vector Hook. */ uint8_t *regs; /**< Memory mapped hardware registers. */ uint8_t *flash; /**< Optional flash memory. */ - u32_t flash_base_addr; /**< Flash base address. */ + uint32_t flash_base_addr; /**< Flash base address. */ uint16_t (*eeprom_read)(struct e1000 *, int reg); /**< Function to read the EEPROM. */ int eeprom_done_bit; /**< Offset of the EERD.DONE bit. */ diff --git a/minix/drivers/net/e1000/e1000_hw.h b/minix/drivers/net/e1000/e1000_hw.h index 52a4a4231..ae0fe0160 100644 --- a/minix/drivers/net/e1000/e1000_hw.h +++ b/minix/drivers/net/e1000/e1000_hw.h @@ -30,8 +30,8 @@ */ typedef struct e1000_rx_desc { - u32_t buffer; /**< Address of the receive data buffer (64-bit). */ - u32_t buffer_h; /**< High 32-bits of the receive data buffer (unused). */ + uint32_t buffer; /**< Address of the receive data buffer (64-bit). */ + uint32_t buffer_h; /**< High 32-bits of the receive data buffer (unused). */ uint16_t length; /**< Size of the receive buffer. */ uint16_t checksum; /**< Packet checksum. */ uint8_t status; /**< Descriptor status. */ @@ -45,8 +45,8 @@ e1000_rx_desc_t; */ typedef struct e1000_tx_desc { - u32_t buffer; /**< Address of the transmit buffer (64-bit). */ - u32_t buffer_h; /**< High 32-bits of the transmit buffer (unused). */ + uint32_t buffer; /**< Address of the transmit buffer (64-bit). */ + uint32_t buffer_h; /**< High 32-bits of the transmit buffer (unused). */ uint16_t length; /**< Size of the transmit buffer contents. */ uint8_t checksum_off; /**< Checksum Offset. */ uint8_t command; /**< Command field. */ diff --git a/minix/drivers/net/fxp/fxp.c b/minix/drivers/net/fxp/fxp.c index 0ab8ec673..ddb364c15 100644 --- a/minix/drivers/net/fxp/fxp.c +++ b/minix/drivers/net/fxp/fxp.c @@ -124,9 +124,9 @@ static uint16_t eeprom_read(fxp_t *fp, int reg); static void eeprom_addrsize(fxp_t *fp); static uint16_t mii_read(fxp_t *fp, int reg); static uint8_t do_inb(port_t port); -static u32_t do_inl(port_t port); +static uint32_t do_inl(port_t port); static void do_outb(port_t port, uint8_t v); -static void do_outl(port_t port, u32_t v); +static void do_outl(port_t port, uint32_t v); static void tell_iommu(vir_bytes start, size_t size, int pci_bus, int pci_dev, int pci_func); @@ -235,7 +235,7 @@ static int fxp_probe(fxp_t *fp, int skip) { int r, devind; uint16_t vid, did, cr; - u32_t bar; + uint32_t bar; uint8_t ilr, rev; const char *str; #if VERBOSE @@ -1041,7 +1041,7 @@ fxp_t *fp; static void fxp_update_stats(void) { fxp_t *fp; - u32_t *p; + uint32_t *p; fp= fxp_state; @@ -1126,7 +1126,7 @@ static void fxp_check_ints(fxp_t *fp) int n, prev_tail; int fxp_tx_tail, fxp_tx_nbuf, fxp_tx_threshold; port_t port; - u32_t busaddr; + uint32_t busaddr; uint16_t tx_status; uint8_t scb_status; struct tx *txp; @@ -1326,7 +1326,7 @@ static void fxp_report_link(fxp_t *fp) uint16_t mii_ctrl, mii_status, mii_id1, mii_id2, mii_ana, mii_anlpa, mii_ane, mii_extstat, mii_ms_ctrl, mii_ms_status, scr; - u32_t oui; + uint32_t oui; int model, rev; int f, link_up; @@ -1680,7 +1680,7 @@ static uint16_t mii_read(fxp_t *fp, int reg) { spin_t spin; port_t port; - u32_t v; + uint32_t v; port= fp->fxp_base_port; @@ -1705,7 +1705,7 @@ static uint16_t mii_read(fxp_t *fp, int reg) static uint8_t do_inb(port_t port) { int r; - u32_t value; + uint32_t value; r= sys_inb(port, &value); if (r != OK) @@ -1713,10 +1713,10 @@ static uint8_t do_inb(port_t port) return value; } -static u32_t do_inl(port_t port) +static uint32_t do_inl(port_t port) { int r; - u32_t value; + uint32_t value; r= sys_inl(port, &value); if (r != OK) @@ -1733,7 +1733,7 @@ static void do_outb(port_t port, uint8_t value) panic("sys_outb failed: %d", r); } -static void do_outl(port_t port, u32_t value) +static void do_outl(port_t port, uint32_t value) { int r; diff --git a/minix/drivers/net/fxp/fxp.h b/minix/drivers/net/fxp/fxp.h index ddcaf9204..2e3e10716 100644 --- a/minix/drivers/net/fxp/fxp.h +++ b/minix/drivers/net/fxp/fxp.h @@ -169,7 +169,7 @@ struct ias { uint16_t ias_status; uint16_t ias_command; - u32_t ias_linkaddr; + uint32_t ias_linkaddr; uint8_t ias_ethaddr[6]; uint8_t ias_reserved[2]; }; @@ -180,7 +180,7 @@ struct cbl_conf { uint16_t cc_status; uint16_t cc_command; - u32_t cc_linkaddr; + uint32_t cc_linkaddr; uint8_t cc_bytes[CC_BYTES_NR]; }; @@ -424,8 +424,8 @@ struct tx { uint16_t tx_status; uint16_t tx_command; - u32_t tx_linkaddr; - u32_t tx_tbda; + uint32_t tx_linkaddr; + uint32_t tx_tbda; uint16_t tx_size; uint8_t tx_tthresh; uint8_t tx_ntbd; @@ -459,39 +459,39 @@ struct tx /* Statistical Counters */ struct sc { - u32_t sc_tx_good; /* Transmit Good Frames */ - u32_t sc_tx_maxcol; /* Transmit Maximum Collisions errors */ - u32_t sc_tx_latecol; /* Transmit Late Collisions errors */ - u32_t sc_tx_underrun; /* Transmit Underrun errors */ - u32_t sc_tx_crs; /* Transmit Lost Carrier Sense */ - u32_t sc_tx_defered; /* Transmit Defered */ - u32_t sc_tx_scol; /* Transmit Single Collision */ - u32_t sc_tx_mcol; /* Transmit Multiple Collisions */ - u32_t sc_tx_totcol; /* Transmit Total Collisions */ - u32_t sc_rx_good; /* Receive Good Frames */ - u32_t sc_rx_crc; /* Receive CRC errors */ - u32_t sc_rx_align; /* Receive Alignment errors */ - u32_t sc_rx_resource; /* Receive Resource errors */ - u32_t sc_rx_overrun; /* Receive Overrun errors */ - u32_t sc_rx_cd; /* Receive Collision Detect errors */ - u32_t sc_rx_short; /* Receive Short Frame errors */ + uint32_t sc_tx_good; /* Transmit Good Frames */ + uint32_t sc_tx_maxcol; /* Transmit Maximum Collisions errors */ + uint32_t sc_tx_latecol; /* Transmit Late Collisions errors */ + uint32_t sc_tx_underrun; /* Transmit Underrun errors */ + uint32_t sc_tx_crs; /* Transmit Lost Carrier Sense */ + uint32_t sc_tx_defered; /* Transmit Defered */ + uint32_t sc_tx_scol; /* Transmit Single Collision */ + uint32_t sc_tx_mcol; /* Transmit Multiple Collisions */ + uint32_t sc_tx_totcol; /* Transmit Total Collisions */ + uint32_t sc_rx_good; /* Receive Good Frames */ + uint32_t sc_rx_crc; /* Receive CRC errors */ + uint32_t sc_rx_align; /* Receive Alignment errors */ + uint32_t sc_rx_resource; /* Receive Resource errors */ + uint32_t sc_rx_overrun; /* Receive Overrun errors */ + uint32_t sc_rx_cd; /* Receive Collision Detect errors */ + uint32_t sc_rx_short; /* Receive Short Frame errors */ /* Short form ends here. The magic number will * be stored in the next field. */ - u32_t sc_tx_fcp; /* Transmit Flow Control Pause */ - u32_t sc_rx_fcp; /* Receive Flow Control Pause */ - u32_t sc_rx_fcu; /* Receive Flow Control Unsupported */ + uint32_t sc_tx_fcp; /* Transmit Flow Control Pause */ + uint32_t sc_rx_fcp; /* Receive Flow Control Pause */ + uint32_t sc_rx_fcu; /* Receive Flow Control Unsupported */ /* Longer form (82558 and later) ends here. * The magic number will be stored in the * next field. */ - u32_t sc_tx_tco; /* Transmit TCO frames */ - u32_t sc_rx_tco; /* Receive TCO frames */ - u32_t sc_magic; /* Dump of counters completed */ + uint32_t sc_tx_tco; /* Transmit TCO frames */ + uint32_t sc_rx_tco; /* Receive TCO frames */ + uint32_t sc_magic; /* Dump of counters completed */ }; #define SCM_DSC 0x0000A005 /* Magic for SC_CU_DUMP_SC command */ @@ -502,8 +502,8 @@ struct rfd { uint16_t rfd_status; uint16_t rfd_command; - u32_t rfd_linkaddr; - u32_t rfd_reserved; + uint32_t rfd_linkaddr; + uint32_t rfd_reserved; uint16_t rfd_res; uint16_t rfd_size; uint8_t rfd_buf[NDEV_ETH_PACKET_MAX_TAGGED]; diff --git a/minix/drivers/net/ip1000/io.h b/minix/drivers/net/ip1000/io.h index fe225c017..4dac81b3d 100644 --- a/minix/drivers/net/ip1000/io.h +++ b/minix/drivers/net/ip1000/io.h @@ -6,8 +6,8 @@ #include "ip1000.h" /* I/O function */ -static uint8_t my_inb(u32_t port) { - u32_t value; +static uint8_t my_inb(uint32_t port) { + uint32_t value; int r; #ifdef DMA_BASE_IOMAP value = *(volatile uint8_t *)(port); @@ -19,8 +19,8 @@ static uint8_t my_inb(u32_t port) { } #define ndr_in8(port, offset) (my_inb((port) + (offset))) -static uint16_t my_inw(u32_t port) { - u32_t value; +static uint16_t my_inw(uint32_t port) { + uint32_t value; int r; #ifdef DMA_BASE_IOMAP value = *(volatile uint16_t *)(port); @@ -32,11 +32,11 @@ static uint16_t my_inw(u32_t port) { } #define ndr_in16(port, offset) (my_inw((port) + (offset))) -static u32_t my_inl(u32_t port) { - u32_t value; +static uint32_t my_inl(uint32_t port) { + uint32_t value; int r; #ifdef DMA_BASE_IOMAP - value = *(volatile u32_t *)(port); + value = *(volatile uint32_t *)(port); #else if ((r = sys_inl(port, &value)) != OK) printf("NDR: sys_inl failed: %d\n", r); @@ -45,7 +45,7 @@ static u32_t my_inl(u32_t port) { } #define ndr_in32(port, offset) (my_inl((port) + (offset))) -static void my_outb(u32_t port, u32_t value) { +static void my_outb(uint32_t port, uint32_t value) { int r; #ifdef DMA_BASE_IOMAP *(volatile uint8_t *)(port) = value; @@ -57,7 +57,7 @@ static void my_outb(u32_t port, u32_t value) { #define ndr_out8(port, offset, value) \ (my_outb(((port) + (offset)), (value))) -static void my_outw(u32_t port, u32_t value) { +static void my_outw(uint32_t port, uint32_t value) { int r; #ifdef DMA_BASE_IOMAP *(volatile uint16_t *)(port) = value; @@ -69,10 +69,10 @@ static void my_outw(u32_t port, u32_t value) { #define ndr_out16(port, offset, value) \ (my_outw(((port) + (offset)), (value))) -static void my_outl(u32_t port, u32_t value) { +static void my_outl(uint32_t port, uint32_t value) { int r; #ifdef DMA_BASE_IOMAP - *(volatile u32_t *)(port) = value; + *(volatile uint32_t *)(port) = value; #else if ((r = sys_outl(port, value)) != OK) printf("NDR: sys_outl failed: %d\n", r); diff --git a/minix/drivers/net/ip1000/ip1000.c b/minix/drivers/net/ip1000/ip1000.c index d708fada1..43de570b8 100644 --- a/minix/drivers/net/ip1000/ip1000.c +++ b/minix/drivers/net/ip1000/ip1000.c @@ -29,34 +29,34 @@ static void dev_handler(NDR_driver *pdev); static void dev_check_ints(NDR_driver *pdev); /* developer interface */ -static int dev_real_reset(u32_t *base); -static int dev_init_io(u32_t *base); -static int dev_init_mii(u32_t *base); -static void dev_intr_control(u32_t *base, int flag); -static void dev_rx_tx_control(u32_t *base, int flag); -static void dev_get_addr(u32_t *base, uint8_t *pa); -static int dev_check_link(u32_t *base); -static void dev_set_rec_mode(u32_t *base, int mode); -static void dev_start_tx(u32_t *base); -static u32_t dev_read_clear_intr_status(u32_t *base); +static int dev_real_reset(uint32_t *base); +static int dev_init_io(uint32_t *base); +static int dev_init_mii(uint32_t *base); +static void dev_intr_control(uint32_t *base, int flag); +static void dev_rx_tx_control(uint32_t *base, int flag); +static void dev_get_addr(uint32_t *base, uint8_t *pa); +static int dev_check_link(uint32_t *base); +static void dev_set_rec_mode(uint32_t *base, int mode); +static void dev_start_tx(uint32_t *base); +static uint32_t dev_read_clear_intr_status(uint32_t *base); static void dev_init_rx_desc(NDR_desc *desc_start, int index, size_t buf_size, phys_bytes buf_dma, int max_desc_num, phys_bytes desc_dma_start); static void dev_init_tx_desc(NDR_desc *desc_start, int index, size_t buf_size, phys_bytes buf_dma, int max_desc_num, phys_bytes desc_dma_start); -static void dev_set_desc_reg(u32_t *base, phys_bytes rx_addr, +static void dev_set_desc_reg(uint32_t *base, phys_bytes rx_addr, phys_bytes tx_addr); -static int dev_rx_ok_desc(u32_t *base, NDR_desc *desc, int index); -static int dev_rx_len_desc(u32_t *base, NDR_desc *desc, int index); -static void dev_set_rx_desc_done(u32_t *base, NDR_desc *desc, int index); -static void dev_set_tx_desc_prepare(u32_t *base, NDR_desc *desc, int index, +static int dev_rx_ok_desc(uint32_t *base, NDR_desc *desc, int index); +static int dev_rx_len_desc(uint32_t *base, NDR_desc *desc, int index); +static void dev_set_rx_desc_done(uint32_t *base, NDR_desc *desc, int index); +static void dev_set_tx_desc_prepare(uint32_t *base, NDR_desc *desc, int index, size_t data_size); -static int dev_tx_ok_desc(u32_t *base, NDR_desc *desc, int index); -static void dev_set_tx_desc_done(u32_t *base, NDR_desc *desc, int index); +static int dev_tx_ok_desc(uint32_t *base, NDR_desc *desc, int index); +static void dev_set_tx_desc_done(uint32_t *base, NDR_desc *desc, int index); /* ======= Developer implemented function ======= */ /* ====== Self-defined function ======*/ -static uint16_t read_eeprom(u32_t base, int addr) { - u32_t ret, data, val; +static uint16_t read_eeprom(uint32_t base, int addr) { + uint32_t ret, data, val; int i; val = EC_READ | (addr & 0xff); @@ -74,9 +74,9 @@ static uint16_t read_eeprom(u32_t base, int addr) { return ret; } -static uint16_t read_phy_reg(u32_t base, int phy_addr, int phy_reg) { +static uint16_t read_phy_reg(uint32_t base, int phy_addr, int phy_reg) { int i, j, fieldlen[8]; - u32_t field[8]; + uint32_t field[8]; uint8_t data, polar; field[0] = 0xffffffff; fieldlen[0] = 32; @@ -127,9 +127,9 @@ static uint16_t read_phy_reg(u32_t base, int phy_addr, int phy_reg) { return field[6]; } -static void write_phy_reg(u32_t base, int phy_addr, int phy_reg, uint16_t val) { +static void write_phy_reg(uint32_t base, int phy_addr, int phy_reg, uint16_t val) { int i, j, fieldlen[8]; - u32_t field[8]; + uint32_t field[8]; uint8_t data, polar; field[0] = 0xffffffff; fieldlen[0] = 32; @@ -165,8 +165,8 @@ static void write_phy_reg(u32_t base, int phy_addr, int phy_reg, uint16_t val) { /* ====== Developer interface ======*/ /* Real hardware reset (### RESET_HARDWARE_CAN_FAIL ###) * -- Return OK means success, Others means failure */ -static int dev_real_reset(u32_t *base) { - u32_t data, base0 = base[0]; +static int dev_real_reset(uint32_t *base) { + uint32_t data, base0 = base[0]; data = ndr_in32(base0, REG_ASIC_CTRL); ndr_out32(base0, REG_ASIC_CTRL, data | AC_RESET_ALL); micro_delay(5000); @@ -177,8 +177,8 @@ static int dev_real_reset(u32_t *base) { /* Intialize other hardware I/O registers (### INIT_HARDWARE_IO_CAN_FAIL ###) * -- Return OK means success, Others means failure */ -static int dev_init_io(u32_t *base) { - u32_t mac_ctrl, physet, mode0, mode1, base0 = base[0]; +static int dev_init_io(uint32_t *base) { + uint32_t mac_ctrl, physet, mode0, mode1, base0 = base[0]; mode0 = read_eeprom(base0, 6); mode1 = ndr_in16(base0, REG_ASIC_CTRL); mode1 &= ~(AC_LED_MODE_B1 | AC_LED_MODE | AC_LED_SPEED); @@ -210,12 +210,12 @@ static int dev_init_io(u32_t *base) { /* Intialize MII interface (### MII_INIT_CAN_FAIL ###) * -- Return OK means success, Others means failure */ -static int dev_init_mii(u32_t *base) { +static int dev_init_mii(uint32_t *base) { int i, phyaddr; uint8_t revision; uint16_t phyctrl, cr1000, length, address, value; uint16_t *param; - u32_t status, base0 = base[0]; + uint32_t status, base0 = base[0]; for (i = 0; i < 32; i++) { phyaddr = (i + 0x01) % 32; @@ -259,8 +259,8 @@ static int dev_init_mii(u32_t *base) { } /* Enable or disable interrupt (### INTR_ENABLE_DISABLE ###) */ -static void dev_intr_control(u32_t *base, int flag) { - u32_t base0 = base[0]; +static void dev_intr_control(uint32_t *base, int flag) { + uint32_t base0 = base[0]; if (flag == INTR_ENABLE) ndr_out16(base0, REG_IMR, CMD_INTR_ENABLE); else if (flag == INTR_DISABLE) @@ -268,8 +268,8 @@ static void dev_intr_control(u32_t *base, int flag) { } /* Enable or disable Rx/Tx (### RX_TX_ENABLE_DISABLE ###) */ -static void dev_rx_tx_control(u32_t *base, int flag) { - u32_t data, base0 = base[0]; +static void dev_rx_tx_control(uint32_t *base, int flag) { + uint32_t data, base0 = base[0]; data = ndr_in32(base0, REG_MAC_CTRL); if (flag == RX_TX_ENABLE) ndr_out32(base0, REG_MAC_CTRL, data | (MC_RX_ENABLE | MC_TX_ENABLE)); @@ -280,8 +280,8 @@ static void dev_rx_tx_control(u32_t *base, int flag) { } /* Get MAC address to the array 'pa' (### GET_MAC_ADDR ###) */ -static void dev_get_addr(u32_t *base, uint8_t *pa) { - u32_t i, sta_addr[3], base0 = base[0]; +static void dev_get_addr(uint32_t *base, uint8_t *pa) { + uint32_t i, sta_addr[3], base0 = base[0]; for (i = 0; i < 3; i++) { sta_addr[i] = read_eeprom(base0, 16 + i); ndr_out16(base0, (REG_STA_ADDR0 + i * 2), sta_addr[i]); @@ -296,8 +296,8 @@ static void dev_get_addr(u32_t *base, uint8_t *pa) { /* Check link status (### CHECK_LINK ###) * -- Return LINK_UP or LINK_DOWN */ -static int dev_check_link(u32_t *base) { - u32_t phy_ctrl, mac_ctrl, base0 = base[0]; +static int dev_check_link(uint32_t *base) { + uint32_t phy_ctrl, mac_ctrl, base0 = base[0]; int ret; char speed[20], duplex[20]; @@ -335,8 +335,8 @@ static int dev_check_link(u32_t *base) { } /* Set driver receive mode (### SET_REC_MODE ###) */ -static void dev_set_rec_mode(u32_t *base, int mode) { - u32_t data, base0 = base[0]; +static void dev_set_rec_mode(uint32_t *base, int mode) { + uint32_t data, base0 = base[0]; data = ndr_in8(base0, REG_RCR); data &= ~(CMD_RCR_UNICAST | CMD_RCR_MULTICAST | CMD_RCR_BROADCAST); if (mode & NDEV_MODE_PROMISC) @@ -350,14 +350,14 @@ static void dev_set_rec_mode(u32_t *base, int mode) { } /* Start Tx channel (### START_TX_CHANNEL ###) */ -static void dev_start_tx(u32_t *base) { - u32_t base0 = base[0]; +static void dev_start_tx(uint32_t *base) { + uint32_t base0 = base[0]; ndr_out32(base0, REG_DMA_CTRL, CMD_TX_START); } /* Read and clear interrupt (### READ_CLEAR_INTR_STS ###) */ -static u32_t dev_read_clear_intr_status(u32_t *base) { - u32_t data, base0 = base[0]; +static uint32_t dev_read_clear_intr_status(uint32_t *base) { + uint32_t data, base0 = base[0]; data = ndr_in16(base0, REG_ISR); ndr_out16(base0, REG_ISR, 0); return data; @@ -390,9 +390,9 @@ static void dev_init_tx_desc(NDR_desc *desc_start, int index, size_t buf_size, } /* Set Rx/Tx descriptor address into device register (### SET_DESC_REG ###) */ -static void dev_set_desc_reg(u32_t *base, phys_bytes rx_addr, +static void dev_set_desc_reg(uint32_t *base, phys_bytes rx_addr, phys_bytes tx_addr) { - u32_t base0 = base[0]; + uint32_t base0 = base[0]; ndr_out32(base0, REG_RX_DESC_BASEL, rx_addr); ndr_out32(base0, REG_RX_DESC_BASEU, 0); ndr_out32(base0, REG_TX_DESC_BASEL, tx_addr); @@ -402,7 +402,7 @@ static void dev_set_desc_reg(u32_t *base, phys_bytes rx_addr, /* Check whether Rx is OK from Rx descriptor (### CHECK_RX_OK_FROM_DESC ###) * -- Current buffer number is index * -- Return RX_OK or RX_SUSPEND or RX_ERROR */ -static int dev_rx_ok_desc(u32_t *base, NDR_desc *desc, int index) { +static int dev_rx_ok_desc(uint32_t *base, NDR_desc *desc, int index) { if (desc->status & RFS_RFD_DONE) { if (desc->status & RFS_ERROR) return RX_ERROR; @@ -415,7 +415,7 @@ static int dev_rx_ok_desc(u32_t *base, NDR_desc *desc, int index) { /* Get length from Rx descriptor (### GET_RX_LENGTH_FROM_DESC ###) * -- Current buffer number is index * -- Return the length */ -static int dev_rx_len_desc(u32_t *base, NDR_desc *desc, int index) { +static int dev_rx_len_desc(uint32_t *base, NDR_desc *desc, int index) { int totlen; totlen = (int)(desc->status & RFS_FRAME_LEN); return totlen; @@ -423,13 +423,13 @@ static int dev_rx_len_desc(u32_t *base, NDR_desc *desc, int index) { /* Set Rx descriptor after Rx done (### SET_RX_DESC_DONE ###) * -- Current buffer number is index */ -static void dev_set_rx_desc_done(u32_t *base, NDR_desc *desc, int index) { +static void dev_set_rx_desc_done(uint32_t *base, NDR_desc *desc, int index) { desc->status = 0; } /* Set Tx descriptor to prepare transmitting (### SET_TX_DESC_PREPARE) * -- Current buffer number is index */ -static void dev_set_tx_desc_prepare(u32_t *base, NDR_desc *desc, int index, +static void dev_set_tx_desc_prepare(uint32_t *base, NDR_desc *desc, int index, size_t data_size) { desc->status = TFS_TFD_DONE; desc->status |= (u64_t)(TFS_WORD_ALIGN | (TFS_FRAMEID & index) @@ -442,7 +442,7 @@ static void dev_set_tx_desc_prepare(u32_t *base, NDR_desc *desc, int index, /* Check whether Tx is OK from Tx descriptor (### CHECK_TX_OK_FROM_DESC ###) * -- Current buffer number is index * -- Return TX_OK or TX_SUSPEND or TX_ERROR */ -static int dev_tx_ok_desc(u32_t *base, NDR_desc *desc, int index) { +static int dev_tx_ok_desc(uint32_t *base, NDR_desc *desc, int index) { if (desc->status & TFS_TFD_DONE) return TX_OK; return TX_SUSPEND; @@ -450,7 +450,7 @@ static int dev_tx_ok_desc(u32_t *base, NDR_desc *desc, int index) { /* Set Tx descriptor after Tx done (### SET_TX_DESC_DONE ###) * -- Current buffer number is index */ -static void dev_set_tx_desc_done(u32_t *base, NDR_desc *desc, int index) { +static void dev_set_tx_desc_done(uint32_t *base, NDR_desc *desc, int index) { desc->status = 0; } @@ -552,7 +552,7 @@ NDR_set_mode(unsigned int mode, const netdriver_addr_t * mcast_list __unused, /* Receive data */ static ssize_t NDR_recv(struct netdriver_data *data, size_t max) { NDR_driver *pdev = &g_driver; - u32_t totlen, packlen; + uint32_t totlen, packlen; int index, ret, offset = 0; NDR_desc *desc; @@ -654,7 +654,7 @@ static void NDR_intr(unsigned int mask) { static int dev_probe(NDR_driver *pdev, int instance) { int devind, ioflag, i; uint16_t cr, vid, did; - u32_t bar, size, base; + uint32_t bar, size, base; uint8_t irq, rev; uint8_t *reg; @@ -689,7 +689,7 @@ static int dev_probe(NDR_driver *pdev, int instance) { printf("NDR: Fail to map hardware registers from PCI\n"); return -EIO; } - pdev->base[i] = (u32_t)reg; + pdev->base[i] = (uint32_t)reg; } #else for (i = 0; i < 6; i++) @@ -899,7 +899,7 @@ static int dev_init_buf(NDR_driver *pdev) { /* Real handler interrupt */ static void dev_handler(NDR_driver *pdev) { - u32_t intr_status; + uint32_t intr_status; int tx_head, tx_tail, index, flag = 0, ret; NDR_desc *desc; diff --git a/minix/drivers/net/ip1000/ip1000.h b/minix/drivers/net/ip1000/ip1000.h index b9e635c4f..b3d59bb5f 100644 --- a/minix/drivers/net/ip1000/ip1000.h +++ b/minix/drivers/net/ip1000/ip1000.h @@ -147,8 +147,8 @@ typedef struct NDR_desc { typedef struct NDR_driver { char *dev_name; /* Device name */ uint16_t vid, did; /* Vendor and device ID */ - u32_t devind; /* Device index */ - u32_t base[6]; /* Base address */ + uint32_t devind; /* Device index */ + uint32_t base[6]; /* Base address */ char irq; /* IRQ number */ char revision; /* Revision ID */ diff --git a/minix/drivers/net/lan8710a/lan8710a.c b/minix/drivers/net/lan8710a/lan8710a.c index 3ea64845d..9a4d43468 100644 --- a/minix/drivers/net/lan8710a/lan8710a.c +++ b/minix/drivers/net/lan8710a/lan8710a.c @@ -25,13 +25,13 @@ static void lan8710a_init_mdio(void); static int lan8710a_init_hw(netdriver_addr_t *addr, unsigned int instance); static void lan8710a_reset_hw(void); -static void lan8710a_phy_write(u32_t reg, u32_t value); -static u32_t lan8710a_phy_read(u32_t reg); +static void lan8710a_phy_write(uint32_t reg, uint32_t value); +static uint32_t lan8710a_phy_read(uint32_t reg); -static u32_t lan8710a_reg_read(volatile u32_t *reg); -static void lan8710a_reg_write(volatile u32_t *reg, u32_t value); -static void lan8710a_reg_set(volatile u32_t *reg, u32_t value); -static void lan8710a_reg_unset(volatile u32_t *reg, u32_t value); +static uint32_t lan8710a_reg_read(volatile uint32_t *reg); +static void lan8710a_reg_write(volatile uint32_t *reg, uint32_t value); +static void lan8710a_reg_set(volatile uint32_t *reg, uint32_t value); +static void lan8710a_reg_unset(volatile uint32_t *reg, uint32_t value); /* Local variables */ static lan8710a_t lan8710a_state; @@ -111,12 +111,12 @@ lan8710a_enable_interrupt(int interrupt) static void lan8710a_intr(unsigned int mask) { - u32_t dma_status; + uint32_t dma_status; /* Check the card for interrupt reason(s). */ - u32_t rx_stat = lan8710a_reg_read(CPSW_WR_C0_RX_STAT); - u32_t tx_stat = lan8710a_reg_read(CPSW_WR_C0_TX_STAT); - u32_t cp; + uint32_t rx_stat = lan8710a_reg_read(CPSW_WR_C0_RX_STAT); + uint32_t tx_stat = lan8710a_reg_read(CPSW_WR_C0_TX_STAT); + uint32_t cp; /* Handle interrupts. */ if (rx_stat) { @@ -361,7 +361,7 @@ lan8710a_dma_config_tx(uint8_t desc_idx) /* Setting HDP */ phys_addr = lan8710a_state.tx_desc_phy + (desc_idx * sizeof(lan8710a_desc_t)); - lan8710a_reg_write(CPDMA_STRAM_TX_HDP(i), (u32_t)phys_addr); + lan8710a_reg_write(CPDMA_STRAM_TX_HDP(i), (uint32_t)phys_addr); } /*============================================================================* @@ -401,7 +401,7 @@ lan8710a_dma_reset_init(void) * channel's Rx DMA state. */ lan8710a_reg_write(CPDMA_STRAM_RX_HDP(0), - (u32_t)lan8710a_state.rx_desc_phy); + (uint32_t)lan8710a_state.rx_desc_phy); lan8710a_state.rx_desc_idx = 0; lan8710a_state.tx_desc_idx = 0; @@ -429,11 +429,11 @@ lan8710a_init_desc(void) memset(p_rx_desc, 0x0, sizeof(lan8710a_desc_t)); p_rx_desc->pkt_len_flags = LAN8710A_DESC_FLAG_OWN; p_rx_desc->buffer_length_off = LAN8710A_IOBUF_SIZE; - p_rx_desc->buffer_pointer = (u32_t)(buf_phys_addr + + p_rx_desc->buffer_pointer = (uint32_t)(buf_phys_addr + (i * LAN8710A_IOBUF_SIZE)); p_rx_desc->next_pointer = - (u32_t)((i == (LAN8710A_NUM_RX_DESC - 1)) ? + (uint32_t)((i == (LAN8710A_NUM_RX_DESC - 1)) ? (lan8710a_state.rx_desc_phy) : (lan8710a_state.rx_desc_phy + ((i + 1) * sizeof(lan8710a_desc_t)))); @@ -448,7 +448,7 @@ lan8710a_init_desc(void) for (i = 0; i < LAN8710A_NUM_TX_DESC; i++) { p_tx_desc = &(lan8710a_state.tx_desc[i]); memset(p_tx_desc, 0x0, sizeof(lan8710a_desc_t)); - p_tx_desc->buffer_pointer = (u32_t)(buf_phys_addr + + p_tx_desc->buffer_pointer = (uint32_t)(buf_phys_addr + (i * LAN8710A_IOBUF_SIZE)); } lan8710a_state.rx_desc_idx = 0; @@ -674,7 +674,7 @@ static void lan8710a_init_mdio(void) { uint16_t address = 0; - u32_t r; + uint32_t r; /* Clearing MDIOCONTROL register */ lan8710a_reg_write(MDIOCONTROL, 0); @@ -756,7 +756,7 @@ lan8710a_recv(struct netdriver_data * data, size_t max) { lan8710a_t *e = &lan8710a_state; lan8710a_desc_t *p_rx_desc; - u32_t flags; + uint32_t flags; uint8_t *buf; size_t off, size, chunk; @@ -836,7 +836,7 @@ lan8710a_recv(struct netdriver_data * data, size_t max) * lan8710a_phy_write * *============================================================================*/ static void -lan8710a_phy_write(u32_t reg, u32_t value) +lan8710a_phy_write(uint32_t reg, uint32_t value) { if (!(lan8710a_reg_read(MDIOUSERACCESS0) & MDIO_GO)) { /* Clearing MDIOUSERACCESS0 register */ @@ -859,10 +859,10 @@ lan8710a_phy_write(u32_t reg, u32_t value) /*============================================================================* * lan8710a_phy_read * *============================================================================*/ -static u32_t -lan8710a_phy_read(u32_t reg) +static uint32_t +lan8710a_phy_read(uint32_t reg) { - u32_t value = 0xFFFFFFFF; + uint32_t value = 0xFFFFFFFF; if (!(lan8710a_reg_read(MDIOUSERACCESS0) & MDIO_GO)) { /* Clearing MDIOUSERACCESS0 register */ @@ -902,10 +902,10 @@ lan8710a_reset_hw(void) /*============================================================================* * lan8710a_reg_read * *============================================================================*/ -static u32_t -lan8710a_reg_read(volatile u32_t *reg) +static uint32_t +lan8710a_reg_read(volatile uint32_t *reg) { - u32_t value; + uint32_t value; /* Read from memory mapped register. */ value = *reg; @@ -918,7 +918,7 @@ lan8710a_reg_read(volatile u32_t *reg) * lan8710a_reg_write * *============================================================================*/ static void -lan8710a_reg_write(volatile u32_t *reg, u32_t value) +lan8710a_reg_write(volatile uint32_t *reg, uint32_t value) { /* Write to memory mapped register. */ *reg = value; @@ -928,9 +928,9 @@ lan8710a_reg_write(volatile u32_t *reg, u32_t value) * lan8710a_reg_set * *============================================================================*/ static void -lan8710a_reg_set(volatile u32_t *reg, u32_t value) +lan8710a_reg_set(volatile uint32_t *reg, uint32_t value) { - u32_t data; + uint32_t data; /* First read the current value. */ data = lan8710a_reg_read(reg); @@ -943,9 +943,9 @@ lan8710a_reg_set(volatile u32_t *reg, u32_t value) * lan8710a_reg_unset * *============================================================================*/ static void -lan8710a_reg_unset(volatile u32_t *reg, u32_t value) +lan8710a_reg_unset(volatile uint32_t *reg, uint32_t value) { - u32_t data; + uint32_t data; /* First read the current value. */ data = lan8710a_reg_read(reg); diff --git a/minix/drivers/net/lan8710a/lan8710a.h b/minix/drivers/net/lan8710a/lan8710a.h index 222f489e9..7edeae061 100644 --- a/minix/drivers/net/lan8710a/lan8710a.h +++ b/minix/drivers/net/lan8710a/lan8710a.h @@ -54,10 +54,10 @@ typedef struct lan8710a_desc_t { - u32_t next_pointer; - u32_t buffer_pointer; - u32_t buffer_length_off; - u32_t pkt_len_flags; + uint32_t next_pointer; + uint32_t buffer_pointer; + uint32_t buffer_length_off; + uint32_t pkt_len_flags; } lan8710a_desc_t; typedef struct lan8710a_t @@ -69,7 +69,7 @@ typedef struct lan8710a_t int irq_rx_hook; /* Rx interrupt Request Vector Hook. */ int irq_tx_hook; /* Tx interrupt Request Vector Hook. */ uint8_t *regs; - u32_t phy_address; + uint32_t phy_address; uint8_t *p_rx_buf; /* pointer to the buffer with receive frames */ uint8_t *p_tx_buf; /* pointer to the buffer with transmit frames */ diff --git a/minix/drivers/net/lan8710a/lan8710a_reg.h b/minix/drivers/net/lan8710a/lan8710a_reg.h index 68a38bee6..88363c860 100644 --- a/minix/drivers/net/lan8710a/lan8710a_reg.h +++ b/minix/drivers/net/lan8710a/lan8710a_reg.h @@ -10,20 +10,20 @@ /* MDIO Registers */ #define MDIO_BASE_ADDR (0x4A101000) -#define MDIOVER ((volatile u32_t *)( lan8710a_state.regs_mdio + 0x00)) -#define MDIOCONTROL ((volatile u32_t *)( lan8710a_state.regs_mdio + 0x04)) -#define MDIOALIVE ((volatile u32_t *)( lan8710a_state.regs_mdio + 0x08)) -#define MDIOLINK ((volatile u32_t *)( lan8710a_state.regs_mdio + 0x0C)) -#define MDIOLINKINTRAW ((volatile u32_t *)( lan8710a_state.regs_mdio + 0x10)) -#define MDIOLINKINTMASKED ((volatile u32_t *)( lan8710a_state.regs_mdio + 0x14)) -#define MDIOUSERINTRAW ((volatile u32_t *)( lan8710a_state.regs_mdio + 0x20)) -#define MDIOUSERINTMASKED ((volatile u32_t *)( lan8710a_state.regs_mdio + 0x24)) -#define MDIOUSERINTMASKSET ((volatile u32_t *)( lan8710a_state.regs_mdio + 0x28)) -#define MDIOUSERINTMASKCLR ((volatile u32_t *)( lan8710a_state.regs_mdio + 0x2C)) -#define MDIOUSERACCESS0 ((volatile u32_t *)( lan8710a_state.regs_mdio + 0x80)) -#define MDIOUSERPHYSEL0 ((volatile u32_t *)( lan8710a_state.regs_mdio + 0x84)) -#define MDIOUSERACCESS1 ((volatile u32_t *)( lan8710a_state.regs_mdio + 0x88)) -#define MDIOUSERPHYSEL1 ((volatile u32_t *)( lan8710a_state.regs_mdio + 0x8C)) +#define MDIOVER ((volatile uint32_t *)( lan8710a_state.regs_mdio + 0x00)) +#define MDIOCONTROL ((volatile uint32_t *)( lan8710a_state.regs_mdio + 0x04)) +#define MDIOALIVE ((volatile uint32_t *)( lan8710a_state.regs_mdio + 0x08)) +#define MDIOLINK ((volatile uint32_t *)( lan8710a_state.regs_mdio + 0x0C)) +#define MDIOLINKINTRAW ((volatile uint32_t *)( lan8710a_state.regs_mdio + 0x10)) +#define MDIOLINKINTMASKED ((volatile uint32_t *)( lan8710a_state.regs_mdio + 0x14)) +#define MDIOUSERINTRAW ((volatile uint32_t *)( lan8710a_state.regs_mdio + 0x20)) +#define MDIOUSERINTMASKED ((volatile uint32_t *)( lan8710a_state.regs_mdio + 0x24)) +#define MDIOUSERINTMASKSET ((volatile uint32_t *)( lan8710a_state.regs_mdio + 0x28)) +#define MDIOUSERINTMASKCLR ((volatile uint32_t *)( lan8710a_state.regs_mdio + 0x2C)) +#define MDIOUSERACCESS0 ((volatile uint32_t *)( lan8710a_state.regs_mdio + 0x80)) +#define MDIOUSERPHYSEL0 ((volatile uint32_t *)( lan8710a_state.regs_mdio + 0x84)) +#define MDIOUSERACCESS1 ((volatile uint32_t *)( lan8710a_state.regs_mdio + 0x88)) +#define MDIOUSERPHYSEL1 ((volatile uint32_t *)( lan8710a_state.regs_mdio + 0x8C)) #define MDIO_PREAMBLE (1 << 20) #define MDCLK_DIVIDER (0x255) @@ -38,26 +38,26 @@ /* CONTROL MODULE Registers */ #define CTRL_MOD_BASE_ADR (0x44E10000) -#define CTRL_MAC_ID0_LO ((volatile u32_t *)( lan8710a_state.regs_ctrl_mod + 0x630)) -#define CTRL_MAC_ID0_HI ((volatile u32_t *)( lan8710a_state.regs_ctrl_mod + 0x634)) -#define GMII_SEL ((volatile u32_t *)( lan8710a_state.regs_ctrl_mod + 0x650)) -#define CONF_MII1_COL ((volatile u32_t *)( lan8710a_state.regs_ctrl_mod + 0x908)) -#define CONF_MII1_CRS ((volatile u32_t *)( lan8710a_state.regs_ctrl_mod + 0x90C)) -#define CONF_MII1_RX_ER ((volatile u32_t *)( lan8710a_state.regs_ctrl_mod + 0x910)) -#define CONF_MII1_TX_EN ((volatile u32_t *)( lan8710a_state.regs_ctrl_mod + 0x914)) -#define CONF_MII1_RX_DV ((volatile u32_t *)( lan8710a_state.regs_ctrl_mod + 0x918)) -#define CONF_MII1_TXD3 ((volatile u32_t *)( lan8710a_state.regs_ctrl_mod + 0x91C)) -#define CONF_MII1_TXD2 ((volatile u32_t *)( lan8710a_state.regs_ctrl_mod + 0x920)) -#define CONF_MII1_TXD1 ((volatile u32_t *)( lan8710a_state.regs_ctrl_mod + 0x924)) -#define CONF_MII1_TXD0 ((volatile u32_t *)( lan8710a_state.regs_ctrl_mod + 0x928)) -#define CONF_MII1_TX_CLK ((volatile u32_t *)( lan8710a_state.regs_ctrl_mod + 0x92C)) -#define CONF_MII1_RX_CLK ((volatile u32_t *)( lan8710a_state.regs_ctrl_mod + 0x930)) -#define CONF_MII1_RXD3 ((volatile u32_t *)( lan8710a_state.regs_ctrl_mod + 0x934)) -#define CONF_MII1_RXD2 ((volatile u32_t *)( lan8710a_state.regs_ctrl_mod + 0x938)) -#define CONF_MII1_RXD1 ((volatile u32_t *)( lan8710a_state.regs_ctrl_mod + 0x93C)) -#define CONF_MII1_RXD0 ((volatile u32_t *)( lan8710a_state.regs_ctrl_mod + 0x940)) -#define CONF_MDIO ((volatile u32_t *)( lan8710a_state.regs_ctrl_mod + 0x948)) -#define CONF_MDC ((volatile u32_t *)( lan8710a_state.regs_ctrl_mod + 0x94C)) +#define CTRL_MAC_ID0_LO ((volatile uint32_t *)( lan8710a_state.regs_ctrl_mod + 0x630)) +#define CTRL_MAC_ID0_HI ((volatile uint32_t *)( lan8710a_state.regs_ctrl_mod + 0x634)) +#define GMII_SEL ((volatile uint32_t *)( lan8710a_state.regs_ctrl_mod + 0x650)) +#define CONF_MII1_COL ((volatile uint32_t *)( lan8710a_state.regs_ctrl_mod + 0x908)) +#define CONF_MII1_CRS ((volatile uint32_t *)( lan8710a_state.regs_ctrl_mod + 0x90C)) +#define CONF_MII1_RX_ER ((volatile uint32_t *)( lan8710a_state.regs_ctrl_mod + 0x910)) +#define CONF_MII1_TX_EN ((volatile uint32_t *)( lan8710a_state.regs_ctrl_mod + 0x914)) +#define CONF_MII1_RX_DV ((volatile uint32_t *)( lan8710a_state.regs_ctrl_mod + 0x918)) +#define CONF_MII1_TXD3 ((volatile uint32_t *)( lan8710a_state.regs_ctrl_mod + 0x91C)) +#define CONF_MII1_TXD2 ((volatile uint32_t *)( lan8710a_state.regs_ctrl_mod + 0x920)) +#define CONF_MII1_TXD1 ((volatile uint32_t *)( lan8710a_state.regs_ctrl_mod + 0x924)) +#define CONF_MII1_TXD0 ((volatile uint32_t *)( lan8710a_state.regs_ctrl_mod + 0x928)) +#define CONF_MII1_TX_CLK ((volatile uint32_t *)( lan8710a_state.regs_ctrl_mod + 0x92C)) +#define CONF_MII1_RX_CLK ((volatile uint32_t *)( lan8710a_state.regs_ctrl_mod + 0x930)) +#define CONF_MII1_RXD3 ((volatile uint32_t *)( lan8710a_state.regs_ctrl_mod + 0x934)) +#define CONF_MII1_RXD2 ((volatile uint32_t *)( lan8710a_state.regs_ctrl_mod + 0x938)) +#define CONF_MII1_RXD1 ((volatile uint32_t *)( lan8710a_state.regs_ctrl_mod + 0x93C)) +#define CONF_MII1_RXD0 ((volatile uint32_t *)( lan8710a_state.regs_ctrl_mod + 0x940)) +#define CONF_MDIO ((volatile uint32_t *)( lan8710a_state.regs_ctrl_mod + 0x948)) +#define CONF_MDC ((volatile uint32_t *)( lan8710a_state.regs_ctrl_mod + 0x94C)) #define CONF_MOD_SLEW_CTRL (1 << 6) #define CONF_MOD_RX_ACTIVE (1 << 5) @@ -73,16 +73,16 @@ /* CLOCK MODULE Registers */ #define CM_PER_BASE_ADR (0x44E00000) -#define CM_PER_CPSW_CLKSTCTRL ((volatile u32_t *)( lan8710a_state.regs_cp_per + 0x144)) +#define CM_PER_CPSW_CLKSTCTRL ((volatile uint32_t *)( lan8710a_state.regs_cp_per + 0x144)) #define CM_PER_CPSW_CLKSTCTRL_BIT1 (1 << 1) #define CM_PER_CPSW_CLKSTCTRL_BIT0 (1 << 0) /* CPSW_ALE Registers */ #define CPSW_ALE_BASE_ADR (0x4A100D00) -#define CPSW_ALE_CONTROL ((volatile u32_t *)( lan8710a_state.regs_cpsw_ale + 0x08)) -#define CPSW_ALE_PORTCTL0 ((volatile u32_t *)( lan8710a_state.regs_cpsw_ale + 0x40)) -#define CPSW_ALE_PORTCTL1 ((volatile u32_t *)( lan8710a_state.regs_cpsw_ale + 0x44)) +#define CPSW_ALE_CONTROL ((volatile uint32_t *)( lan8710a_state.regs_cpsw_ale + 0x08)) +#define CPSW_ALE_PORTCTL0 ((volatile uint32_t *)( lan8710a_state.regs_cpsw_ale + 0x40)) +#define CPSW_ALE_PORTCTL1 ((volatile uint32_t *)( lan8710a_state.regs_cpsw_ale + 0x44)) #define CPSW_ALE_ENABLE (1 << 31) #define CPSW_ALE_BYPASS (1 << 4) @@ -90,13 +90,13 @@ /* CPSW_SL Registers */ #define CPSW_SL_BASE_ADR (0x4A100D80) -#define CPSW_SL_MACCONTROL(x) ((volatile u32_t *)( lan8710a_state.regs_cpsw_sl + ((x)-1)*64 + 0x04)) -#define CPSW_SL_SOFT_RESET(x) ((volatile u32_t *)( lan8710a_state.regs_cpsw_sl + ((x)-1)*64 + 0x0C)) -#define CPSW_SL_RX_MAXLEN(x) ((volatile u32_t *)( lan8710a_state.regs_cpsw_sl + ((x)-1)*64 + 0x10)) -#define CPSW_SL_BOFFTEST(x) ((volatile u32_t *)( lan8710a_state.regs_cpsw_sl + ((x)-1)*64 + 0x14)) -#define CPSW_SL_EMCONTROL(x) ((volatile u32_t *)( lan8710a_state.regs_cpsw_sl + ((x)-1)*64 + 0x20)) -#define CPSW_SL_RX_PRI_MAP(x) ((volatile u32_t *)( lan8710a_state.regs_cpsw_sl + ((x)-1)*64 + 0x24)) -#define CPSW_SL_TX_GAP(x) ((volatile u32_t *)( lan8710a_state.regs_cpsw_sl + ((x)-1)*64 + 0x28)) +#define CPSW_SL_MACCONTROL(x) ((volatile uint32_t *)( lan8710a_state.regs_cpsw_sl + ((x)-1)*64 + 0x04)) +#define CPSW_SL_SOFT_RESET(x) ((volatile uint32_t *)( lan8710a_state.regs_cpsw_sl + ((x)-1)*64 + 0x0C)) +#define CPSW_SL_RX_MAXLEN(x) ((volatile uint32_t *)( lan8710a_state.regs_cpsw_sl + ((x)-1)*64 + 0x10)) +#define CPSW_SL_BOFFTEST(x) ((volatile uint32_t *)( lan8710a_state.regs_cpsw_sl + ((x)-1)*64 + 0x14)) +#define CPSW_SL_EMCONTROL(x) ((volatile uint32_t *)( lan8710a_state.regs_cpsw_sl + ((x)-1)*64 + 0x20)) +#define CPSW_SL_RX_PRI_MAP(x) ((volatile uint32_t *)( lan8710a_state.regs_cpsw_sl + ((x)-1)*64 + 0x24)) +#define CPSW_SL_TX_GAP(x) ((volatile uint32_t *)( lan8710a_state.regs_cpsw_sl + ((x)-1)*64 + 0x28)) #define CPSW_SL_GMII_EN (1 << 5) #define CPSW_SL_FULLDUPLEX (1 << 0) @@ -105,30 +105,30 @@ /* CPSW_STATS Registers */ #define CPSW_STATS_BASE_ADR (0x4A100900) #define CPSW_STATS_MEM_LIMIT (0x90) -#define CPSW_STAT_RX_GOOD ((volatile u32_t *)( lan8710a_state.regs_cpsw_stats + 0x00)) -#define CPSW_STAT_RX_CRC_ERR ((volatile u32_t *)( lan8710a_state.regs_cpsw_stats + 0x10)) -#define CPSW_STAT_RX_AGNCD_ERR ((volatile u32_t *)( lan8710a_state.regs_cpsw_stats + 0x14)) -#define CPSW_STAT_RX_OVERSIZE ((volatile u32_t *)( lan8710a_state.regs_cpsw_stats + 0x18)) -#define CPSW_STAT_TX_GOOD ((volatile u32_t *)( lan8710a_state.regs_cpsw_stats + 0x34)) -#define CPSW_STAT_COLLISIONS ((volatile u32_t *)( lan8710a_state.regs_cpsw_stats + 0x48)) -#define CPSW_STAT_TX_UNDERRUN ((volatile u32_t *)( lan8710a_state.regs_cpsw_stats + 0x5C)) -#define CPSW_STAT_CARR_SENS_ERR ((volatile u32_t *)( lan8710a_state.regs_cpsw_stats + 0x60)) -#define CPSW_STAT_RX_OVERRUN ((volatile u32_t *)( lan8710a_state.regs_cpsw_stats + 0x8C)) +#define CPSW_STAT_RX_GOOD ((volatile uint32_t *)( lan8710a_state.regs_cpsw_stats + 0x00)) +#define CPSW_STAT_RX_CRC_ERR ((volatile uint32_t *)( lan8710a_state.regs_cpsw_stats + 0x10)) +#define CPSW_STAT_RX_AGNCD_ERR ((volatile uint32_t *)( lan8710a_state.regs_cpsw_stats + 0x14)) +#define CPSW_STAT_RX_OVERSIZE ((volatile uint32_t *)( lan8710a_state.regs_cpsw_stats + 0x18)) +#define CPSW_STAT_TX_GOOD ((volatile uint32_t *)( lan8710a_state.regs_cpsw_stats + 0x34)) +#define CPSW_STAT_COLLISIONS ((volatile uint32_t *)( lan8710a_state.regs_cpsw_stats + 0x48)) +#define CPSW_STAT_TX_UNDERRUN ((volatile uint32_t *)( lan8710a_state.regs_cpsw_stats + 0x5C)) +#define CPSW_STAT_CARR_SENS_ERR ((volatile uint32_t *)( lan8710a_state.regs_cpsw_stats + 0x60)) +#define CPSW_STAT_RX_OVERRUN ((volatile uint32_t *)( lan8710a_state.regs_cpsw_stats + 0x8C)) /* CPSW_CPDMA Registers */ #define CPSW_CPDMA_BASE_ADR (0x4A100800) -#define CPDMA_SOFT_RESET ((volatile u32_t *)( lan8710a_state.regs_cpsw_cpdma + 0x1C)) -#define CPDMA_TX_CONTROL ((volatile u32_t *)( lan8710a_state.regs_cpsw_cpdma + 0x04)) -#define CPDMA_RX_CONTROL ((volatile u32_t *)( lan8710a_state.regs_cpsw_cpdma + 0x14)) -#define CPDMA_CONTROL ((volatile u32_t *)( lan8710a_state.regs_cpsw_cpdma + 0x20)) -#define CPDMA_STATUS ((volatile u32_t *)( lan8710a_state.regs_cpsw_cpdma + 0x24)) -#define CPDMA_RX_BUFFER_OFFSET ((volatile u32_t *)( lan8710a_state.regs_cpsw_cpdma + 0x28)) -#define CPDMA_EMCONTROL ((volatile u32_t *)( lan8710a_state.regs_cpsw_cpdma + 0x2C)) -#define CPDMA_TX_INTMASK_SET ((volatile u32_t *)( lan8710a_state.regs_cpsw_cpdma + 0x88)) -#define CPDMA_TX_INTMASK_CLEAR ((volatile u32_t *)( lan8710a_state.regs_cpsw_cpdma + 0x8C)) -#define CPDMA_EOI_VECTOR ((volatile u32_t *)( lan8710a_state.regs_cpsw_cpdma + 0x94)) -#define CPDMA_RX_INTMASK_SET ((volatile u32_t *)( lan8710a_state.regs_cpsw_cpdma + 0xA8)) -#define CPDMA_RX_INTMASK_CLEAR ((volatile u32_t *)( lan8710a_state.regs_cpsw_cpdma + 0xAC)) +#define CPDMA_SOFT_RESET ((volatile uint32_t *)( lan8710a_state.regs_cpsw_cpdma + 0x1C)) +#define CPDMA_TX_CONTROL ((volatile uint32_t *)( lan8710a_state.regs_cpsw_cpdma + 0x04)) +#define CPDMA_RX_CONTROL ((volatile uint32_t *)( lan8710a_state.regs_cpsw_cpdma + 0x14)) +#define CPDMA_CONTROL ((volatile uint32_t *)( lan8710a_state.regs_cpsw_cpdma + 0x20)) +#define CPDMA_STATUS ((volatile uint32_t *)( lan8710a_state.regs_cpsw_cpdma + 0x24)) +#define CPDMA_RX_BUFFER_OFFSET ((volatile uint32_t *)( lan8710a_state.regs_cpsw_cpdma + 0x28)) +#define CPDMA_EMCONTROL ((volatile uint32_t *)( lan8710a_state.regs_cpsw_cpdma + 0x2C)) +#define CPDMA_TX_INTMASK_SET ((volatile uint32_t *)( lan8710a_state.regs_cpsw_cpdma + 0x88)) +#define CPDMA_TX_INTMASK_CLEAR ((volatile uint32_t *)( lan8710a_state.regs_cpsw_cpdma + 0x8C)) +#define CPDMA_EOI_VECTOR ((volatile uint32_t *)( lan8710a_state.regs_cpsw_cpdma + 0x94)) +#define CPDMA_RX_INTMASK_SET ((volatile uint32_t *)( lan8710a_state.regs_cpsw_cpdma + 0xA8)) +#define CPDMA_RX_INTMASK_CLEAR ((volatile uint32_t *)( lan8710a_state.regs_cpsw_cpdma + 0xAC)) #define CPDMA_IDLE (1 << 31) #define CPDMA_TX_RLIM (0xFF << 8) @@ -147,9 +147,9 @@ /* CPSW_SS Registers */ #define CPSW_SS_BASE_ADR (0x4A100000) -#define CPSW_SS_SOFT_RESET ((volatile u32_t *)( lan8710a_state.regs_cpsw_ss + 0x08)) -#define CPSW_SS_STAT_PORT_EN ((volatile u32_t *)( lan8710a_state.regs_cpsw_ss + 0x0C)) -#define CPSW_SS_TX_START_WDS ((volatile u32_t *)( lan8710a_state.regs_cpsw_ss + 0x20)) +#define CPSW_SS_SOFT_RESET ((volatile uint32_t *)( lan8710a_state.regs_cpsw_ss + 0x08)) +#define CPSW_SS_STAT_PORT_EN ((volatile uint32_t *)( lan8710a_state.regs_cpsw_ss + 0x0C)) +#define CPSW_SS_TX_START_WDS ((volatile uint32_t *)( lan8710a_state.regs_cpsw_ss + 0x20)) #define CPSW_P2_STAT_EN (1 << 2) #define CPSW_P1_STAT_EN (1 << 1) @@ -157,23 +157,23 @@ /* CPSW_WR Registers */ #define CPSW_WR_BASE_ADR (0x4A101200) -#define CPSW_WR_INT_CONTROL ((volatile u32_t *)( lan8710a_state.regs_cpsw_wr + 0x0C)) -#define CPSW_WR_C0_RX_EN ((volatile u32_t *)( lan8710a_state.regs_cpsw_wr + 0x14)) -#define CPSW_WR_C1_RX_EN ((volatile u32_t *)( lan8710a_state.regs_cpsw_wr + 0x24)) -#define CPSW_WR_C2_RX_EN ((volatile u32_t *)( lan8710a_state.regs_cpsw_wr + 0x34)) -#define CPSW_WR_C0_RX_STAT ((volatile u32_t *)( lan8710a_state.regs_cpsw_wr + 0x44)) -#define CPSW_WR_C0_TX_EN ((volatile u32_t *)( lan8710a_state.regs_cpsw_wr + 0x18)) -#define CPSW_WR_C0_TX_STAT ((volatile u32_t *)( lan8710a_state.regs_cpsw_wr + 0x48)) +#define CPSW_WR_INT_CONTROL ((volatile uint32_t *)( lan8710a_state.regs_cpsw_wr + 0x0C)) +#define CPSW_WR_C0_RX_EN ((volatile uint32_t *)( lan8710a_state.regs_cpsw_wr + 0x14)) +#define CPSW_WR_C1_RX_EN ((volatile uint32_t *)( lan8710a_state.regs_cpsw_wr + 0x24)) +#define CPSW_WR_C2_RX_EN ((volatile uint32_t *)( lan8710a_state.regs_cpsw_wr + 0x34)) +#define CPSW_WR_C0_RX_STAT ((volatile uint32_t *)( lan8710a_state.regs_cpsw_wr + 0x44)) +#define CPSW_WR_C0_TX_EN ((volatile uint32_t *)( lan8710a_state.regs_cpsw_wr + 0x18)) +#define CPSW_WR_C0_TX_STAT ((volatile uint32_t *)( lan8710a_state.regs_cpsw_wr + 0x48)) #define CPSW_FIRST_CHAN_INT (1 << 0) #define CPSW_ALL_CHAN_INT (0xFF << 0) /* INTERRUPTION CONTROLLER Registers */ #define INTC_BASE_ADR (0x48200000) -#define INTC_SYSCONFIG ((volatile u32_t *)( lan8710a_state.regs_intc + 0x10)) -#define INTC_IDLE ((volatile u32_t *)( lan8710a_state.regs_intc + 0x50)) -#define INTC_MIR_CLEAR1 ((volatile u32_t *)( lan8710a_state.regs_intc + 0xA8)) -#define INTC_ILR(x) ((volatile u32_t *)( lan8710a_state.regs_intc + 0x100 + 4*(x))) +#define INTC_SYSCONFIG ((volatile uint32_t *)( lan8710a_state.regs_intc + 0x10)) +#define INTC_IDLE ((volatile uint32_t *)( lan8710a_state.regs_intc + 0x50)) +#define INTC_MIR_CLEAR1 ((volatile uint32_t *)( lan8710a_state.regs_intc + 0xA8)) +#define INTC_ILR(x) ((volatile uint32_t *)( lan8710a_state.regs_intc + 0x100 + 4*(x))) #define INTC_AUTOIDLE (1 << 0) #define INTC_FUNCIDLE (1 << 0) @@ -184,10 +184,10 @@ /* DMA STATERAM Registers */ #define CPDMA_STRAM_BASE_ADR (0x4A100A00) -#define CPDMA_STRAM_TX_HDP(x) ((volatile u32_t *)( lan8710a_state.regs_cpdma_stram + 4*(x))) -#define CPDMA_STRAM_RX_HDP(x) ((volatile u32_t *)( lan8710a_state.regs_cpdma_stram + 0x20 + 4*(x))) -#define CPDMA_STRAM_TX_CP(x) ((volatile u32_t *)( lan8710a_state.regs_cpdma_stram + 0x40 + 4*(x))) -#define CPDMA_STRAM_RX_CP(x) ((volatile u32_t *)( lan8710a_state.regs_cpdma_stram + 0x60 + 4*(x))) +#define CPDMA_STRAM_TX_HDP(x) ((volatile uint32_t *)( lan8710a_state.regs_cpdma_stram + 4*(x))) +#define CPDMA_STRAM_RX_HDP(x) ((volatile uint32_t *)( lan8710a_state.regs_cpdma_stram + 0x20 + 4*(x))) +#define CPDMA_STRAM_TX_CP(x) ((volatile uint32_t *)( lan8710a_state.regs_cpdma_stram + 0x40 + 4*(x))) +#define CPDMA_STRAM_RX_CP(x) ((volatile uint32_t *)( lan8710a_state.regs_cpdma_stram + 0x60 + 4*(x))) #define ALL_BITS (0xFFFFFFFF) diff --git a/minix/drivers/net/lance/lance.c b/minix/drivers/net/lance/lance.c index f32ea6f00..90811384c 100644 --- a/minix/drivers/net/lance/lance.c +++ b/minix/drivers/net/lance/lance.c @@ -841,7 +841,7 @@ static void lance_init_hw(ether_card_t *ec, netdriver_addr_t *addr, static uint8_t in_byte(port_t port) { int r; - u32_t value; + uint32_t value; r= sys_inb(port, &value); if (r != OK) @@ -855,7 +855,7 @@ static uint8_t in_byte(port_t port) static uint16_t in_word(port_t port) { int r; - u32_t value; + uint32_t value; r= sys_inw(port, &value); if (r != OK) diff --git a/minix/drivers/net/rtl8139/rtl8139.c b/minix/drivers/net/rtl8139/rtl8139.c index d900ceb63..e515a0db2 100644 --- a/minix/drivers/net/rtl8139/rtl8139.c +++ b/minix/drivers/net/rtl8139/rtl8139.c @@ -19,21 +19,21 @@ static re_t re_state; static unsigned my_inb(uint16_t port) { - u32_t value; + uint32_t value; int s; if ((s=sys_inb(port, &value)) !=OK) printf("RTL8139: warning, sys_inb failed: %d\n", s); return value; } static unsigned my_inw(uint16_t port) { - u32_t value; + uint32_t value; int s; if ((s=sys_inw(port, &value)) !=OK) printf("RTL8139: warning, sys_inw failed: %d\n", s); return value; } static unsigned my_inl(uint16_t port) { - u32_t value; + uint32_t value; int s; if ((s=sys_inl(port, &value)) !=OK) printf("RTL8139: warning, sys_inl failed: %d\n", s); @@ -53,7 +53,7 @@ static void my_outw(uint16_t port, uint16_t value) { if ((s=sys_outw(port, value)) !=OK) printf("RTL8139: warning, sys_outw failed: %d\n", s); } -static void my_outl(uint16_t port, u32_t value) { +static void my_outl(uint16_t port, uint32_t value) { int s; if ((s=sys_outl(port, value)) !=OK) printf("RTL8139: warning, sys_outl failed: %d\n", s); @@ -259,7 +259,7 @@ static int rl_probe(re_t *rep, unsigned int skip) { int r, devind; uint16_t cr, vid, did; - u32_t bar; + uint32_t bar; uint8_t ilr; #if VERBOSE const char *dname; @@ -406,7 +406,7 @@ static void rl_init_hw(re_t *rep, netdriver_addr_t *addr, static void rl_reset_hw(re_t *rep) { port_t port; - u32_t t; + uint32_t t; phys_bytes bus_buf; int i; @@ -515,7 +515,7 @@ static void rl_set_hwaddr(const netdriver_addr_t *addr) { re_t *rep; port_t port; - u32_t w; + uint32_t w; int i; rep = &re_state; @@ -574,7 +574,7 @@ static void rl_confaddr(re_t *rep, netdriver_addr_t *addr, static void rl_rec_mode(re_t *rep) { port_t port; - u32_t rcr; + uint32_t rcr; port= rep->re_base_port; rcr= rl_inl(port, RL_RCR); @@ -599,7 +599,7 @@ static ssize_t rl_recv(struct netdriver_data *data, size_t max) port_t port; unsigned amount, totlen, packlen; uint16_t d_start, d_end; - u32_t l, rxstat; + uint32_t l, rxstat; re_t *rep; rep= &re_state; @@ -632,7 +632,7 @@ static ssize_t rl_recv(struct netdriver_data *data, size_t max) else amount= d_end+RX_BUFSIZE - d_start; - rxstat = *(u32_t *) (rep->v_re_rx_buf + d_start); + rxstat = *(uint32_t *) (rep->v_re_rx_buf + d_start); /* Should convert from little endian to host byte order */ @@ -1175,7 +1175,7 @@ static void rl_do_reset(re_t *rep) static void dump_phy(re_t *rep) { port_t port; - u32_t t; + uint32_t t; port= rep->re_base_port; @@ -1273,7 +1273,7 @@ static int rl_handler(re_t *rep) { int i, port, tx_head, tx_tail, link_up; uint16_t isr, tsad; - u32_t tsd, tcr, ertxth; + uint32_t tsd, tcr, ertxth; port= rep->re_base_port; diff --git a/minix/drivers/net/rtl8139/rtl8139.h b/minix/drivers/net/rtl8139/rtl8139.h index 0f6372e94..f791cd983 100644 --- a/minix/drivers/net/rtl8139/rtl8139.h +++ b/minix/drivers/net/rtl8139/rtl8139.h @@ -467,7 +467,7 @@ typedef struct re phys_bytes ret_buf; char * v_ret_buf; } re_tx[N_TX_BUF]; - u32_t re_ertxth; /* Early Tx Threshold */ + uint32_t re_ertxth; /* Early Tx Threshold */ int re_hook_id; /* IRQ hook id at kernel */ } re_t; diff --git a/minix/drivers/net/rtl8169/rtl8169.c b/minix/drivers/net/rtl8169/rtl8169.c index 4038cf6b4..3f6177e8b 100644 --- a/minix/drivers/net/rtl8169/rtl8169.c +++ b/minix/drivers/net/rtl8169/rtl8169.c @@ -27,30 +27,30 @@ typedef struct re_desc { - u32_t status; /* command/status */ - u32_t vlan; /* VLAN */ - u32_t addr_low; /* low 32-bits of physical buffer address */ - u32_t addr_high; /* high 32-bits of physical buffer address */ + uint32_t status; /* command/status */ + uint32_t vlan; /* VLAN */ + uint32_t addr_low; /* low 32-bits of physical buffer address */ + uint32_t addr_high; /* high 32-bits of physical buffer address */ } re_desc; typedef struct re_dtcc { - u32_t TxOk_low; /* low 32-bits of Tx Ok packets */ - u32_t TxOk_high; /* high 32-bits of Tx Ok packets */ - u32_t RxOk_low; /* low 32-bits of Rx Ok packets */ - u32_t RxOk_high; /* high 32-bits of Rx Ok packets */ - u32_t TxEr_low; /* low 32-bits of Tx errors */ - u32_t TxEr_high; /* high 32-bits of Tx errors */ - u32_t RxEr; /* Rx errors */ + uint32_t TxOk_low; /* low 32-bits of Tx Ok packets */ + uint32_t TxOk_high; /* high 32-bits of Tx Ok packets */ + uint32_t RxOk_low; /* low 32-bits of Rx Ok packets */ + uint32_t RxOk_high; /* high 32-bits of Rx Ok packets */ + uint32_t TxEr_low; /* low 32-bits of Tx errors */ + uint32_t TxEr_high; /* high 32-bits of Tx errors */ + uint32_t RxEr; /* Rx errors */ uint16_t MissPkt; /* Missed packets */ uint16_t FAE; /* Frame Alignment Error packets (MII only) */ - u32_t Tx1Col; /* Tx Ok packets with 1 collision before Tx */ - u32_t TxMCol; /* Tx Ok packets with 2..15 collisions */ - u32_t RxOkPhy_low; /* low 32-bits of Rx Ok packets for us */ - u32_t RxOkPhy_high; /* high 32-bits of Rx Ok packets for us */ - u32_t RxOkBrd_low; /* low 32-bits of Rx Ok broadcast packets */ - u32_t RxOkBrd_high; /* high 32-bits of Rx Ok broadcast packets */ - u32_t RxOkMul; /* Rx Ok multicast packets */ + uint32_t Tx1Col; /* Tx Ok packets with 1 collision before Tx */ + uint32_t TxMCol; /* Tx Ok packets with 2..15 collisions */ + uint32_t RxOkPhy_low; /* low 32-bits of Rx Ok packets for us */ + uint32_t RxOkPhy_high; /* high 32-bits of Rx Ok packets for us */ + uint32_t RxOkBrd_low; /* low 32-bits of Rx Ok broadcast packets */ + uint32_t RxOkBrd_high; /* high 32-bits of Rx Ok broadcast packets */ + uint32_t RxOkMul; /* Rx Ok multicast packets */ uint16_t TxAbt; /* Tx abort packets */ uint16_t TxUndrn; /* Tx underrun packets */ } re_dtcc; @@ -65,7 +65,7 @@ typedef struct re { int re_report_link; int re_need_reset; int re_tx_alive; - u32_t re_mac; + uint32_t re_mac; const char *re_model; /* Rx */ @@ -92,15 +92,15 @@ typedef struct re { int re_hook_id; /* IRQ hook id at kernel */ phys_bytes dtcc_buf; /* Dump Tally Counter buffer physical */ re_dtcc *v_dtcc_buf; /* Dump Tally Counter buffer */ - u32_t dtcc_counter; /* DTCC update counter */ - u32_t interrupts; + uint32_t dtcc_counter; /* DTCC update counter */ + uint32_t interrupts; } re_t; static re_t re_state; static unsigned my_inb(uint16_t port) { - u32_t value; + uint32_t value; int s; if ((s = sys_inb(port, &value)) != OK) printf("RTL8169: warning, sys_inb failed: %d\n", s); @@ -108,7 +108,7 @@ static unsigned my_inb(uint16_t port) } static unsigned my_inw(uint16_t port) { - u32_t value; + uint32_t value; int s; if ((s = sys_inw(port, &value)) != OK) printf("RTL8169: warning, sys_inw failed: %d\n", s); @@ -116,7 +116,7 @@ static unsigned my_inw(uint16_t port) } static unsigned my_inl(uint16_t port) { - u32_t value; + uint32_t value; int s; if ((s = sys_inl(port, &value)) != OK) printf("RTL8169: warning, sys_inl failed: %d\n", s); @@ -140,7 +140,7 @@ static void my_outw(uint16_t port, uint16_t value) if ((s = sys_outw(port, value)) != OK) printf("RTL8169: warning, sys_outw failed: %d\n", s); } -static void my_outl(uint16_t port, u32_t value) +static void my_outl(uint16_t port, uint32_t value) { int s; @@ -401,7 +401,7 @@ static int rl_probe(re_t *rep, unsigned int skip) { int r, devind; uint16_t vid, did; - u32_t bar; + uint32_t bar; uint8_t ilr; #if VERBOSE const char *dname; @@ -677,7 +677,7 @@ static void rtl8169scd_phy_config(port_t port) static void rl_reset_hw(re_t *rep) { port_t port; - u32_t t; + uint32_t t; int i; port = rep->re_base_port; @@ -849,7 +849,7 @@ static void rl_set_hwaddr(const netdriver_addr_t *addr) { re_t *rep; port_t port; - u32_t w; + uint32_t w; int i; rep = &re_state; @@ -873,8 +873,8 @@ static void rl_set_hwaddr(const netdriver_addr_t *addr) static void rl_rec_mode(re_t *rep) { port_t port; - u32_t rcr; - u32_t mc_filter[2]; /* Multicast hash filter */ + uint32_t rcr; + uint32_t mc_filter[2]; /* Multicast hash filter */ port = rep->re_base_port; @@ -903,7 +903,7 @@ static ssize_t rl_recv(struct netdriver_data *data, size_t max) port_t port; unsigned totlen, packlen; re_desc *desc; - u32_t rxstat; + uint32_t rxstat; re_t *rep; rep = &re_state; @@ -1140,7 +1140,7 @@ static void rl_do_reset(re_t *rep) static void dump_phy(const re_t *rep) { port_t port; - u32_t t; + uint32_t t; port = rep->re_base_port; diff --git a/minix/drivers/net/virtio_net/virtio_net.c b/minix/drivers/net/virtio_net/virtio_net.c index 5f2dd679e..6d38ce379 100644 --- a/minix/drivers/net/virtio_net/virtio_net.c +++ b/minix/drivers/net/virtio_net/virtio_net.c @@ -133,8 +133,8 @@ virtio_net_probe(unsigned int skip) static void virtio_net_config(netdriver_addr_t * addr) { - u32_t mac14; - u32_t mac56; + uint32_t mac14; + uint32_t mac56; int i; if (virtio_host_supports(net_dev, VIRTIO_NET_F_MAC)) { @@ -152,7 +152,7 @@ virtio_net_config(netdriver_addr_t * addr) } if (virtio_host_supports(net_dev, VIRTIO_NET_F_STATUS)) { - dput(("Current Status %x", (u32_t)virtio_sread16(net_dev, 6))); + dput(("Current Status %x", (uint32_t)virtio_sread16(net_dev, 6))); } else { dput(("No status")); } diff --git a/minix/drivers/net/virtio_net/virtio_net.h b/minix/drivers/net/virtio_net/virtio_net.h index 161348f6d..d3ce1718d 100644 --- a/minix/drivers/net/virtio_net/virtio_net.h +++ b/minix/drivers/net/virtio_net/virtio_net.h @@ -137,7 +137,7 @@ typedef uint8_t virtio_net_ctrl_ack; * is available. */ struct virtio_net_ctrl_mac { - u32_t entries; + uint32_t entries; #define ETH_ALEN 6 uint8_t macs[][ETH_ALEN]; } __attribute__((packed)); diff --git a/minix/drivers/net/vt6105/io.h b/minix/drivers/net/vt6105/io.h index 8d533fc90..6df0c6fd0 100644 --- a/minix/drivers/net/vt6105/io.h +++ b/minix/drivers/net/vt6105/io.h @@ -6,8 +6,8 @@ #include "vt6105.h" /* I/O function */ -static uint8_t my_inb(u32_t port) { - u32_t value; +static uint8_t my_inb(uint32_t port) { + uint32_t value; int r; #ifdef DMA_BASE_IOMAP value = *(volatile uint8_t *)(port); @@ -19,8 +19,8 @@ static uint8_t my_inb(u32_t port) { } #define ndr_in8(port, offset) (my_inb((port) + (offset))) -static uint16_t my_inw(u32_t port) { - u32_t value; +static uint16_t my_inw(uint32_t port) { + uint32_t value; int r; #ifdef DMA_BASE_IOMAP value = *(volatile uint16_t *)(port); @@ -32,11 +32,11 @@ static uint16_t my_inw(u32_t port) { } #define ndr_in16(port, offset) (my_inw((port) + (offset))) -static u32_t my_inl(u32_t port) { - u32_t value; +static uint32_t my_inl(uint32_t port) { + uint32_t value; int r; #ifdef DMA_BASE_IOMAP - value = *(volatile u32_t *)(port); + value = *(volatile uint32_t *)(port); #else if ((r = sys_inl(port, &value)) != OK) printf("NDR: sys_inl failed: %d\n", r); @@ -45,7 +45,7 @@ static u32_t my_inl(u32_t port) { } #define ndr_in32(port, offset) (my_inl((port) + (offset))) -static void my_outb(u32_t port, u32_t value) { +static void my_outb(uint32_t port, uint32_t value) { int r; #ifdef DMA_BASE_IOMAP *(volatile uint8_t *)(port) = value; @@ -57,7 +57,7 @@ static void my_outb(u32_t port, u32_t value) { #define ndr_out8(port, offset, value) \ (my_outb(((port) + (offset)), (value))) -static void my_outw(u32_t port, u32_t value) { +static void my_outw(uint32_t port, uint32_t value) { int r; #ifdef DMA_BASE_IOMAP *(volatile uint16_t *)(port) = value; @@ -69,10 +69,10 @@ static void my_outw(u32_t port, u32_t value) { #define ndr_out16(port, offset, value) \ (my_outw(((port) + (offset)), (value))) -static void my_outl(u32_t port, u32_t value) { +static void my_outl(uint32_t port, uint32_t value) { int r; #ifdef DMA_BASE_IOMAP - *(volatile u32_t *)(port) = value; + *(volatile uint32_t *)(port) = value; #else if ((r = sys_outl(port, value)) != OK) printf("NDR: sys_outl failed: %d\n", r); diff --git a/minix/drivers/net/vt6105/vt6105.c b/minix/drivers/net/vt6105/vt6105.c index 74ae19980..2cdc3b40d 100644 --- a/minix/drivers/net/vt6105/vt6105.c +++ b/minix/drivers/net/vt6105/vt6105.c @@ -29,29 +29,29 @@ static void dev_handler(NDR_driver *pdev); static void dev_check_ints(NDR_driver *pdev); /* developer interface */ -static int dev_real_reset(u32_t *base); -static int dev_init_io(u32_t *base); -static int dev_init_mii(u32_t *base); -static void dev_intr_control(u32_t *base, int flag); -static void dev_rx_tx_control(u32_t *base, int flag); -static void dev_get_addr(u32_t *base, uint8_t *pa); -static int dev_check_link(u32_t *base); -static void dev_set_rec_mode(u32_t *base, int mode); -static void dev_start_tx(u32_t *base); -static u32_t dev_read_clear_intr_status(u32_t *base); +static int dev_real_reset(uint32_t *base); +static int dev_init_io(uint32_t *base); +static int dev_init_mii(uint32_t *base); +static void dev_intr_control(uint32_t *base, int flag); +static void dev_rx_tx_control(uint32_t *base, int flag); +static void dev_get_addr(uint32_t *base, uint8_t *pa); +static int dev_check_link(uint32_t *base); +static void dev_set_rec_mode(uint32_t *base, int mode); +static void dev_start_tx(uint32_t *base); +static uint32_t dev_read_clear_intr_status(uint32_t *base); static void dev_init_rx_desc(NDR_desc *desc_start, int index, size_t buf_size, phys_bytes buf_dma, int max_desc_num, phys_bytes desc_dma_start); static void dev_init_tx_desc(NDR_desc *desc_start, int index, size_t buf_size, phys_bytes buf_dma, int max_desc_num, phys_bytes desc_dma_start); -static void dev_set_desc_reg(u32_t *base, phys_bytes rx_addr, +static void dev_set_desc_reg(uint32_t *base, phys_bytes rx_addr, phys_bytes tx_addr); -static int dev_rx_ok_desc(u32_t *base, NDR_desc *desc, int index); -static int dev_rx_len_desc(u32_t *base, NDR_desc *desc, int index); -static void dev_set_rx_desc_done(u32_t *base, NDR_desc *desc, int index); -static void dev_set_tx_desc_prepare(u32_t *base, NDR_desc *desc, int index, +static int dev_rx_ok_desc(uint32_t *base, NDR_desc *desc, int index); +static int dev_rx_len_desc(uint32_t *base, NDR_desc *desc, int index); +static void dev_set_rx_desc_done(uint32_t *base, NDR_desc *desc, int index); +static void dev_set_tx_desc_prepare(uint32_t *base, NDR_desc *desc, int index, size_t data_size); -static int dev_tx_ok_desc(u32_t *base, NDR_desc *desc, int index); -static void dev_set_tx_desc_done(u32_t *base, NDR_desc *desc, int index); +static int dev_tx_ok_desc(uint32_t *base, NDR_desc *desc, int index); +static void dev_set_tx_desc_done(uint32_t *base, NDR_desc *desc, int index); /* ======= Developer implemented function ======= */ /* ====== Self-defined function ======*/ @@ -59,8 +59,8 @@ static void dev_set_tx_desc_done(u32_t *base, NDR_desc *desc, int index); /* ====== Developer interface ======*/ /* Real hardware reset (### RESET_HARDWARE_CAN_FAIL ###) * -- Return OK means success, Others means failure */ -static int dev_real_reset(u32_t *base) { - u32_t base0 = base[0]; +static int dev_real_reset(uint32_t *base) { + uint32_t base0 = base[0]; ndr_out16(base0, REG_CR, CMD_RESET); micro_delay(5000); if (ndr_in16(base0, REG_CR) & CMD_RESET) { @@ -74,8 +74,8 @@ static int dev_real_reset(u32_t *base) { /* Intialize other hardware I/O registers (### INIT_HARDWARE_IO_CAN_FAIL ###) * -- Return OK means success, Others means failure */ -static int dev_init_io(u32_t *base) { - u32_t base0 = base[0]; +static int dev_init_io(uint32_t *base) { + uint32_t base0 = base[0]; uint8_t stick; stick = ndr_in8(base0, REG_STICK); ndr_out8(base0, REG_STICK, stick & 0xfc); @@ -87,8 +87,8 @@ static int dev_init_io(u32_t *base) { /* Intialize MII interface (### MII_INIT_CAN_FAIL ###) -- Return OK means success, Others means failure */ -static int dev_init_mii(u32_t *base) { - u32_t base0 = base[0]; +static int dev_init_mii(uint32_t *base) { + uint32_t base0 = base[0]; ndr_out8(base0, REG_MII_CR, 0); ndr_out8(base0, REG_MII_REG, 0x01); ndr_out8(base0, REG_MII_CR, 0x80); @@ -102,8 +102,8 @@ static int dev_init_mii(u32_t *base) { } /* Enable or disable interrupt (### INTR_ENABLE_DISABLE ###) */ -static void dev_intr_control(u32_t *base, int flag) { - u32_t data, base0 = base[0]; +static void dev_intr_control(uint32_t *base, int flag) { + uint32_t data, base0 = base[0]; data = ndr_in16(base0, REG_IMR); if (flag == INTR_ENABLE) ndr_out16(base0, REG_IMR, data | CMD_INTR_ENABLE); @@ -112,8 +112,8 @@ static void dev_intr_control(u32_t *base, int flag) { } /* Enable or disable Rx/Tx (### RX_TX_ENABLE_DISABLE ###) */ -static void dev_rx_tx_control(u32_t *base, int flag) { - u32_t data, base0 = base[0]; +static void dev_rx_tx_control(uint32_t *base, int flag) { + uint32_t data, base0 = base[0]; if (flag == RX_TX_ENABLE) { data = CMD_START | CMD_RX_ON | CMD_TX_ON | CMD_NO_POLL | CMD_FDUPLEX; ndr_out16(base0, REG_CR, data); @@ -124,16 +124,16 @@ static void dev_rx_tx_control(u32_t *base, int flag) { } /* Get MAC address to the array 'pa' (### GET_MAC_ADDR ###) */ -static void dev_get_addr(u32_t *base, uint8_t *pa) { - u32_t i, base0 = base[0]; +static void dev_get_addr(uint32_t *base, uint8_t *pa) { + uint32_t i, base0 = base[0]; for (i = 0; i < 6; i++) pa[i] = ndr_in8(base0, REG_ADDR + i); } /* Check link status (### CHECK_LINK ###) * -- Return LINK_UP or LINK_DOWN */ -static int dev_check_link(u32_t *base) { - u32_t data, base0 = base[0]; +static int dev_check_link(uint32_t *base) { + uint32_t data, base0 = base[0]; ndr_out8(base0, REG_MII_PHY, 0x01); ndr_out8(base0, REG_MII_REG, 0x01); ndr_out8(base0, REG_MII_CR, 0x40); @@ -147,8 +147,8 @@ static int dev_check_link(u32_t *base) { } /* Set driver receive mode (### SET_REC_MODE ###) */ -static void dev_set_rec_mode(u32_t *base, int mode) { - u32_t data, base0 = base[0]; +static void dev_set_rec_mode(uint32_t *base, int mode) { + uint32_t data, base0 = base[0]; data = ndr_in8(base0, REG_RCR); data &= ~(CMD_RCR_UNICAST | CMD_RCR_MULTICAST | CMD_RCR_BROADCAST); if (mode & NDEV_MODE_PROMISC) @@ -162,15 +162,15 @@ static void dev_set_rec_mode(u32_t *base, int mode) { } /* Start Tx channel (### START_TX_CHANNEL ###) */ -static void dev_start_tx(u32_t *base) { - u32_t data, base0 = base[0]; +static void dev_start_tx(uint32_t *base) { + uint32_t data, base0 = base[0]; data = ndr_in8(base0, REG_CR); ndr_out8(base0, REG_CR, data | CMD_TX_DEMAND); } /* Read and clear interrupt (### READ_CLEAR_INTR_STS ###) */ -static u32_t dev_read_clear_intr_status(u32_t *base) { - u32_t data, base0 = base[0]; +static uint32_t dev_read_clear_intr_status(uint32_t *base) { + uint32_t data, base0 = base[0]; data = ndr_in16(base0, REG_ISR); ndr_out16(base0, REG_ISR, data & INTR_STS_CLEAR); return data; @@ -203,9 +203,9 @@ static void dev_init_tx_desc(NDR_desc *desc_start, int index, size_t buf_size, } /* Set Rx/Tx descriptor address into device register (### SET_DESC_REG ###) */ -static void dev_set_desc_reg(u32_t *base, phys_bytes rx_addr, +static void dev_set_desc_reg(uint32_t *base, phys_bytes rx_addr, phys_bytes tx_addr) { - u32_t base0 = base[0]; + uint32_t base0 = base[0]; ndr_out32(base0, REG_RX_DESC_BASE, rx_addr); ndr_out32(base0, REG_TX_DESC_BASE, tx_addr); } @@ -213,7 +213,7 @@ static void dev_set_desc_reg(u32_t *base, phys_bytes rx_addr, /* Check whether Rx is OK from Rx descriptor (### CHECK_RX_OK_FROM_DESC ###) * -- Current buffer number is index * -- Return RX_OK or RX_SUSPEND or RX_ERROR */ -static int dev_rx_ok_desc(u32_t *base, NDR_desc *desc, int index) { +static int dev_rx_ok_desc(uint32_t *base, NDR_desc *desc, int index) { if (!(desc->status & DESC_OWN)) { if (desc->status & DESC_RX_ERROR) return RX_ERROR; @@ -226,19 +226,19 @@ static int dev_rx_ok_desc(u32_t *base, NDR_desc *desc, int index) { /* Get length from Rx descriptor (### GET_RX_LENGTH_FROM_DESC ###) * -- Current buffer number is index * -- Return the length */ -static int dev_rx_len_desc(u32_t *base, NDR_desc *desc, int index) { +static int dev_rx_len_desc(uint32_t *base, NDR_desc *desc, int index) { return ((desc->status & DESC_RX_LENMASK) >> 16) - NDEV_ETH_PACKET_CRC; } /* Set Rx descriptor after Rx done (### SET_RX_DESC_DONE ###) * -- Current buffer number is index */ -static void dev_set_rx_desc_done(u32_t *base, NDR_desc *desc, int index) { +static void dev_set_rx_desc_done(uint32_t *base, NDR_desc *desc, int index) { desc->status = DESC_OWN; } /* Set Tx descriptor to prepare transmitting (### SET_TX_DESC_PREPARE) * -- Current buffer number is index */ -static void dev_set_tx_desc_prepare(u32_t *base, NDR_desc *desc, int index, +static void dev_set_tx_desc_prepare(uint32_t *base, NDR_desc *desc, int index, size_t data_size) { desc->status = DESC_OWN | DESC_FIRST | DESC_LAST; desc->length = 0x00e08000 | (data_size > 60 ? data_size : 60); @@ -247,7 +247,7 @@ static void dev_set_tx_desc_prepare(u32_t *base, NDR_desc *desc, int index, /* Check whether Tx is OK from Tx descriptor (### CHECK_TX_OK_FROM_DESC ###) * -- Current buffer number is index * -- Return TX_OK or TX_SUSPEND or TX_ERROR */ -static int dev_tx_ok_desc(u32_t *base, NDR_desc *desc, int index) { +static int dev_tx_ok_desc(uint32_t *base, NDR_desc *desc, int index) { if (!(desc->status & DESC_OWN)) { if (desc->status & DESC_TX_ERROR) return TX_ERROR; @@ -258,7 +258,7 @@ static int dev_tx_ok_desc(u32_t *base, NDR_desc *desc, int index) { /* Set Tx descriptor after Tx done (### SET_TX_DESC_DONE ###) * -- Current buffer number is index */ -static void dev_set_tx_desc_done(u32_t *base, NDR_desc *desc, int index) { +static void dev_set_tx_desc_done(uint32_t *base, NDR_desc *desc, int index) { desc->status = 0; } @@ -360,7 +360,7 @@ NDR_set_mode(unsigned int mode, const netdriver_addr_t * mcast_list __unused, /* Receive data */ static ssize_t NDR_recv(struct netdriver_data *data, size_t max) { NDR_driver *pdev = &g_driver; - u32_t totlen, packlen; + uint32_t totlen, packlen; int index, ret, offset = 0; NDR_desc *desc; @@ -462,7 +462,7 @@ static void NDR_intr(unsigned int mask) { static int dev_probe(NDR_driver *pdev, int instance) { int devind, ioflag, i; uint16_t cr, vid, did; - u32_t bar, size, base; + uint32_t bar, size, base; uint8_t irq, rev; uint8_t *reg; @@ -497,7 +497,7 @@ static int dev_probe(NDR_driver *pdev, int instance) { printf("NDR: Fail to map hardware registers from PCI\n"); return -EIO; } - pdev->base[i] = (u32_t)reg; + pdev->base[i] = (uint32_t)reg; } #else for (i = 0; i < 6; i++) @@ -707,7 +707,7 @@ static int dev_init_buf(NDR_driver *pdev) { /* Real handler interrupt */ static void dev_handler(NDR_driver *pdev) { - u32_t intr_status; + uint32_t intr_status; int tx_head, tx_tail, index, flag = 0, ret; NDR_desc *desc; diff --git a/minix/drivers/net/vt6105/vt6105.h b/minix/drivers/net/vt6105/vt6105.h index f0cbdbf93..909b94870 100644 --- a/minix/drivers/net/vt6105/vt6105.h +++ b/minix/drivers/net/vt6105/vt6105.h @@ -85,18 +85,18 @@ /* ======= Data Descriptor ======= */ typedef struct NDR_desc { - u32_t status; - u32_t length; - u32_t addr; - u32_t next; + uint32_t status; + uint32_t length; + uint32_t addr; + uint32_t next; } NDR_desc; /* Driver Data Structure */ typedef struct NDR_driver { char *dev_name; /* Device name */ uint16_t vid, did; /* Vendor and device ID */ - u32_t devind; /* Device index */ - u32_t base[6]; /* Base address */ + uint32_t devind; /* Device index */ + uint32_t base[6]; /* Base address */ char irq; /* IRQ number */ char revision; /* Revision ID */ diff --git a/minix/drivers/power/acpi/osminixxf.c b/minix/drivers/power/acpi/osminixxf.c index 35e037264..d64ca7571 100644 --- a/minix/drivers/power/acpi/osminixxf.c +++ b/minix/drivers/power/acpi/osminixxf.c @@ -58,24 +58,24 @@ extern struct machine machine; -static u32_t pci_inb(uint16_t port) { - u32_t value; +static uint32_t pci_inb(uint16_t port) { + uint32_t value; int s; if ((s=sys_inb(port, &value)) !=OK) printf("ACPI: warning, sys_inb failed: %d\n", s); return value; } -static u32_t pci_inw(uint16_t port) { - u32_t value; +static uint32_t pci_inw(uint16_t port) { + uint32_t value; int s; if ((s=sys_inw(port, &value)) !=OK) printf("ACPI: warning, sys_inw failed: %d\n", s); return value; } -static u32_t pci_inl(uint16_t port) { - u32_t value; +static uint32_t pci_inl(uint16_t port) { + uint32_t value; int s; if ((s=sys_inl(port, &value)) !=OK) printf("ACPI: warning, sys_inl failed: %d\n", s); @@ -94,7 +94,7 @@ static void pci_outw(uint16_t port, uint16_t value) { printf("ACPI: warning, sys_outw failed: %d\n", s); } -static void pci_outl(uint16_t port, u32_t value) { +static void pci_outl(uint16_t port, uint32_t value) { int s; if ((s=sys_outl(port, value)) !=OK) printf("ACPI: warning, sys_outl failed: %d\n", s); @@ -966,7 +966,7 @@ AcpiOsReadPciConfiguration ( PciId->Function, Register); break; case 32: - *(u32_t *)Value = PCII_RREG32_(PciId->Bus, PciId->Device, + *(uint32_t *)Value = PCII_RREG32_(PciId->Bus, PciId->Device, PciId->Function, Register); break; default: diff --git a/minix/drivers/power/tps65217/tps65217.c b/minix/drivers/power/tps65217/tps65217.c index c7d37b8ad..9760c3f53 100644 --- a/minix/drivers/power/tps65217/tps65217.c +++ b/minix/drivers/power/tps65217/tps65217.c @@ -249,7 +249,7 @@ static int lu_state_restore(void) { /* Restore the state. */ - u32_t value; + uint32_t value; ds_retrieve_u32("bus", &value); ds_delete_u32("bus"); diff --git a/minix/drivers/power/tps65950/tps65950.c b/minix/drivers/power/tps65950/tps65950.c index 29358f7eb..f00cc7d62 100644 --- a/minix/drivers/power/tps65950/tps65950.c +++ b/minix/drivers/power/tps65950/tps65950.c @@ -153,7 +153,7 @@ static int lu_state_restore(void) { /* Restore the state. */ - u32_t value; + uint32_t value; ds_retrieve_u32("bus", &value); ds_delete_u32("bus"); diff --git a/minix/drivers/printer/printer/printer.c b/minix/drivers/printer/printer/printer.c index 109c88738..023e48955 100644 --- a/minix/drivers/printer/printer/printer.c +++ b/minix/drivers/printer/printer/printer.c @@ -163,7 +163,7 @@ static ssize_t printer_write(devminor_t UNUSED(minor), u64_t UNUSED(position), { /* The printer is used by sending write requests to it. Process one. */ int retries; - u32_t status; + uint32_t status; /* Reject command if last write is not yet finished, the count is not * positive, or we're asked not to block. @@ -350,7 +350,7 @@ static void printer_intr(unsigned int UNUSED(mask)) * IRQ yet! */ - u32_t status; + uint32_t status; pvb_pair_t char_out[3]; if (oleft == 0) { diff --git a/minix/drivers/sensors/bmp085/bmp085.c b/minix/drivers/sensors/bmp085/bmp085.c index ac472df4e..57788b7e4 100644 --- a/minix/drivers/sensors/bmp085/bmp085.c +++ b/minix/drivers/sensors/bmp085/bmp085.c @@ -478,7 +478,7 @@ static int lu_state_restore(void) { /* Restore the state. */ - u32_t value; + uint32_t value; ds_retrieve_u32("bus", &value); ds_delete_u32("bus"); diff --git a/minix/drivers/sensors/sht21/sht21.c b/minix/drivers/sensors/sht21/sht21.c index 29348bcac..1ec14c244 100644 --- a/minix/drivers/sensors/sht21/sht21.c +++ b/minix/drivers/sensors/sht21/sht21.c @@ -381,7 +381,7 @@ static int lu_state_restore(void) { /* Restore the state. */ - u32_t value; + uint32_t value; ds_retrieve_u32("bus", &value); ds_delete_u32("bus"); diff --git a/minix/drivers/sensors/tsl2550/tsl2550.c b/minix/drivers/sensors/tsl2550/tsl2550.c index 2819e144f..b0009fa16 100644 --- a/minix/drivers/sensors/tsl2550/tsl2550.c +++ b/minix/drivers/sensors/tsl2550/tsl2550.c @@ -330,7 +330,7 @@ static int lu_state_restore(void) { /* Restore the state. */ - u32_t value; + uint32_t value; ds_retrieve_u32("bus", &value); ds_delete_u32("bus"); diff --git a/minix/drivers/storage/ahci/ahci.c b/minix/drivers/storage/ahci/ahci.c index ebb127628..6e225f669 100644 --- a/minix/drivers/storage/ahci/ahci.c +++ b/minix/drivers/storage/ahci/ahci.c @@ -121,7 +121,7 @@ /* Host Bus Adapter (HBA) state. */ static struct { - volatile u32_t *base; /* base address of memory-mapped registers */ + volatile uint32_t *base; /* base address of memory-mapped registers */ size_t size; /* size of memory-mapped register area */ int nr_ports; /* addressable number of ports (1..NR_PORTS) */ @@ -141,16 +141,16 @@ static struct port_state { int state; /* port state */ unsigned int flags; /* port flags */ - volatile u32_t *reg; /* memory-mapped port registers */ + volatile uint32_t *reg; /* memory-mapped port registers */ uint8_t *mem_base; /* primary memory buffer virtual address */ phys_bytes mem_phys; /* primary memory buffer physical address */ vir_bytes mem_size; /* primary memory buffer size */ /* the FIS, CL, CT[0] and TMP buffers are all in the primary buffer */ - u32_t *fis_base; /* FIS receive buffer virtual address */ + uint32_t *fis_base; /* FIS receive buffer virtual address */ phys_bytes fis_phys; /* FIS receive buffer physical address */ - u32_t *cl_base; /* command list buffer virtual address */ + uint32_t *cl_base; /* command list buffer virtual address */ phys_bytes cl_phys; /* command list buffer physical address */ uint8_t *ct_base[NR_CMDS]; /* command table virtual address */ phys_bytes ct_phys[NR_CMDS]; /* command table physical address */ @@ -162,7 +162,7 @@ static struct port_state { vir_bytes pad_size; /* sector padding buffer size */ u64_t lba_count; /* number of valid Logical Block Addresses */ - u32_t sector_size; /* medium sector size in bytes */ + uint32_t sector_size; /* medium sector size in bytes */ int open_count; /* number of times this port is opened */ @@ -175,7 +175,7 @@ static struct port_state { /* (only used for signature probing) */ int queue_depth; /* NCQ queue depth */ - u32_t pend_mask; /* commands not yet complete */ + uint32_t pend_mask; /* commands not yet complete */ struct { thread_id_t tid;/* ID of the worker thread */ minix_timer_t timer; /* timer associated with each request */ @@ -202,7 +202,7 @@ static clock_t ahci_flush_timeout; /* Timeout environment variable names and default values. */ static struct { char *name; /* environment variable name */ - u32_t default_ms; /* default in milliseconds */ + uint32_t default_ms; /* default in milliseconds */ clock_t *ptr; /* clock ticks value pointer */ } ahci_timevar[] = { { "ahci_init_timeout", SPINUP_TIMEOUT, &ahci_spinup_timeout }, @@ -826,10 +826,10 @@ static void ct_set_prdt(uint8_t *ct, prd_t *prdt, int nr_prds) { /* Fill in the PRDT part of a command table. */ - u32_t *p; + uint32_t *p; int i; - p = (u32_t *) &ct[AHCI_CT_PRDT_OFF]; + p = (uint32_t *) &ct[AHCI_CT_PRDT_OFF]; for (i = 0; i < nr_prds; i++, prdt++) { *p++ = prdt->vp_addr; @@ -849,7 +849,7 @@ static void port_set_cmd(struct port_state *ps, int cmd, cmd_fis_t *fis, * table and setting up a command list entry pointing to the table. */ uint8_t *ct; - u32_t *cl; + uint32_t *cl; vir_bytes size; /* Set a port-specific flag that tells us if the command being @@ -890,7 +890,7 @@ static void port_set_cmd(struct port_state *ps, int cmd, cmd_fis_t *fis, (nr_prds > 0 || packet != NULL)) ? AHCI_CL_PREFETCHABLE : 0) | (write ? AHCI_CL_WRITE : 0) | ((packet != NULL) ? AHCI_CL_ATAPI : 0) | - ((size / sizeof(u32_t)) << AHCI_CL_CFL_SHIFT); + ((size / sizeof(uint32_t)) << AHCI_CL_CFL_SHIFT); cl[2] = ps->ct_phys[cmd]; } @@ -942,7 +942,7 @@ static void port_check_cmds(struct port_state *ps) { /* Check what commands have completed, and finish them. */ - u32_t mask, done; + uint32_t mask, done; int i; /* See which commands have completed. */ @@ -1237,7 +1237,7 @@ static void port_override(struct port_state *ps) /* Override the port's BSY and/or DRQ flags. This may only be done * prior to starting the port. */ - u32_t cmd; + uint32_t cmd; cmd = port_read(ps, AHCI_PORT_CMD); port_write(ps, AHCI_PORT_CMD, cmd | AHCI_PORT_CMD_CLO); @@ -1256,7 +1256,7 @@ static void port_start(struct port_state *ps) /* Start the given port, allowing for the execution of commands and the * transfer of data on that port. */ - u32_t cmd; + uint32_t cmd; /* Reset status registers. */ port_write(ps, AHCI_PORT_SERR, ~0); @@ -1276,7 +1276,7 @@ static void port_stop(struct port_state *ps) { /* Stop the given port, if not already stopped. */ - u32_t cmd; + uint32_t cmd; cmd = port_read(ps, AHCI_PORT_CMD); @@ -1439,7 +1439,7 @@ static void port_connect(struct port_state *ps) /* A device has been found to be attached to this port. Start the port, * and do timed polling for its signature to become available. */ - u32_t status, sig; + uint32_t status, sig; dprintf(V_INFO, ("%s: device connected\n", ahci_portname(ps))); @@ -1524,7 +1524,7 @@ static void port_dev_check(struct port_state *ps) { /* Perform device detection by means of polling. */ - u32_t status, tfd; + uint32_t status, tfd; assert(ps->state == STATE_WAIT_DEV); @@ -1596,7 +1596,7 @@ static void port_intr(struct port_state *ps) { /* Process an interrupt on this port. */ - u32_t smask, emask; + uint32_t smask, emask; int success; if (ps->state == STATE_NO_PORT) { @@ -1885,7 +1885,7 @@ static void port_alloc(struct port_state *ps) */ size_t fis_off, tmp_off, ct_off; int i; size_t ct_offs[NR_CMDS]; - u32_t cmd; + uint32_t cmd; fis_off = AHCI_CL_SIZE + AHCI_FIS_SIZE - 1; fis_off -= fis_off % AHCI_FIS_SIZE; @@ -1908,11 +1908,11 @@ static void port_alloc(struct port_state *ps) panic("unable to allocate port memory"); memset(ps->mem_base, 0, ps->mem_size); - ps->cl_base = (u32_t *) ps->mem_base; + ps->cl_base = (uint32_t *) ps->mem_base; ps->cl_phys = ps->mem_phys; assert(ps->cl_phys % AHCI_CL_SIZE == 0); - ps->fis_base = (u32_t *) (ps->mem_base + fis_off); + ps->fis_base = (uint32_t *) (ps->mem_base + fis_off); ps->fis_phys = ps->mem_phys + fis_off; assert(ps->fis_phys % AHCI_FIS_SIZE == 0); @@ -1949,7 +1949,7 @@ static void port_free(struct port_state *ps) /* Disable FIS receipt for the given port, and free previously * allocated memory. */ - u32_t cmd; + uint32_t cmd; /* Disable FIS receive. */ cmd = port_read(ps, AHCI_PORT_CMD); @@ -1974,7 +1974,7 @@ static void port_init(struct port_state *ps) { /* Initialize the given port. */ - u32_t cmd; + uint32_t cmd; int i; /* Initialize the port state structure. */ @@ -1987,7 +1987,7 @@ static void port_init(struct port_state *ps) for (i = 0; i < NR_CMDS; i++) init_timer(&ps->cmd_info[i].timer); - ps->reg = (u32_t *) ((uint8_t *) hba_state.base + + ps->reg = (uint32_t *) ((uint8_t *) hba_state.base + AHCI_MEM_BASE_SIZE + AHCI_MEM_PORT_SIZE * (ps - port_state)); /* Allocate memory for the port. */ @@ -2043,7 +2043,7 @@ static void ahci_reset(void) { /* Reset the HBA. Do not enable AHCI mode afterwards. */ - u32_t ghc; + uint32_t ghc; ghc = hba_read(AHCI_HBA_GHC); @@ -2064,7 +2064,7 @@ static void ahci_init(int devind) { /* Initialize the device. */ - u32_t base, size, cap, ghc, mask; + uint32_t base, size, cap, ghc, mask; int r, port, ioflag; if ((r = pci_get_bar(devind, PCI_BAR_6, &base, &size, &ioflag)) != OK) @@ -2084,7 +2084,7 @@ static void ahci_init(int devind) hba_state.nr_ports = (size - AHCI_MEM_BASE_SIZE) / AHCI_MEM_PORT_SIZE; /* Map the register area into local memory. */ - hba_state.base = (u32_t *) vm_map_phys(SELF, (void *) base, size); + hba_state.base = (uint32_t *) vm_map_phys(SELF, (void *) base, size); hba_state.size = size; if (hba_state.base == MAP_FAILED) panic("unable to map HBA memory"); @@ -2190,7 +2190,7 @@ static void ahci_intr(unsigned int UNUSED(mask)) /* Process an interrupt. */ struct port_state *ps; - u32_t mask; + uint32_t mask; int r, port; /* Handle an interrupt for each port that has the interrupt bit set. */ diff --git a/minix/drivers/storage/ahci/ahci.h b/minix/drivers/storage/ahci/ahci.h index f79422978..f11c39bd3 100644 --- a/minix/drivers/storage/ahci/ahci.h +++ b/minix/drivers/storage/ahci/ahci.h @@ -133,7 +133,7 @@ /* Command List constants. */ #define AHCI_CL_ENTRY_SIZE 32 /* Command List header size */ -#define AHCI_CL_ENTRY_DWORDS (AHCI_CL_ENTRY_SIZE / sizeof(u32_t)) +#define AHCI_CL_ENTRY_DWORDS (AHCI_CL_ENTRY_SIZE / sizeof(uint32_t)) #define AHCI_CL_PRDTL_SHIFT 16 /* PRD Table Length */ #define AHCI_CL_PREFETCHABLE (1L << 7) /* Prefetchable */ @@ -230,7 +230,7 @@ #define AHCI_CL_SIZE 1024 /* size of command list buffer */ #define AHCI_TMP_SIZE ATA_ID_SIZE /* size of temporary storage buffer */ #define AHCI_TMP_ALIGN 2 /* required alignment for temp buf */ -#define AHCI_CT_SIZE (128 + NR_PRDS * sizeof(u32_t) * 4) +#define AHCI_CT_SIZE (128 + NR_PRDS * sizeof(uint32_t) * 4) /* size of command table buffer */ #define AHCI_CT_ALIGN 128 /* required alignment for CT buffer */ @@ -243,9 +243,9 @@ typedef struct { uint8_t cf_cmd; /* Command */ uint8_t cf_feat; /* Features */ - u32_t cf_lba; /* LBA (24-bit) */ + uint32_t cf_lba; /* LBA (24-bit) */ uint8_t cf_dev; /* Device */ - u32_t cf_lba_exp; /* LBA (exp) (24-bit) */ + uint32_t cf_lba_exp; /* LBA (exp) (24-bit) */ uint8_t cf_feat_exp; /* Features (exp) */ uint8_t cf_sec; /* Sector Count */ uint8_t cf_sec_exp; /* Sector Count (exp) */ diff --git a/minix/drivers/storage/at_wini/at_wini.c b/minix/drivers/storage/at_wini/at_wini.c index e530bea67..c41cb8574 100644 --- a/minix/drivers/storage/at_wini/at_wini.c +++ b/minix/drivers/storage/at_wini/at_wini.c @@ -54,7 +54,7 @@ static long w_atapi_dma; static int w_testing = 0; static int w_silent = 0; -static u32_t system_hz; +static uint32_t system_hz; /* The struct wini is indexed by drive (0-3). */ static struct wini { /* main drive struct, one entry per drive */ @@ -358,7 +358,7 @@ static void w_init(int devind, uint16_t vid, uint16_t did) int r, irq, native_hook, compat_hook, is_ide, nhooks; uint8_t bcr, scr, interface; uint16_t cr; - u32_t base_cmd, base_ctl, base_dma; + uint32_t base_cmd, base_ctl, base_dma; bcr= pci_attr_r8(devind, PCI_BCR); scr= pci_attr_r8(devind, PCI_SCR); @@ -552,10 +552,10 @@ static struct device *w_part(devminor_t device) #define id_byte(n) (&tmp_buf[2 * (n)]) #define id_word(n) (((uint16_t) id_byte(n)[0] << 0) \ |((uint16_t) id_byte(n)[1] << 8)) -#define id_longword(n) (((u32_t) id_byte(n)[0] << 0) \ - |((u32_t) id_byte(n)[1] << 8) \ - |((u32_t) id_byte(n)[2] << 16) \ - |((u32_t) id_byte(n)[3] << 24)) +#define id_longword(n) (((uint32_t) id_byte(n)[0] << 0) \ + |((uint32_t) id_byte(n)[1] << 8) \ + |((uint32_t) id_byte(n)[2] << 16) \ + |((uint32_t) id_byte(n)[3] << 24)) /*===========================================================================* * check_dma * @@ -563,7 +563,7 @@ static struct device *w_part(devminor_t device) static void check_dma(struct wini *wn) { - u32_t dma_status, dma_base; + uint32_t dma_status, dma_base; int id_dma, ultra_dma; uint16_t w; @@ -683,7 +683,7 @@ static int w_identify(void) wn->cylinders = id_word(1); wn->heads = id_word(3); wn->sectors = id_word(6); - size = (u32_t) wn->cylinders * wn->heads * wn->sectors; + size = (uint32_t) wn->cylinders * wn->heads * wn->sectors; w= id_word(ID_CAPABILITIES); if ((w & ID_CAP_LBA) && size > 512L*1024*2) { @@ -944,7 +944,7 @@ static void stop_dma(const struct wini *wn) static void start_dma(const struct wini *wn, int do_write) { - u32_t v; + uint32_t v; int r; /* Assume disk reads. Start DMA */ @@ -961,7 +961,7 @@ static void start_dma(const struct wini *wn, int do_write) static int error_dma(const struct wini *wn) { int r; - u32_t v; + uint32_t v; #define DMAERR(msg) \ printf("at_wini%ld: bad DMA: %s. Disabling DMA for drive %d.\n", \ @@ -1007,7 +1007,7 @@ static ssize_t w_transfer( iovec_t *iop, *iov_end = iov + nr_req; int r, s, errors, do_dma; unsigned long block; - u32_t w_status; + uint32_t w_status; u64_t dv_size; unsigned int n, nbytes; unsigned dma_buf_offset; @@ -1330,7 +1330,7 @@ static int setup_dma( phys_bytes user_phys; unsigned n, offset, size; int i, j, r; - u32_t v; + uint32_t v; struct wini *wn = w_wn; /* First try direct scatter/gather to the supplied buffers */ @@ -1572,7 +1572,7 @@ static void w_intr_wait(void) /* Wait for a task completion interrupt. */ int r; - u32_t w_status; + uint32_t w_status; message m; int ipc_status; @@ -1627,7 +1627,7 @@ static int at_intr_wait(void) { /* Wait for an interrupt, study the status bits and return error/success. */ int r, s; - u32_t inbval; + uint32_t inbval; w_intr_wait(); if ((w_wn->w_status & (STATUS_BSY | STATUS_WF | STATUS_ERR)) == 0) { @@ -1654,7 +1654,7 @@ int value; /* required status */ { /* Wait until controller is in the required state. Return zero on timeout. */ - u32_t w_status; + uint32_t w_status; spin_t spin; int s; @@ -1680,7 +1680,7 @@ unsigned value; /* required status */ { /* Wait until controller is in the required state. Return zero on timeout. */ - u32_t w_status; + uint32_t w_status; spin_t spin; int s; @@ -2116,7 +2116,7 @@ static void w_hw_int(unsigned int UNUSED(irqs)) { /* Leftover interrupt(s) received; ack it/them. For native drives only. */ unsigned int drive; - u32_t w_status; + uint32_t w_status; for (drive = 0; drive < MAX_DRIVES; drive++) { if (!(wini[drive].state & IGNORING) && wini[drive].native) { diff --git a/minix/drivers/storage/fbd/action.c b/minix/drivers/storage/fbd/action.c index adacc0183..f25ef9332 100644 --- a/minix/drivers/storage/fbd/action.c +++ b/minix/drivers/storage/fbd/action.c @@ -7,12 +7,12 @@ /*===========================================================================* * get_rand * *===========================================================================*/ -static u32_t get_rand(u32_t max) +static uint32_t get_rand(uint32_t max) { /* Las Vegas algorithm for getting a random number in the range from * 0 to max, inclusive. */ - u32_t val, top; + uint32_t val, top; /* Get an initial random number. */ val = lrand48() ^ (lrand48() << 1); @@ -24,7 +24,7 @@ static u32_t get_rand(u32_t max) * number from the range, throwing away any random numbers not below * this largest multiple. */ - top = (((u32_t) -1) / max) * max; + top = (((uint32_t) -1) / max) * max; while (val >= top) val = lrand48() ^ (lrand48() << 1); @@ -108,7 +108,7 @@ static void action_io_corrupt(struct fbd_rule *rule, char *buf, size_t size, u64_t pos, int UNUSED(flag)) { u64_t skip; - u32_t val; + uint32_t val; buf += get_range(rule, pos, &size, &skip); @@ -128,7 +128,7 @@ static void action_io_corrupt(struct fbd_rule *rule, char *buf, size_t size, val = ex64lo(skip); for ( ; size >= sizeof(val); size -= sizeof(val)) { - *((u32_t *) buf) = val ^ 0xdeadbeefUL; + *((uint32_t *) buf) = val ^ 0xdeadbeefUL; val += sizeof(val); buf += sizeof(val); @@ -180,7 +180,7 @@ static void action_pre_misdir(struct fbd_rule *rule, iovec_t *UNUSED(iov), /* Randomize the request position to fall within the range (and have * the alignment) given by the rule. */ - u32_t range, choice; + uint32_t range, choice; /* Unfortunately, we cannot interpret 0 as end as "up to end of disk" * here, because we have no idea about the actual disk size, and the diff --git a/minix/drivers/storage/filter/driver.c b/minix/drivers/storage/filter/driver.c index 352c00acd..a9e076008 100644 --- a/minix/drivers/storage/filter/driver.c +++ b/minix/drivers/storage/filter/driver.c @@ -1008,7 +1008,7 @@ void ds_event() { char key[DS_MAX_KEYLEN]; char *blkdriver_prefix = "drv.blk."; - u32_t value; + uint32_t value; int type; endpoint_t owner_endpoint; int r; diff --git a/minix/drivers/storage/floppy/floppy.c b/minix/drivers/storage/floppy/floppy.c index cd9514d19..c4299f9f2 100644 --- a/minix/drivers/storage/floppy/floppy.c +++ b/minix/drivers/storage/floppy/floppy.c @@ -237,7 +237,7 @@ static uint8_t f_results[MAX_RESULTS];/* the controller can give lots of output * floppy disk drive contains a 'fl_tmr_stop' timer. */ static minix_timer_t f_tmr_timeout; /* timer for various timeouts */ -static u32_t system_hz; /* system clock frequency */ +static uint32_t system_hz; /* system clock frequency */ static void f_expire_tmrs(clock_t stamp); static void stop_motor(int arg); static void f_timeout(int arg); @@ -942,7 +942,7 @@ static int fdc_results(void) */ int s, result_nr; - u32_t status; + uint32_t status; spin_t spin; /* Extract bytes from FDC until it says it has no more. The loop is @@ -959,7 +959,7 @@ static int fdc_results(void) panic("Sys_inb in fdc_results() failed: %d", s); status &= (MASTER | DIRECTION | CTL_BUSY); if (status == (MASTER | DIRECTION | CTL_BUSY)) { - u32_t tmp_r; + uint32_t tmp_r; if (result_nr >= MAX_RESULTS) break; /* too many results */ if ((s=sys_inb(FDC_DATA, &tmp_r)) != OK) panic("Sys_inb in fdc_results() failed: %d", s); @@ -1019,7 +1019,7 @@ static void fdc_out( */ spin_t spin; int s; - u32_t status; + uint32_t status; if (need_reset) return; /* if controller is not listening, return */ diff --git a/minix/drivers/storage/memory/memory.c b/minix/drivers/storage/memory/memory.c index ffa6b49ab..930fcc201 100644 --- a/minix/drivers/storage/memory/memory.c +++ b/minix/drivers/storage/memory/memory.c @@ -517,7 +517,7 @@ static int m_block_ioctl(devminor_t minor, unsigned long request, * - MIOCRAMSIZE: to set the size of the RAM disk. */ struct device *dv; - u32_t ramdev_size; + uint32_t ramdev_size; int s; void *mem; int is_imgrd = 0; @@ -555,7 +555,7 @@ static int m_block_ioctl(devminor_t minor, unsigned long request, return(EBUSY); } if(m_vaddrs[minor]) { - u32_t a, o; + uint32_t a, o; u64_t size; int r; if(ex64hi(dv->dv_size)) { diff --git a/minix/drivers/storage/mmc/mmchost_mmchs.c b/minix/drivers/storage/mmc/mmchost_mmchs.c index 1a098f1da..359d7b856 100644 --- a/minix/drivers/storage/mmc/mmchost_mmchs.c +++ b/minix/drivers/storage/mmc/mmchost_mmchs.c @@ -79,13 +79,13 @@ static struct log log = { #define HSMMCSD_0_FREQ_50MHZ 50000000 /* 50MHz */ void -mmc_set32(vir_bytes reg, u32_t mask, u32_t value) +mmc_set32(vir_bytes reg, uint32_t mask, uint32_t value) { assert(reg >= 0 && reg <= mmchs->io_size); set32(mmchs->io_base + reg, mask, value); } -u32_t +uint32_t mmc_read32(vir_bytes reg) { assert(reg >= 0 && reg <= mmchs->io_size); @@ -93,20 +93,20 @@ mmc_read32(vir_bytes reg) } void -mmc_write32(vir_bytes reg, u32_t value) +mmc_write32(vir_bytes reg, uint32_t value) { assert(reg >= 0 && reg <= mmchs->io_size); write32(mmchs->io_base + reg, value); } void -mmchs_set_bus_freq(u32_t freq) +mmchs_set_bus_freq(uint32_t freq) { - u32_t freq_in = HSMMCSD_0_IN_FREQ; - u32_t freq_out = freq; + uint32_t freq_in = HSMMCSD_0_IN_FREQ; + uint32_t freq_out = freq; /* Calculate and program the divisor */ - u32_t clkd = div_roundup(freq_in, freq_out); + uint32_t clkd = div_roundup(freq_in, freq_out); clkd = (clkd < 2) ? 2 : clkd; clkd = (clkd > 1023) ? 1023 : clkd; diff --git a/minix/drivers/storage/virtio_blk/virtio_blk.c b/minix/drivers/storage/virtio_blk/virtio_blk.c index cf3bc6a62..07f868a90 100644 --- a/minix/drivers/storage/virtio_blk/virtio_blk.c +++ b/minix/drivers/storage/virtio_blk/virtio_blk.c @@ -634,7 +634,7 @@ virtio_blk_feature_setup(void) static int virtio_blk_config(void) { - u32_t sectors_low, sectors_high, size_mbs; + uint32_t sectors_low, sectors_high, size_mbs; /* capacity is always there */ sectors_low = virtio_sread32(blk_dev, 0); @@ -642,7 +642,7 @@ virtio_blk_config(void) blk_config.capacity = ((u64_t)sectors_high << 32) | sectors_low; /* If this gets truncated, you have a big disk... */ - size_mbs = (u32_t)(blk_config.capacity * 512 / 1024 / 1024); + size_mbs = (uint32_t)(blk_config.capacity * 512 / 1024 / 1024); dprintf(("Capacity: %d MB", size_mbs)); /* do feature setup */ diff --git a/minix/drivers/storage/virtio_blk/virtio_blk.h b/minix/drivers/storage/virtio_blk/virtio_blk.h index e69cbcf79..3f26c7bbd 100644 --- a/minix/drivers/storage/virtio_blk/virtio_blk.h +++ b/minix/drivers/storage/virtio_blk/virtio_blk.h @@ -48,9 +48,9 @@ struct virtio_blk_config { /* The capacity (in 512-byte sectors). */ u64_t capacity; /* The maximum segment size (if VIRTIO_BLK_F_SIZE_MAX) */ - u32_t size_max; + uint32_t size_max; /* The maximum number of segments (if VIRTIO_BLK_F_SEG_MAX) */ - u32_t seg_max; + uint32_t seg_max; /* geometry the device (if VIRTIO_BLK_F_GEOMETRY) */ struct virtio_blk_geometry { uint16_t cylinders; @@ -59,7 +59,7 @@ struct virtio_blk_config { } geometry; /* block size of device (if VIRTIO_BLK_F_BLK_SIZE) */ - u32_t blk_size; + uint32_t blk_size; /* the next 4 entries are guarded by VIRTIO_BLK_F_TOPOLOGY */ /* exponent for physical block per logical block. */ @@ -69,7 +69,7 @@ struct virtio_blk_config { /* minimum I/O size without performance penalty in logical blocks. */ uint16_t min_io_size; /* optimal sustained I/O size in logical blocks. */ - u32_t opt_io_size; + uint32_t opt_io_size; } __attribute__((packed)); @@ -103,18 +103,18 @@ struct virtio_blk_config { /* This is the first element of the read scatter-gather list. */ struct virtio_blk_outhdr { /* VIRTIO_BLK_T* */ - u32_t type; + uint32_t type; /* io priority. */ - u32_t ioprio; + uint32_t ioprio; /* Sector (ie. 512 byte offset) */ u64_t sector; }; struct virtio_scsi_inhdr { - u32_t errors; - u32_t data_len; - u32_t sense_len; - u32_t residual; + uint32_t errors; + uint32_t data_len; + uint32_t sense_len; + uint32_t residual; }; /* And this is the final byte of the write scatter-gather list. */ diff --git a/minix/drivers/system/random/main.c b/minix/drivers/system/random/main.c index 9cdfb8dba..057fe72c3 100644 --- a/minix/drivers/system/random/main.c +++ b/minix/drivers/system/random/main.c @@ -234,7 +234,7 @@ static void r_random(clock_t UNUSED(stamp)) int s; static int bin = 0; static struct k_randomness_bin krandom_bin; - u32_t hi, lo; + uint32_t hi, lo; rand_t r; int nextperiod = random_isseeded() ? KRANDOM_PERIOD*500 : KRANDOM_PERIOD; diff --git a/minix/drivers/system/random/random.c b/minix/drivers/system/random/random.c index 73859135e..f1332bcbf 100644 --- a/minix/drivers/system/random/random.c +++ b/minix/drivers/system/random/random.c @@ -27,8 +27,8 @@ static SHA256_CTX pool_ctx[NR_POOLS]; static unsigned samples= 0; static int got_seeded= 0; static uint8_t random_key[2*AES_BLOCKSIZE]; -static u32_t count_lo, count_hi; -static u32_t reseed_count; +static uint32_t count_lo, count_hi; +static uint32_t reseed_count; static void add_sample(int source, unsigned long sample); static void data_block(rd_keyinstance *keyp, void *data); diff --git a/minix/drivers/tty/pty/tty.c b/minix/drivers/tty/pty/tty.c index 9a8a77e0e..b658c0092 100644 --- a/minix/drivers/tty/pty/tty.c +++ b/minix/drivers/tty/pty/tty.c @@ -85,7 +85,7 @@ static const char lined[TTLINEDNAMELEN] = "termios"; /* line discipline */ /* Global variables for the TTY task (declared extern in tty.h). */ tty_t tty_table[NR_PTYS]; -u32_t system_hz; +uint32_t system_hz; int tty_gid; static struct optset optset_table[] = { diff --git a/minix/drivers/tty/pty/tty.h b/minix/drivers/tty/pty/tty.h index cdc9ebbce..de3cd3de4 100644 --- a/minix/drivers/tty/pty/tty.h +++ b/minix/drivers/tty/pty/tty.h @@ -85,7 +85,7 @@ typedef struct tty { /* Memory allocated in tty.c, so extern here. */ extern tty_t tty_table[NR_PTYS]; -extern u32_t system_hz; /* system clock frequency */ +extern uint32_t system_hz; /* system clock frequency */ extern int tty_gid; /* group ID of the "tty" group */ /* Values for the fields. */ diff --git a/minix/drivers/tty/tty/arch/earm/rs232.c b/minix/drivers/tty/tty/arch/earm/rs232.c index f9a9e8777..faef37851 100644 --- a/minix/drivers/tty/tty/arch/earm/rs232.c +++ b/minix/drivers/tty/tty/arch/earm/rs232.c @@ -189,7 +189,7 @@ serial_out(rs232_t *rs, int offset, int val) static void rs_reset(rs232_t *rs) { - u32_t syss; + uint32_t syss; serial_out(rs, OMAP3_SYSC, UART_SYSC_SOFTRESET); diff --git a/minix/drivers/tty/tty/arch/i386/console.c b/minix/drivers/tty/tty/arch/i386/console.c index 3701643e1..49355e084 100644 --- a/minix/drivers/tty/tty/arch/i386/console.c +++ b/minix/drivers/tty/tty/arch/i386/console.c @@ -756,7 +756,7 @@ int reg; /* which register pair to set */ unsigned *val; /* 16-bit value to set it to */ { char v1, v2; - u32_t v; + uint32_t v; /* Get a register pair inside the 6845. */ sys_outb(vid_port + INDEX, reg); sys_inb(vid_port + DATA, &v); @@ -797,7 +797,7 @@ static void beep() */ static minix_timer_t tmr_stop_beep; pvb_pair_t char_out[3]; - u32_t port_b_val; + uint32_t port_b_val; if (beep_disabled()) return; @@ -868,7 +868,7 @@ clock_t dur; */ static minix_timer_t tmr_stop_beep; pvb_pair_t char_out[3]; - u32_t port_b_val; + uint32_t port_b_val; if (beep_disabled()) return; @@ -898,7 +898,7 @@ clock_t dur; static void stop_beep(int arg __unused) { /* Turn off the beeper by turning off bits 0 and 1 in PORT_B. */ - u32_t port_b_val; + uint32_t port_b_val; if (sys_inb(PORT_B, &port_b_val)==OK && sys_outb(PORT_B, (port_b_val & ~3))==OK) beeping = FALSE; diff --git a/minix/drivers/tty/tty/arch/i386/rs232.c b/minix/drivers/tty/tty/arch/i386/rs232.c index a61765262..a323cda7c 100644 --- a/minix/drivers/tty/tty/arch/i386/rs232.c +++ b/minix/drivers/tty/tty/arch/i386/rs232.c @@ -223,7 +223,7 @@ static void rs232_handler(rs232_t *rs); static int my_inb(port_t port) { int r; - u32_t v = 0; + uint32_t v = 0; r = sys_inb(port, &v); if (r != OK) printf("RS232 warning: failed inb 0x%x\n", port); @@ -443,7 +443,7 @@ static void rs_config(rs232_t *rs) void rs_init(tty_t *tp) /* tp which TTY */ { - u32_t dummy; + uint32_t dummy; /* Initialize RS232 for one line. */ register rs232_t *rs; @@ -657,7 +657,7 @@ static int rs_break_on(tty_t *tp, int UNUSED(dummy)) { /* Raise break condition. */ rs232_t *rs = tp->tty_priv; - u32_t line_controls; + uint32_t line_controls; int s; if ((s = sys_inb(rs->line_ctl_port, &line_controls)) != OK) @@ -673,7 +673,7 @@ static int rs_break_off(tty_t *tp, int UNUSED(dummy)) { /* Clear break condition. */ rs232_t *rs = tp->tty_priv; - u32_t line_controls; + uint32_t line_controls; int s; if ((s = sys_inb(rs->line_ctl_port, &line_controls)) != OK) @@ -708,7 +708,7 @@ static void rs232_handler(struct rs232 *rs) int trying = 1000; while (trying--) { - u32_t v; + uint32_t v; /* Loop to pick up ALL pending interrupts for device. * This usually just wastes time unless the hardware has a buffer * (and then we have to worry about being stuck in the loop too long). @@ -754,7 +754,7 @@ static void in_int(register rs232_t *rs) * Set a flag for the clock interrupt handler to eventually notify TTY. */ int s; - u32_t c; + uint32_t c; #if 0 /* Enable this if you want serial input in the kernel */ return; @@ -796,7 +796,7 @@ static void line_int(register rs232_t *rs) { /* Check for and record errors. */ int r; - u32_t s; + uint32_t s; if ((r = sys_inb(rs->line_status_port, &s)) != OK) printf("TTY: sys_inb() failed: %d", r); diff --git a/minix/drivers/tty/tty/tty.c b/minix/drivers/tty/tty/tty.c index 5a1d48c8e..7e07de46e 100644 --- a/minix/drivers/tty/tty/tty.c +++ b/minix/drivers/tty/tty/tty.c @@ -129,9 +129,9 @@ static struct winsize winsize_defaults; /* = all zeroes */ tty_t tty_table[NR_CONS+NR_RS_LINES]; int ccurrent; /* currently active console */ struct machine machine; /* kernel environment variables */ -u32_t system_hz; -u32_t consoleline = CONS_MINOR; -u32_t kernel_msg_color = 0; +uint32_t system_hz; +uint32_t consoleline = CONS_MINOR; +uint32_t kernel_msg_color = 0; static const char lined[TTLINEDNAMELEN] = "termios"; /* line discipline */ diff --git a/minix/drivers/tty/tty/tty.h b/minix/drivers/tty/tty/tty.h index 22fa8808a..b30665629 100644 --- a/minix/drivers/tty/tty/tty.h +++ b/minix/drivers/tty/tty/tty.h @@ -88,7 +88,7 @@ typedef struct tty { /* Memory allocated in tty.c, so extern here. */ extern tty_t tty_table[NR_CONS+NR_RS_LINES]; extern int ccurrent; /* currently visible console */ -extern u32_t system_hz; /* system clock frequency */ +extern uint32_t system_hz; /* system clock frequency */ extern unsigned long kbd_irq_set; extern unsigned long rs_irq_set; diff --git a/minix/drivers/video/fb/arch/earm/fb_arch.c b/minix/drivers/video/fb/arch/earm/fb_arch.c index 58bcc8c10..74655d02e 100644 --- a/minix/drivers/video/fb/arch/earm/fb_arch.c +++ b/minix/drivers/video/fb/arch/earm/fb_arch.c @@ -53,15 +53,15 @@ static size_t fb_size; static int initialized = 0; struct panel_config { - u32_t timing_h; - u32_t timing_v; - u32_t pol_freq; - u32_t divisor; - u32_t lcd_size; - u32_t panel_type; - u32_t data_lines; - u32_t load_mode; - u32_t panel_color; + uint32_t timing_h; + uint32_t timing_v; + uint32_t pol_freq; + uint32_t divisor; + uint32_t lcd_size; + uint32_t panel_type; + uint32_t data_lines; + uint32_t load_mode; + uint32_t panel_color; }; static const struct panel_config default_cfg = { @@ -129,16 +129,16 @@ static struct log log = { .log_func = default_log }; -static inline u32_t +static inline uint32_t readw(vir_bytes addr) { - return *((volatile u32_t *) addr); + return *((volatile uint32_t *) addr); } static inline void -writew(vir_bytes addr, u32_t val) +writew(vir_bytes addr, uint32_t val) { - *((volatile u32_t *) addr) = val; + *((volatile uint32_t *) addr) = val; } static struct videomode * @@ -236,7 +236,7 @@ static void arch_configure_display(int minor) { /* Tell hardware where frame buffer is and turn display on */ - u32_t off, rdispc; + uint32_t off, rdispc; if (!initialized) return; if (minor != 0) return; @@ -315,7 +315,7 @@ int arch_fb_init(int minor, struct edid_info *info) { int r; - u32_t rdispc; + uint32_t rdispc; struct minix_mem_range mr; const struct panel_config *panel_cfg = &omap_cfg[minor]; diff --git a/minix/drivers/video/fb/fb.c b/minix/drivers/video/fb/fb.c index 02c7c4fa9..946d3406c 100644 --- a/minix/drivers/video/fb/fb.c +++ b/minix/drivers/video/fb/fb.c @@ -245,7 +245,7 @@ sef_cb_lu_state_save(int UNUSED(result), int UNUSED(flags)) static int lu_state_restore() { /* Restore the state. */ - u32_t value; + uint32_t value; ds_retrieve_u32("open_counter", &value); ds_delete_u32("open_counter"); @@ -319,7 +319,7 @@ static int keep_displaying_restarted() { u64_t delta; - u32_t micro_delta; + uint32_t micro_delta; read_frclock_64(&has_restarted_t2); delta = delta_frclock_64(has_restarted_t1, has_restarted_t2); @@ -351,7 +351,7 @@ static void paint_centered(int minor, char *data, int width, int height) { uint8_t pixel[3]; - u32_t i, min_x, min_y, max_x, max_y, x_painted = 0, rows = 0; + uint32_t i, min_x, min_y, max_x, max_y, x_painted = 0, rows = 0; int r, bytespp; struct device dev; struct fb_var_screeninfo fbvs; @@ -370,7 +370,7 @@ paint_centered(int minor, char *data, int width, int height) /* Paint on a white canvas */ bytespp = fbvs.bits_per_pixel / 8; for (i = 0; i < fbvs.xres * fbvs.yres * bytespp; i+= bytespp) - *((u32_t *)((u32_t) dev.dv_base + i)) = 0x00FFFFFF; + *((uint32_t *)((uint32_t) dev.dv_base + i)) = 0x00FFFFFF; /* First seek to start */ min_x = fbvs.xres / 2 - width / 2; @@ -383,10 +383,10 @@ paint_centered(int minor, char *data, int width, int height) for (i = ((min_y * fbvs.xres) + min_x) * bytespp; rows < height;) { GET_PIXEL(data, pixel); - ((unsigned char *)((u32_t) dev.dv_base + i))[0] = pixel[2]; - ((unsigned char *)((u32_t) dev.dv_base + i))[1] = pixel[1]; - ((unsigned char *)((u32_t) dev.dv_base + i))[2] = pixel[0]; - ((unsigned char *)((u32_t) dev.dv_base + i))[3] = 0; + ((unsigned char *)((uint32_t) dev.dv_base + i))[0] = pixel[2]; + ((unsigned char *)((uint32_t) dev.dv_base + i))[1] = pixel[1]; + ((unsigned char *)((uint32_t) dev.dv_base + i))[2] = pixel[0]; + ((unsigned char *)((uint32_t) dev.dv_base + i))[3] = 0; x_painted++;/* Keep tab of how many row pixels we've painted */ if (x_painted == width) { diff --git a/minix/drivers/video/tda19988/tda19988.c b/minix/drivers/video/tda19988/tda19988.c index 7e0afa5d7..fdef73ad3 100644 --- a/minix/drivers/video/tda19988/tda19988.c +++ b/minix/drivers/video/tda19988/tda19988.c @@ -829,7 +829,7 @@ static int lu_state_restore(void) { /* Restore the state. */ - u32_t value; + uint32_t value; ds_retrieve_u32("cec_bus", &value); ds_delete_u32("cec_bus"); diff --git a/minix/drivers/vmm_guest/vbox/hgcm.c b/minix/drivers/vmm_guest/vbox/hgcm.c index b543f98ca..d98069195 100644 --- a/minix/drivers/vmm_guest/vbox/hgcm.c +++ b/minix/drivers/vmm_guest/vbox/hgcm.c @@ -25,7 +25,7 @@ enum { static struct { int state; /* connection state */ endpoint_t endpt; /* caller endpoint */ - u32_t client_id; /* VMMDev-given client ID */ + uint32_t client_id; /* VMMDev-given client ID */ struct { int busy; /* is this request ongoing? */ struct VMMDevHGCMHeader *ptr; /* request buffer */ diff --git a/minix/drivers/vmm_guest/vbox/vbox.c b/minix/drivers/vmm_guest/vbox/vbox.c index 6ac34fbcc..1a89d9c8c 100644 --- a/minix/drivers/vmm_guest/vbox/vbox.c +++ b/minix/drivers/vmm_guest/vbox/vbox.c @@ -20,7 +20,7 @@ static void *vir_ptr; static phys_bytes phys_ptr; static port_t port; -static u32_t ticks; +static uint32_t ticks; static int interval; static int drift; diff --git a/minix/drivers/vmm_guest/vbox/vmmdev.h b/minix/drivers/vmm_guest/vbox/vmmdev.h index d40daf877..e23b297ee 100644 --- a/minix/drivers/vmm_guest/vbox/vmmdev.h +++ b/minix/drivers/vmm_guest/vbox/vmmdev.h @@ -28,17 +28,17 @@ #define VMMDEV_GUEST_OS_OTHER 0x90000 /* this is L4 - close enough */ struct VMMDevRequestHeader { - u32_t size; - u32_t version; - u32_t type; + uint32_t size; + uint32_t version; + uint32_t type; i32_t result; - u32_t reserved[2]; + uint32_t reserved[2]; }; struct VMMDevReportGuestInfo { struct VMMDevRequestHeader header; - u32_t add_version; - u32_t os_type; + uint32_t add_version; + uint32_t os_type; }; struct VMMDevReqHostTime { @@ -50,14 +50,14 @@ struct VMMDevReqHostTime { struct VMMDevEvents { struct VMMDevRequestHeader header; - u32_t events; + uint32_t events; }; #define VMMDEV_HGCM_REQ_DONE (1 << 0) struct VMMDevHGCMHeader { struct VMMDevRequestHeader header; - u32_t flags; + uint32_t flags; i32_t result; }; @@ -67,21 +67,21 @@ struct VMMDevHGCMHeader { struct VMMDevHGCMConnect { struct VMMDevHGCMHeader header; - u32_t type; + uint32_t type; char name[VMMDEV_HGCM_NAME_SIZE]; - u32_t client_id; + uint32_t client_id; }; struct VMMDevHGCMDisconnect { struct VMMDevHGCMHeader header; - u32_t client_id; + uint32_t client_id; }; #define VMMDEV_HGCM_FLAG_TO_HOST 0x01 #define VMMDEV_HGCM_FLAG_FROM_HOST 0x02 struct VMMDevHGCMPageList { - u32_t flags; + uint32_t flags; uint16_t offset; uint16_t count; u64_t addr[1]; @@ -92,29 +92,29 @@ struct VMMDevHGCMPageList { #define VMMDEV_HGCM_PARAM_PAGELIST 10 struct VMMDevHGCMParam { - u32_t type; + uint32_t type; union { - u32_t u32; + uint32_t u32; u64_t u64; struct { - u32_t size; + uint32_t size; union { - u32_t phys; + uint32_t phys; void *vir; } addr; } ptr; struct { - u32_t size; - u32_t offset; + uint32_t size; + uint32_t offset; } pagelist; }; }; struct VMMDevHGCMCall { struct VMMDevHGCMHeader header; - u32_t client_id; - u32_t function; - u32_t count; + uint32_t client_id; + uint32_t function; + uint32_t count; }; struct VMMDevHGCMCancel { diff --git a/minix/fs/ext2/inode.c b/minix/fs/ext2/inode.c index 72592e61a..53be7239e 100644 --- a/minix/fs/ext2/inode.c +++ b/minix/fs/ext2/inode.c @@ -307,7 +307,7 @@ void rw_inode( register struct super_block *sp; register struct group_desc *gd; register d_inode *dip; - u32_t block_group_number; + uint32_t block_group_number; block_t b, offset; /* Get the block where the inode resides. */ diff --git a/minix/fs/ext2/inode.h b/minix/fs/ext2/inode.h index b70335c14..18ccc7d00 100644 --- a/minix/fs/ext2/inode.h +++ b/minix/fs/ext2/inode.h @@ -19,31 +19,31 @@ EXTERN struct inode { uint16_t i_mode; /* File mode */ uint16_t i_uid; /* Low 16 bits of Owner Uid */ - u32_t i_size; /* Size in bytes */ - u32_t i_atime; /* Access time */ - u32_t i_ctime; /* Creation time */ - u32_t i_mtime; /* Modification time */ - u32_t i_dtime; /* Deletion Time */ + uint32_t i_size; /* Size in bytes */ + uint32_t i_atime; /* Access time */ + uint32_t i_ctime; /* Creation time */ + uint32_t i_mtime; /* Modification time */ + uint32_t i_dtime; /* Deletion Time */ uint16_t i_gid; /* Low 16 bits of Group Id */ uint16_t i_links_count; /* Links count */ - u32_t i_blocks; /* 512-byte blocks count */ - u32_t i_flags; /* File flags */ + uint32_t i_blocks; /* 512-byte blocks count */ + uint32_t i_flags; /* File flags */ union { struct { - u32_t l_i_reserved1; + uint32_t l_i_reserved1; } linux1; struct { - u32_t h_i_translator; + uint32_t h_i_translator; } hurd1; struct { - u32_t m_i_reserved1; + uint32_t m_i_reserved1; } masix1; } osd1; /* OS dependent 1 */ - u32_t i_block[EXT2_N_BLOCKS]; /* Pointers to blocks */ - u32_t i_generation; /* File version (for NFS) */ - u32_t i_file_acl; /* File ACL */ - u32_t i_dir_acl; /* Directory ACL */ - u32_t i_faddr; /* Fragment address */ + uint32_t i_block[EXT2_N_BLOCKS]; /* Pointers to blocks */ + uint32_t i_generation; /* File version (for NFS) */ + uint32_t i_file_acl; /* File ACL */ + uint32_t i_dir_acl; /* Directory ACL */ + uint32_t i_faddr; /* Fragment address */ union { struct { uint8_t l_i_frag; /* Fragment number */ @@ -51,7 +51,7 @@ EXTERN struct inode { uint16_t i_pad1; uint16_t l_i_uid_high; /* these 2 fields */ uint16_t l_i_gid_high; /* were reserved2[0] */ - u32_t l_i_reserved2; + uint32_t l_i_reserved2; } linux2; struct { uint8_t h_i_frag; /* Fragment number */ @@ -59,13 +59,13 @@ EXTERN struct inode { uint16_t h_i_mode_high; uint16_t h_i_uid_high; uint16_t h_i_gid_high; - u32_t h_i_author; + uint32_t h_i_author; } hurd2; struct { uint8_t m_i_frag; /* Fragment number */ uint8_t m_i_fsize; /* Fragment size */ uint16_t m_pad1; - u32_t m_i_reserved2[2]; + uint32_t m_i_reserved2[2]; } masix2; } osd2; /* OS dependent 2 */ diff --git a/minix/fs/ext2/mount.c b/minix/fs/ext2/mount.c index 790e55970..653f65ff2 100644 --- a/minix/fs/ext2/mount.c +++ b/minix/fs/ext2/mount.c @@ -22,7 +22,7 @@ int fs_mount(dev_t dev, unsigned int flags, struct fsdriver_node *root_node, */ struct inode *root_ip; int r, readonly; - u32_t mask; + uint32_t mask; fs_dev = dev; readonly = (flags & REQ_RDONLY) ? 1 : 0; diff --git a/minix/fs/ext2/super.c b/minix/fs/ext2/super.c index a727ecf81..a6f183053 100644 --- a/minix/fs/ext2/super.c +++ b/minix/fs/ext2/super.c @@ -24,7 +24,7 @@ #include "const.h" static off_t ext2_max_size(int block_size); -static u32_t ext2_count_dirs(struct super_block *sp); +static uint32_t ext2_count_dirs(struct super_block *sp); static void super_copy(register struct super_block *dest, register struct super_block *source); @@ -284,9 +284,9 @@ struct group_desc* get_group_desc(unsigned int bnum) } -static u32_t ext2_count_dirs(struct super_block *sp) +static uint32_t ext2_count_dirs(struct super_block *sp) { - u32_t count = 0; + uint32_t count = 0; unsigned int i; for (i = 0; i < sp->s_groups_count; i++) { diff --git a/minix/fs/ext2/super.h b/minix/fs/ext2/super.h index 648a44af4..489055142 100644 --- a/minix/fs/ext2/super.h +++ b/minix/fs/ext2/super.h @@ -11,29 +11,29 @@ /* super_block (on-disk part) was taken from linux/include/linux/ext2_fs.h */ EXTERN struct super_block { - u32_t s_inodes_count; /* Inodes count */ - u32_t s_blocks_count; /* Blocks count */ - u32_t s_r_blocks_count; /* Reserved blocks count */ - u32_t s_free_blocks_count; /* Free blocks count */ - u32_t s_free_inodes_count; /* Free inodes count */ - u32_t s_first_data_block; /* First Data Block */ - u32_t s_log_block_size; /* Block size */ - u32_t s_log_frag_size; /* Fragment size */ - u32_t s_blocks_per_group; /* # Blocks per group */ - u32_t s_frags_per_group; /* # Fragments per group */ - u32_t s_inodes_per_group; /* # Inodes per group */ - u32_t s_mtime; /* Mount time */ - u32_t s_wtime; /* Write time */ + uint32_t s_inodes_count; /* Inodes count */ + uint32_t s_blocks_count; /* Blocks count */ + uint32_t s_r_blocks_count; /* Reserved blocks count */ + uint32_t s_free_blocks_count; /* Free blocks count */ + uint32_t s_free_inodes_count; /* Free inodes count */ + uint32_t s_first_data_block; /* First Data Block */ + uint32_t s_log_block_size; /* Block size */ + uint32_t s_log_frag_size; /* Fragment size */ + uint32_t s_blocks_per_group; /* # Blocks per group */ + uint32_t s_frags_per_group; /* # Fragments per group */ + uint32_t s_inodes_per_group; /* # Inodes per group */ + uint32_t s_mtime; /* Mount time */ + uint32_t s_wtime; /* Write time */ uint16_t s_mnt_count; /* Mount count */ uint16_t s_max_mnt_count; /* Maximal mount count */ uint16_t s_magic; /* Magic signature */ uint16_t s_state; /* File system state */ uint16_t s_errors; /* Behaviour when detecting errors */ uint16_t s_minor_rev_level; /* minor revision level */ - u32_t s_lastcheck; /* time of last check */ - u32_t s_checkinterval; /* max. time between checks */ - u32_t s_creator_os; /* OS */ - u32_t s_rev_level; /* Revision level */ + uint32_t s_lastcheck; /* time of last check */ + uint32_t s_checkinterval; /* max. time between checks */ + uint32_t s_creator_os; /* OS */ + uint32_t s_rev_level; /* Revision level */ uint16_t s_def_resuid; /* Default uid for reserved blocks */ uint16_t s_def_resgid; /* Default gid for reserved blocks */ /* @@ -49,16 +49,16 @@ EXTERN struct super_block { * feature set, it must abort and not try to meddle with * things it doesn't understand... */ - u32_t s_first_ino; /* First non-reserved inode */ + uint32_t s_first_ino; /* First non-reserved inode */ uint16_t s_inode_size; /* size of inode structure */ uint16_t s_block_group_nr; /* block group # of this superblock */ - u32_t s_feature_compat; /* compatible feature set */ - u32_t s_feature_incompat; /* incompatible feature set */ - u32_t s_feature_ro_compat; /* readonly-compatible feature set */ + uint32_t s_feature_compat; /* compatible feature set */ + uint32_t s_feature_incompat; /* incompatible feature set */ + uint32_t s_feature_ro_compat; /* readonly-compatible feature set */ uint8_t s_uuid[16]; /* 128-bit uuid for volume */ char s_volume_name[16]; /* volume name */ char s_last_mounted[64]; /* directory where last mounted */ - u32_t s_algorithm_usage_bitmap; /* For compression */ + uint32_t s_algorithm_usage_bitmap; /* For compression */ /* * Performance hints. Directory preallocation should only * happen if the EXT2_COMPAT_PREALLOC flag is on. @@ -70,23 +70,23 @@ EXTERN struct super_block { * Journaling support valid if EXT3_FEATURE_COMPAT_HAS_JOURNAL set. */ uint8_t s_journal_uuid[16]; /* uuid of journal superblock */ - u32_t s_journal_inum; /* inode number of journal file */ - u32_t s_journal_dev; /* device number of journal file */ - u32_t s_last_orphan; /* start of list of inodes to delete */ - u32_t s_hash_seed[4]; /* HTREE hash seed */ + uint32_t s_journal_inum; /* inode number of journal file */ + uint32_t s_journal_dev; /* device number of journal file */ + uint32_t s_last_orphan; /* start of list of inodes to delete */ + uint32_t s_hash_seed[4]; /* HTREE hash seed */ uint8_t s_def_hash_version; /* Default hash version to use */ uint8_t s_reserved_char_pad; uint16_t s_reserved_word_pad; - u32_t s_default_mount_opts; - u32_t s_first_meta_bg; /* First metablock block group */ - u32_t s_reserved[190]; /* Padding to the end of the block */ + uint32_t s_default_mount_opts; + uint32_t s_first_meta_bg; /* First metablock block group */ + uint32_t s_reserved[190]; /* Padding to the end of the block */ /* The following items are only used when the super_block is in memory. */ - u32_t s_inodes_per_block; /* Number of inodes per block */ - u32_t s_itb_per_group; /* Number of inode table blocks per group */ - u32_t s_gdb_count; /* Number of group descriptor blocks */ - u32_t s_desc_per_block; /* Number of group descriptors per block */ - u32_t s_groups_count; /* Number of groups in the fs */ + uint32_t s_inodes_per_block; /* Number of inodes per block */ + uint32_t s_itb_per_group; /* Number of inode table blocks per group */ + uint32_t s_gdb_count; /* Number of group descriptor blocks */ + uint32_t s_desc_per_block; /* Number of group descriptors per block */ + uint32_t s_groups_count; /* Number of groups in the fs */ uint8_t s_blocksize_bits; /* Used to calculate offsets * (e.g. inode block), * always s_log_block_size+10. @@ -95,12 +95,12 @@ EXTERN struct super_block { uint16_t s_block_size; /* block size in bytes. */ uint16_t s_sectors_in_block; /* s_block_size / 512 */ - u32_t s_max_size; /* maximum file size on this device */ + uint32_t s_max_size; /* maximum file size on this device */ dev_t s_dev; /* whose super block is this? */ int s_rd_only; /* set to 1 if file sys mounted read only */ block_t s_bsearch; /* all data blocks below this block are in use*/ int s_igsearch; /* all groups below this one have no free inodes */ - u32_t s_dirs_counter; + uint32_t s_dirs_counter; } *superblock, *ondisk_superblock; @@ -110,14 +110,14 @@ EXTERN struct super_block { */ struct group_desc { - u32_t block_bitmap; /* Blocks bitmap block */ - u32_t inode_bitmap; /* Inodes bitmap block */ - u32_t inode_table; /* Inodes table block */ + uint32_t block_bitmap; /* Blocks bitmap block */ + uint32_t inode_bitmap; /* Inodes bitmap block */ + uint32_t inode_table; /* Inodes table block */ uint16_t free_blocks_count; /* Free blocks count */ uint16_t free_inodes_count; /* Free inodes count */ uint16_t used_dirs_count; /* Directories count */ uint16_t pad; - u32_t reserved[3]; + uint32_t reserved[3]; }; #define IMAP 0 /* operating on the inode bit map */ diff --git a/minix/fs/ext2/type.h b/minix/fs/ext2/type.h index 85981294b..a2f0dee8a 100644 --- a/minix/fs/ext2/type.h +++ b/minix/fs/ext2/type.h @@ -9,31 +9,31 @@ typedef struct { uint16_t i_mode; /* File mode */ uint16_t i_uid; /* Low 16 bits of Owner Uid */ - u32_t i_size; /* Size in bytes */ - u32_t i_atime; /* Access time */ - u32_t i_ctime; /* Creation time */ - u32_t i_mtime; /* Modification time */ - u32_t i_dtime; /* Deletion Time */ + uint32_t i_size; /* Size in bytes */ + uint32_t i_atime; /* Access time */ + uint32_t i_ctime; /* Creation time */ + uint32_t i_mtime; /* Modification time */ + uint32_t i_dtime; /* Deletion Time */ uint16_t i_gid; /* Low 16 bits of Group Id */ uint16_t i_links_count; /* Links count */ - u32_t i_blocks; /* Blocks count */ - u32_t i_flags; /* File flags */ + uint32_t i_blocks; /* Blocks count */ + uint32_t i_flags; /* File flags */ union { struct { - u32_t l_i_reserved1; + uint32_t l_i_reserved1; } linux1; struct { - u32_t h_i_translator; + uint32_t h_i_translator; } hurd1; struct { - u32_t m_i_reserved1; + uint32_t m_i_reserved1; } masix1; } osd1; /* OS dependent 1 */ - u32_t i_block[EXT2_N_BLOCKS];/* Pointers to blocks */ - u32_t i_generation; /* File version (for NFS) */ - u32_t i_file_acl; /* File ACL */ - u32_t i_dir_acl; /* Directory ACL */ - u32_t i_faddr; /* Fragment address */ + uint32_t i_block[EXT2_N_BLOCKS];/* Pointers to blocks */ + uint32_t i_generation; /* File version (for NFS) */ + uint32_t i_file_acl; /* File ACL */ + uint32_t i_dir_acl; /* Directory ACL */ + uint32_t i_faddr; /* Fragment address */ union { struct { uint8_t l_i_frag; /* Fragment number */ @@ -41,7 +41,7 @@ typedef struct { uint16_t i_pad1; uint16_t l_i_uid_high; /* these 2 fields */ uint16_t l_i_gid_high; /* were reserved2[0] */ - u32_t l_i_reserved2; + uint32_t l_i_reserved2; } linux2; struct { uint8_t h_i_frag; /* Fragment number */ @@ -49,13 +49,13 @@ typedef struct { uint16_t h_i_mode_high; uint16_t h_i_uid_high; uint16_t h_i_gid_high; - u32_t h_i_author; + uint32_t h_i_author; } hurd2; struct { uint8_t m_i_frag; /* Fragment number */ uint8_t m_i_fsize; /* Fragment size */ uint16_t m_pad1; - u32_t m_i_reserved2[2]; + uint32_t m_i_reserved2[2]; } masix2; } osd2; /* OS dependent 2 */ } d_inode; @@ -68,7 +68,7 @@ typedef struct { * MIN_DIR_ENTRY_SIZE depends on this structure. */ struct ext2_disk_dir_desc { - u32_t d_ino; + uint32_t d_ino; uint16_t d_rec_len; uint8_t d_name_len; uint8_t d_file_type; diff --git a/minix/fs/isofs/inode.h b/minix/fs/isofs/inode.h index 4183af2ce..1be172586 100644 --- a/minix/fs/isofs/inode.h +++ b/minix/fs/isofs/inode.h @@ -7,15 +7,15 @@ struct iso9660_dir_record { */ uint8_t length; /* The length of the record */ uint8_t ext_attr_rec_length; - u32_t loc_extent_l; /* The same data (in this case loc_extent)is */ - u32_t loc_extent_m; /* saved in two ways. The first puts the le- */ - u32_t data_length_l; /* ast significant byte first, the second */ - u32_t data_length_m; /* does the opposite */ + uint32_t loc_extent_l; /* The same data (in this case loc_extent)is */ + uint32_t loc_extent_m; /* saved in two ways. The first puts the le- */ + uint32_t data_length_l; /* ast significant byte first, the second */ + uint32_t data_length_m; /* does the opposite */ uint8_t rec_date[7]; /* => recording date */ uint8_t file_flags; /* => flags of the file */ uint8_t file_unit_size; /* set of blocks in interleave mode */ uint8_t inter_gap_size; /* gap between file units in interleave mode */ - u32_t vol_seq_number; /* volume sequence number: not used */ + uint32_t vol_seq_number; /* volume sequence number: not used */ uint8_t length_file_id; /* Length name file */ char file_id[ISO9660_MAX_FILE_ID_LEN]; /* file name */ } __attribute__((packed)); @@ -44,8 +44,8 @@ struct dir_extent { /* * Extent (contiguous array of logical sectors). */ - u32_t location; - u32_t length; + uint32_t location; + uint32_t length; struct dir_extent *next; } ; diff --git a/minix/fs/isofs/proto.h b/minix/fs/isofs/proto.h index ad7185327..1cbb97501 100644 --- a/minix/fs/isofs/proto.h +++ b/minix/fs/isofs/proto.h @@ -55,7 +55,7 @@ int read_vds(struct iso9660_vol_pri_desc *v_pri, dev_t dev); /* susp.c */ int parse_susp(struct rrii_dir_record *dir, char *buffer); -void parse_susp_buffer(struct rrii_dir_record *dir, char *buffer, u32_t size); +void parse_susp_buffer(struct rrii_dir_record *dir, char *buffer, uint32_t size); /* susp_rock_ridge.c */ void parse_susp_rock_ridge_sl(struct rrii_dir_record *dir, char *buffer, diff --git a/minix/fs/isofs/super.h b/minix/fs/isofs/super.h index 7109bc98c..60d83190b 100644 --- a/minix/fs/isofs/super.h +++ b/minix/fs/isofs/super.h @@ -23,8 +23,8 @@ struct iso9660_vol_pri_desc { char system_id[ISO9660_SIZE_SYS_ID]; char volume_id[ISO9660_SIZE_VOLUME_ID]; uint8_t pad2[8]; - u32_t volume_space_size_l; - u32_t volume_space_size_m; + uint32_t volume_space_size_l; + uint32_t volume_space_size_m; uint8_t pad3[32]; uint16_t volume_set_size_l; uint16_t volume_set_size_m; @@ -32,12 +32,12 @@ struct iso9660_vol_pri_desc { uint16_t volume_sequence_number_m; uint16_t logical_block_size_l; uint16_t logical_block_size_m; - u32_t path_table_size_l; - u32_t path_table_size_m; - u32_t loc_l_occ_path_table; - u32_t loc_opt_l_occ_path_table; - u32_t loc_m_occ_path_table; - u32_t loc_opt_m_occ_path_table; + uint32_t path_table_size_l; + uint32_t path_table_size_m; + uint32_t loc_l_occ_path_table; + uint32_t loc_opt_l_occ_path_table; + uint32_t loc_m_occ_path_table; + uint32_t loc_opt_m_occ_path_table; uint8_t root_directory[34]; char volume_set_id[ISO9660_SIZE_VOLUME_SET_ID]; char publisher_id[ISO9660_SIZE_PUBLISHER_ID]; diff --git a/minix/fs/isofs/susp.c b/minix/fs/isofs/susp.c index 755d4f58f..6de9fe44e 100644 --- a/minix/fs/isofs/susp.c +++ b/minix/fs/isofs/susp.c @@ -14,9 +14,9 @@ int parse_susp(struct rrii_dir_record *dir, char *buffer) char susp_signature[2]; uint8_t susp_length; uint8_t susp_version; - u32_t ca_block_nr; - u32_t ca_offset; - u32_t ca_length; + uint32_t ca_block_nr; + uint32_t ca_offset; + uint32_t ca_length; struct buf *ca_bp; int r; @@ -34,9 +34,9 @@ int parse_susp(struct rrii_dir_record *dir, char *buffer) * continuation area, and infinite recursion is not checked. */ - ca_block_nr = *((u32_t*)(buffer + 4)); - ca_offset = *((u32_t*)(buffer + 12)); - ca_length = *((u32_t*)(buffer + 20)); + ca_block_nr = *((uint32_t*)(buffer + 4)); + ca_offset = *((uint32_t*)(buffer + 12)); + ca_length = *((uint32_t*)(buffer + 20)); /* Truncate continuation area to fit one logical block. */ if (ca_offset >= v_pri.logical_block_size_l) { @@ -80,7 +80,7 @@ int parse_susp(struct rrii_dir_record *dir, char *buffer) return EINVAL; } -void parse_susp_buffer(struct rrii_dir_record *dir, char *buffer, u32_t size) +void parse_susp_buffer(struct rrii_dir_record *dir, char *buffer, uint32_t size) { /* * Parse a SUSP system use entry for the ISO 9660. diff --git a/minix/fs/isofs/susp_rock_ridge.c b/minix/fs/isofs/susp_rock_ridge.c index 9cbbe0b1a..6f478b365 100644 --- a/minix/fs/isofs/susp_rock_ridge.c +++ b/minix/fs/isofs/susp_rock_ridge.c @@ -8,7 +8,7 @@ #ifdef ISO9660_OPTION_ROCKRIDGE -void parse_susp_rock_ridge_plcl(struct rrii_dir_record *dir, u32_t block) { +void parse_susp_rock_ridge_plcl(struct rrii_dir_record *dir, uint32_t block) { struct inode *rep_inode; struct buf *bp; struct iso9660_dir_record *dir_rec; @@ -142,10 +142,10 @@ int parse_susp_rock_ridge(struct rrii_dir_record *dir, char *buffer) int rrii_name_append_size; int rrii_tf_flags; int rrii_tf_offset; - u32_t rrii_pn_rdev_major; - u32_t rrii_pn_rdev_minor; + uint32_t rrii_pn_rdev_major; + uint32_t rrii_pn_rdev_minor; mode_t rrii_px_posix_mode; - u32_t rrii_pcl_block; + uint32_t rrii_pcl_block; susp_signature[0] = buffer[0]; susp_signature[1] = buffer[1]; @@ -155,9 +155,9 @@ int parse_susp_rock_ridge(struct rrii_dir_record *dir, char *buffer) if ((susp_signature[0] == 'P') && (susp_signature[1] == 'X') && (susp_length >= 36) && (susp_version >= 1)) { /* POSIX file mode, UID and GID. */ - dir->d_mode = *((u32_t*)(buffer + 4)); - dir->uid = *((u32_t*)(buffer + 20)); - dir->gid = *((u32_t*)(buffer + 28)); + dir->d_mode = *((uint32_t*)(buffer + 4)); + dir->uid = *((uint32_t*)(buffer + 20)); + dir->gid = *((uint32_t*)(buffer + 28)); return OK; } @@ -170,11 +170,11 @@ int parse_susp_rock_ridge(struct rrii_dir_record *dir, char *buffer) * investigate why makefs does that later. */ #if 0 - rrii_pn_rdev_major = *((u32_t*)(buffer + 4)); - rrii_pn_rdev_minor = *((u32_t*)(buffer + 12)); + rrii_pn_rdev_major = *((uint32_t*)(buffer + 4)); + rrii_pn_rdev_minor = *((uint32_t*)(buffer + 12)); #else - rrii_pn_rdev_major = *((u32_t*)(buffer + 12)) >> 8; - rrii_pn_rdev_minor = *((u32_t*)(buffer + 12)) & 0xFF; + rrii_pn_rdev_major = *((uint32_t*)(buffer + 12)) >> 8; + rrii_pn_rdev_minor = *((uint32_t*)(buffer + 12)) & 0xFF; #endif dir->rdev = makedev(rrii_pn_rdev_major, rrii_pn_rdev_minor); @@ -207,7 +207,7 @@ int parse_susp_rock_ridge(struct rrii_dir_record *dir, char *buffer) else if ((susp_signature[0] == 'P') && (susp_signature[1] == 'L') && (susp_length >= 12) && (susp_version >= 1)) { /* Reparenting ".." directory entry. */ - rrii_pcl_block = *((u32_t*)(buffer + 4)); + rrii_pcl_block = *((uint32_t*)(buffer + 4)); parse_susp_rock_ridge_plcl(dir, rrii_pcl_block); return OK; @@ -215,7 +215,7 @@ int parse_susp_rock_ridge(struct rrii_dir_record *dir, char *buffer) else if ((susp_signature[0] == 'C') && (susp_signature[1] == 'L') && (susp_length >= 12) && (susp_version >= 1)) { /* Reorganize deep directory entry. */ - rrii_pcl_block = *((u32_t*)(buffer + 4)); + rrii_pcl_block = *((uint32_t*)(buffer + 4)); parse_susp_rock_ridge_plcl(dir, rrii_pcl_block); return OK; diff --git a/minix/fs/mfs/inode.h b/minix/fs/mfs/inode.h index 338d16bce..9753c47e2 100644 --- a/minix/fs/mfs/inode.h +++ b/minix/fs/mfs/inode.h @@ -23,10 +23,10 @@ EXTERN struct inode { uint16_t i_uid; /* user id of the file's owner */ uint16_t i_gid; /* group number */ i32_t i_size; /* current file size in bytes */ - u32_t i_atime; /* time of last access (V2 only) */ - u32_t i_mtime; /* when was file data last changed */ - u32_t i_ctime; /* when was inode itself changed (V2 only)*/ - u32_t i_zone[V2_NR_TZONES]; /* zone numbers for direct, ind, and dbl ind */ + uint32_t i_atime; /* time of last access (V2 only) */ + uint32_t i_mtime; /* when was file data last changed */ + uint32_t i_ctime; /* when was inode itself changed (V2 only)*/ + uint32_t i_zone[V2_NR_TZONES]; /* zone numbers for direct, ind, and dbl ind */ /* The following items are not present on the disk. */ dev_t i_dev; /* which device is the inode on */ diff --git a/minix/fs/mfs/super.h b/minix/fs/mfs/super.h index 27ceec492..864538ec2 100644 --- a/minix/fs/mfs/super.h +++ b/minix/fs/mfs/super.h @@ -22,7 +22,7 @@ */ EXTERN struct super_block { - u32_t s_ninodes; /* # usable inodes on the minor device */ + uint32_t s_ninodes; /* # usable inodes on the minor device */ zone1_t s_nzones; /* total device size, including bit maps etc */ short s_imap_blocks; /* # of blocks used by inode bit map */ short s_zmap_blocks; /* # of blocks used by zone bit map */ diff --git a/minix/fs/procfs/cpuinfo.c b/minix/fs/procfs/cpuinfo.c index 54fab20a2..66d533979 100644 --- a/minix/fs/procfs/cpuinfo.c +++ b/minix/fs/procfs/cpuinfo.c @@ -82,7 +82,7 @@ static const char * x86_flag[] = { * Output a space-separated list of supported CPU flags. x86 only. */ static void -print_x86_cpu_flags(u32_t * flags) +print_x86_cpu_flags(uint32_t * flags) { int i, j; diff --git a/minix/fs/procfs/util.c b/minix/fs/procfs/util.c index 51703e7dc..ed9c21ecd 100644 --- a/minix/fs/procfs/util.c +++ b/minix/fs/procfs/util.c @@ -9,7 +9,7 @@ int procfs_getloadavg(struct load * loadavg, int nelem) { struct loadinfo loadinfo; - u32_t system_hz, ticks_per_slot; + uint32_t system_hz, ticks_per_slot; int p, unfilled_ticks; int h, slots, latest, slot; int minutes[3] = { 1, 5, 15 }; diff --git a/minix/include/arch/earm/include/archtypes.h b/minix/include/arch/earm/include/archtypes.h index a5e32c432..0cc8712a5 100644 --- a/minix/include/arch/earm/include/archtypes.h +++ b/minix/include/arch/earm/include/archtypes.h @@ -8,20 +8,20 @@ typedef struct segframe { reg_t p_ttbr; /* page table root */ - u32_t *p_ttbr_v; + uint32_t *p_ttbr_v; char *fpu_state; } segframe_t; struct cpu_info { - u32_t arch; - u32_t implementer; - u32_t part; - u32_t variant; - u32_t freq; /* in MHz */ - u32_t revision; + uint32_t arch; + uint32_t implementer; + uint32_t part; + uint32_t variant; + uint32_t freq; /* in MHz */ + uint32_t revision; }; -typedef u32_t atomic_t; /* access to an aligned 32bit value is atomic on ARM */ +typedef uint32_t atomic_t; /* access to an aligned 32bit value is atomic on ARM */ #endif /* #ifndef _ARM_TYPES_H */ diff --git a/minix/include/arch/earm/include/multiboot.h b/minix/include/arch/earm/include/multiboot.h index fe73c46cf..320006ba8 100644 --- a/minix/include/arch/earm/include/multiboot.h +++ b/minix/include/arch/earm/include/multiboot.h @@ -263,18 +263,18 @@ bool multiboot_ksyms_addsyms_elf(void); /* The symbol table for a.out. */ struct multiboot_aout_symbol_table { - u32_t tabsize; - u32_t strsize; - u32_t addr; - u32_t reserved; + uint32_t tabsize; + uint32_t strsize; + uint32_t addr; + uint32_t reserved; }; /* The section header table for ELF. */ struct multiboot_elf_section_header_table { - u32_t num; - u32_t size; - u32_t addr; - u32_t shndx; + uint32_t num; + uint32_t size; + uint32_t addr; + uint32_t shndx; }; typedef struct multiboot_elf_section_header_table multiboot_elf_section_header_table_t; @@ -283,37 +283,37 @@ typedef struct multiboot_aout_symbol_table multiboot_aout_symbol_table_t; struct multiboot_info { /* Multiboot info version number */ - u32_t flags; + uint32_t flags; /* Available memory from BIOS */ - u32_t mem_lower_unused; /* minix uses memmap instead */ - u32_t mem_upper_unused; + uint32_t mem_lower_unused; /* minix uses memmap instead */ + uint32_t mem_upper_unused; /* "root" partition */ - u32_t boot_device; + uint32_t boot_device; /* Kernel command line */ - u32_t cmdline; + uint32_t cmdline; /* Boot-Module list */ - u32_t mi_mods_count; - u32_t mods_addr; + uint32_t mi_mods_count; + uint32_t mods_addr; union { multiboot_aout_symbol_table_t aout_sym; multiboot_elf_section_header_table_t elf_sec; } u; /* Memory Mapping buffer */ - u32_t mmap_length; - u32_t mmap_addr; + uint32_t mmap_length; + uint32_t mmap_addr; /* Drive Info buffer */ - u32_t drives_length; - u32_t drives_addr; + uint32_t drives_length; + uint32_t drives_addr; /* ROM configuration table */ - u32_t config_table; + uint32_t config_table; /* Boot Loader Name */ - u32_t boot_loader_name; + uint32_t boot_loader_name; /* APM table */ - u32_t apm_table; + uint32_t apm_table; /* Video */ - u32_t vbe_control_info; - u32_t vbe_mode_info; + uint32_t vbe_control_info; + uint32_t vbe_mode_info; uint16_t vbe_mode; uint16_t vbe_interface_seg; uint16_t vbe_interface_off; @@ -324,12 +324,12 @@ typedef struct multiboot_info multiboot_info_t; struct multiboot_mod_list { /* Memory used goes from bytes 'mod_start' to 'mod_end-1' inclusive */ - u32_t mod_start; - u32_t mod_end; + uint32_t mod_start; + uint32_t mod_end; /* Module command line */ - u32_t cmdline; + uint32_t cmdline; /* Pad struct to 16 bytes (must be zero) */ - u32_t pad; + uint32_t pad; }; typedef struct multiboot_mod_list multiboot_module_t; @@ -337,12 +337,12 @@ typedef struct multiboot_mod_list multiboot_module_t; #define MULTIBOOT_MEMORY_RESERVED 2 struct multiboot_mmap_entry { - u32_t size; + uint32_t size; u64_t mm_base_addr; u64_t mm_length; #define MULTIBOOT_MEMORY_AVAILABLE 1 #define MULTIBOOT_MEMORY_RESERVED 2 - u32_t type; + uint32_t type; } __attribute__((packed)); typedef struct multiboot_mmap_entry multiboot_memory_map_t; diff --git a/minix/include/arch/earm/include/stackframe.h b/minix/include/arch/earm/include/stackframe.h index aec3da201..bb5e81ad3 100644 --- a/minix/include/arch/earm/include/stackframe.h +++ b/minix/include/arch/earm/include/stackframe.h @@ -3,7 +3,7 @@ #include -typedef u32_t reg_t; /* machine register */ +typedef uint32_t reg_t; /* machine register */ struct stackframe_s { reg_t retreg; /* r0 */ diff --git a/minix/include/arch/i386/include/archtypes.h b/minix/include/arch/i386/include/archtypes.h index a8efab2ac..19def5649 100644 --- a/minix/include/arch/i386/include/archtypes.h +++ b/minix/include/arch/i386/include/archtypes.h @@ -26,12 +26,12 @@ struct gatedesc_s { struct desctableptr_s { uint16_t limit; - u32_t base; + uint32_t base; } __attribute__((packed)); typedef struct segframe { reg_t p_cr3; /* page table root */ - u32_t *p_cr3_v; + uint32_t *p_cr3_v; char *fpu_state; int p_kern_trap_style; } segframe_t; @@ -41,11 +41,11 @@ struct cpu_info { uint8_t family; uint8_t model; uint8_t stepping; - u32_t freq; /* in MHz */ - u32_t flags[2]; + uint32_t freq; /* in MHz */ + uint32_t flags[2]; }; -typedef u32_t atomic_t; /* access to an aligned 32bit value is atomic on i386 */ +typedef uint32_t atomic_t; /* access to an aligned 32bit value is atomic on i386 */ #endif /* #ifndef _I386_TYPES_H */ diff --git a/minix/include/arch/i386/include/fpu.h b/minix/include/arch/i386/include/fpu.h index 50bbffcb4..f8271398f 100644 --- a/minix/include/arch/i386/include/fpu.h +++ b/minix/include/arch/i386/include/fpu.h @@ -10,10 +10,10 @@ struct fpu_regs_s { uint16_t fp_unused_2; uint16_t fp_tag; /* register tags */ uint16_t fp_unused_3; - u32_t fp_eip; /* eip at failed instruction */ + uint32_t fp_eip; /* eip at failed instruction */ uint16_t fp_cs; /* cs at failed instruction */ uint16_t fp_opcode; /* opcode of failed instruction */ - u32_t fp_dp; /* data address */ + uint32_t fp_dp; /* data address */ uint16_t fp_ds; /* data segment */ uint16_t fp_unused_4; uint16_t fp_st_regs[8][5]; /* 8 80-bit FP registers */ @@ -26,17 +26,17 @@ struct xfp_save { uint16_t fp_status; /* status */ uint16_t fp_tag; /* register tags */ uint16_t fp_opcode; /* opcode of failed instruction */ - u32_t fp_eip; /* eip at failed instruction */ + uint32_t fp_eip; /* eip at failed instruction */ uint16_t fp_cs; /* cs at failed instruction */ uint16_t fp_unused_1; - u32_t fp_dp; /* data address */ + uint32_t fp_dp; /* data address */ uint16_t fp_ds; /* data segment */ uint16_t fp_unused_2; - u32_t fp_mxcsr; /* MXCSR */ - u32_t fp_mxcsr_mask; /* MXCSR_MASK */ + uint32_t fp_mxcsr; /* MXCSR */ + uint32_t fp_mxcsr_mask; /* MXCSR_MASK */ uint16_t fp_st_regs[8][8]; /* 128 bytes for ST/MM regs */ - u32_t fp_xreg_word[32]; /* space for 8 128-bit XMM registers */ - u32_t fp_padding[56]; + uint32_t fp_xreg_word[32]; /* space for 8 128-bit XMM registers */ + uint32_t fp_padding[56]; }; /* Size of xfp_save structure. */ diff --git a/minix/include/minix/acpi.h b/minix/include/minix/acpi.h index 98e447d2a..fcc37e03a 100644 --- a/minix/include/minix/acpi.h +++ b/minix/include/minix/acpi.h @@ -6,7 +6,7 @@ struct acpi_request_hdr { endpoint_t m_source; /* message header */ - u32_t request; + uint32_t request; }; /* @@ -15,32 +15,32 @@ struct acpi_request_hdr { */ struct acpi_get_irq_req { struct acpi_request_hdr hdr; - u32_t bus; - u32_t dev; - u32_t pin; - u32_t __padding[4]; + uint32_t bus; + uint32_t dev; + uint32_t pin; + uint32_t __padding[4]; }; /* response from acpi to acpi_get_irq_req */ struct acpi_get_irq_resp { endpoint_t m_source; /* message header */ i32_t irq; - u32_t __padding[7]; + uint32_t __padding[7]; }; /* message format for pci bridge mappings to acpi */ struct acpi_map_bridge_req { struct acpi_request_hdr hdr; - u32_t primary_bus; - u32_t secondary_bus; - u32_t device; - u32_t __padding[4]; + uint32_t primary_bus; + uint32_t secondary_bus; + uint32_t device; + uint32_t __padding[4]; }; struct acpi_map_bridge_resp { endpoint_t m_source; /* message header */ int err; - u32_t __padding[7]; + uint32_t __padding[7]; }; int acpi_init(void); diff --git a/minix/include/minix/audio_fw.h b/minix/include/minix/audio_fw.h index 7a22739de..3a38ed615 100644 --- a/minix/include/minix/audio_fw.h +++ b/minix/include/minix/audio_fw.h @@ -11,7 +11,7 @@ int drv_init_hw(void); int drv_reset(void); int drv_start(int sub_dev, int DmaMode); int drv_stop(int sub_dev); -int drv_set_dma(u32_t dma, u32_t length, int chan); +int drv_set_dma(uint32_t dma, uint32_t length, int chan); int drv_reenable_int(int chan); int drv_int_sum(void); int drv_int(int sub_dev); @@ -19,7 +19,7 @@ int drv_pause(int chan); int drv_resume(int chan); int drv_io_ctl(unsigned long request, void * val, int * len, int sub_dev); int drv_get_irq(char *irq); -int drv_get_frag_size(u32_t *frag_size, int sub_dev); +int drv_get_frag_size(uint32_t *frag_size, int sub_dev); @@ -46,7 +46,7 @@ typedef struct { cdev_id_t ReviveId; /* request ID */ cp_grant_id_t ReviveGrant; /* grant id associated with io */ endpoint_t SourceProcNr; /* process to send notify to (FS) */ - u32_t FragSize; /* dma fragment size */ + uint32_t FragSize; /* dma fragment size */ char *DmaBuf; /* the dma buffer; extra space for page alignment */ phys_bytes DmaPhys; /* physical address of dma buffer */ diff --git a/minix/include/minix/btrace.h b/minix/include/minix/btrace.h index d97b7d952..d20445c7e 100644 --- a/minix/include/minix/btrace.h +++ b/minix/include/minix/btrace.h @@ -23,13 +23,13 @@ enum { /* Block trace entry. */ typedef struct { - u32_t request; /* request code; one of BTR_xxx */ - u32_t size; /* request size, ioctl request, or access */ + uint32_t request; /* request code; one of BTR_xxx */ + uint32_t size; /* request size, ioctl request, or access */ u64_t position; /* starting disk position */ - u32_t flags; /* transfer flags */ + uint32_t flags; /* transfer flags */ i32_t result; /* request result; OK, bytes, or error */ - u32_t start_time; /* request service start time (us) */ - u32_t finish_time; /* request service completion time (us) */ + uint32_t start_time; /* request service start time (us) */ + uint32_t finish_time; /* request service completion time (us) */ } btrace_entry; /* (32 bytes) */ /* This is the number of btrace_entry structures copied out at once using the diff --git a/minix/include/minix/clkconf.h b/minix/include/minix/clkconf.h index 51645221c..b26421ff3 100644 --- a/minix/include/minix/clkconf.h +++ b/minix/include/minix/clkconf.h @@ -12,7 +12,7 @@ #define CM_WKUP_I2C0_CLKCTRL 0x4B8 int clkconf_init(void); -int clkconf_set(u32_t clk, u32_t mask, u32_t value); +int clkconf_set(uint32_t clk, uint32_t mask, uint32_t value); int clkconf_release(void); #endif diff --git a/minix/include/minix/devio.h b/minix/include/minix/devio.h index 6042dde1d..00684df4d 100644 --- a/minix/include/minix/devio.h +++ b/minix/include/minix/devio.h @@ -10,7 +10,7 @@ #define _DEVIO_H #include /* needed to include */ -#include /* uint8_t, uint16_t, u32_t needed */ +#include /* uint8_t, uint16_t, uint32_t needed */ typedef uint16_t port_t; @@ -20,11 +20,11 @@ typedef uint16_t port_t; */ typedef struct { uint16_t port; uint8_t value; } pvb_pair_t; typedef struct { uint16_t port; uint16_t value; } pvw_pair_t; -typedef struct { uint16_t port; u32_t value; } pvl_pair_t; +typedef struct { uint16_t port; uint32_t value; } pvl_pair_t; /* Macro shorthand to set (port,value)-pair. */ #define pv_set(pv, p, v) do { \ - u32_t _p = (p), _v = (v); \ + uint32_t _p = (p), _v = (v); \ (pv).port = _p; \ (pv).value = _v; \ if((pv).port != _p || (pv).value != _v) { \ diff --git a/minix/include/minix/ds.h b/minix/include/minix/ds.h index ebe24f3ed..db5258584 100644 --- a/minix/include/minix/ds.h +++ b/minix/include/minix/ds.h @@ -34,8 +34,8 @@ /* ds.c */ /* U32 */ -int ds_publish_u32(const char *name, u32_t val, int flags); -int ds_retrieve_u32(const char *name, u32_t *val); +int ds_publish_u32(const char *name, uint32_t val, int flags); +int ds_retrieve_u32(const char *name, uint32_t *val); int ds_delete_u32(const char *ds_name); /* STRING */ diff --git a/minix/include/minix/fb.h b/minix/include/minix/fb.h index 947f05873..3028256f6 100644 --- a/minix/include/minix/fb.h +++ b/minix/include/minix/fb.h @@ -8,26 +8,26 @@ struct fb_fix_screeninfo { uint16_t xpanstep; uint16_t ypanstep; uint16_t ywrapstep; - u32_t line_length; + uint32_t line_length; phys_bytes mmio_start; size_t mmio_len; uint16_t reserved[15]; }; struct fb_bitfield { - u32_t offset; - u32_t length; - u32_t msb_right; + uint32_t offset; + uint32_t length; + uint32_t msb_right; }; struct fb_var_screeninfo { - u32_t xres; /* visible resolution */ - u32_t yres; - u32_t xres_virtual; /* virtual resolution */ - u32_t yres_virtual; - u32_t xoffset; /* offset from virtual to visible */ - u32_t yoffset; - u32_t bits_per_pixel; + uint32_t xres; /* visible resolution */ + uint32_t yres; + uint32_t xres_virtual; /* virtual resolution */ + uint32_t yres_virtual; + uint32_t xoffset; /* offset from virtual to visible */ + uint32_t yoffset; + uint32_t bits_per_pixel; struct fb_bitfield red; /* bitfield in fb mem if true color */ struct fb_bitfield green; struct fb_bitfield blue; diff --git a/minix/include/minix/hash.h b/minix/include/minix/hash.h index b4aab0103..671a59e3d 100644 --- a/minix/include/minix/hash.h +++ b/minix/include/minix/hash.h @@ -33,14 +33,14 @@ } #define hash_i_64(a, u, v) { \ - u32_t i1 = (a), i2 = ex64lo(u), i3 = ex64hi(u); \ + uint32_t i1 = (a), i2 = ex64lo(u), i3 = ex64hi(u); \ hash_mix(i1, i2, i3); \ hash_final(i1, i2, i3); \ (v) = i3; \ } #define hash_32(n, v) { \ - u32_t i1 = 0xa5a5a5a5, i2 = 0x12345678, i3 = n; \ + uint32_t i1 = 0xa5a5a5a5, i2 = 0x12345678, i3 = n; \ hash_mix(i1, i2, i3); \ hash_final(i1, i2, i3); \ (v) = i3; \ diff --git a/minix/include/minix/ipc.h b/minix/include/minix/ipc.h index 713f76100..8cb5de0f4 100644 --- a/minix/include/minix/ipc.h +++ b/minix/include/minix/ipc.h @@ -93,7 +93,7 @@ _ASSERT_MSG_SIZE(mess_10); /* Helper union for DS messages */ union ds_val { cp_grant_id_t grant; - u32_t u32; + uint32_t u32; endpoint_t ep; }; @@ -1588,7 +1588,7 @@ typedef struct { int fd; endpoint_t forwhom; void *retaddr; - u32_t padding[5]; + uint32_t padding[5]; } mess_mmap; _ASSERT_MSG_SIZE(mess_mmap); @@ -2371,10 +2371,10 @@ typedef struct { dev_t dev; ino_t ino; endpoint_t who; - u32_t vaddr; - u32_t len; - u32_t flags; - u32_t fd; + uint32_t vaddr; + uint32_t len; + uint32_t flags; + uint32_t fd; uint16_t clearend; uint8_t padding[8]; } mess_vm_vfs_mmap; @@ -2386,7 +2386,7 @@ typedef struct { off_t ino_offset; ino_t ino; void *block; - u32_t *flags_ptr; + uint32_t *flags_ptr; uint8_t pages; uint8_t flags; uint8_t padding[12]; diff --git a/minix/include/minix/libminixfs.h b/minix/include/minix/libminixfs.h index f63041cc5..617ca3294 100644 --- a/minix/include/minix/libminixfs.h +++ b/minix/include/minix/libminixfs.h @@ -21,7 +21,7 @@ struct buf { char lmfs_count; /* number of users of this buffer */ char lmfs_needsetcache; /* to be identified to VM */ size_t lmfs_bytes; /* size of this block (allocated and used) */ - u32_t lmfs_flags; /* Flags shared between VM and FS */ + uint32_t lmfs_flags; /* Flags shared between VM and FS */ /* If any, which inode & offset does this block correspond to? * If none, VMC_NO_INODE diff --git a/minix/include/minix/minlib.h b/minix/include/minix/minlib.h index ed35491bd..28bd3dac2 100644 --- a/minix/include/minix/minlib.h +++ b/minix/include/minix/minlib.h @@ -11,7 +11,7 @@ void std_err(const char *_s); void prints(const char *_s, ...); int fsversion(char *_dev, char *_prog); int getprocessor(void); -void _cpuid(u32_t *eax, u32_t *ebx, u32_t *ecx, u32_t *edx); +void _cpuid(uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx); int load_mtab(char *_prog_name); int get_mtab_entry(char dev[PATH_MAX], char mount_point[PATH_MAX], char type[MNTNAMELEN], char flags[MNTFLAGLEN]); @@ -20,7 +20,7 @@ int servxcheck(unsigned long peer, const char *service, const char *servxfile(const char *file); /* read_tsc() and friends */ -void read_tsc(u32_t *hi, u32_t *lo); +void read_tsc(uint32_t *hi, uint32_t *lo); void read_tsc_64(u64_t *t); /* return values for fsversion */ diff --git a/minix/include/minix/portio.h b/minix/include/minix/portio.h index cc3291410..7b4a1815f 100644 --- a/minix/include/minix/portio.h +++ b/minix/include/minix/portio.h @@ -14,7 +14,7 @@ unsigned inw(uint16_t _port); unsigned inl(uint16_t _port); void outb(uint16_t _port, uint8_t _value); void outw(uint16_t _port, uint16_t _value); -void outl(uint16_t _port, u32_t _value); +void outl(uint16_t _port, uint32_t _value); void intr_disable(void); void intr_enable(void); diff --git a/minix/include/minix/rs.h b/minix/include/minix/rs.h index a3374ea2a..02047bc3d 100644 --- a/minix/include/minix/rs.h +++ b/minix/include/minix/rs.h @@ -80,8 +80,8 @@ struct rs_pci_id { #define NO_SUB_DID 0xffff struct rs_pci_class { - u32_t pciclass; - u32_t mask; + uint32_t pciclass; + uint32_t mask; }; /* State-related data. */ diff --git a/minix/include/minix/sffs.h b/minix/include/minix/sffs.h index 97389ab04..83ef08498 100644 --- a/minix/include/minix/sffs.h +++ b/minix/include/minix/sffs.h @@ -11,7 +11,7 @@ typedef void *sffs_file_t; /* handle to open file */ typedef void *sffs_dir_t; /* handle to directory search */ struct sffs_attr { - u32_t a_mask; /* which fields to retrieve/set */ + uint32_t a_mask; /* which fields to retrieve/set */ mode_t a_mode; /* file type and permissions */ u64_t a_size; /* file size */ struct timespec a_crtime; /* file creation time */ diff --git a/minix/include/minix/spin.h b/minix/include/minix/spin.h index 1b6e1207b..80c172dcc 100644 --- a/minix/include/minix/spin.h +++ b/minix/include/minix/spin.h @@ -5,14 +5,14 @@ /* Opaque spin state structure. */ typedef struct { int s_state; - u32_t s_usecs; + uint32_t s_usecs; u64_t s_base_tsc; clock_t s_base_uptime; int s_timeout; } spin_t; /* Functions. */ -void spin_init(spin_t *s, u32_t usecs); +void spin_init(spin_t *s, uint32_t usecs); int spin_check(spin_t *s); /* Macros. */ diff --git a/minix/include/minix/syslib.h b/minix/include/minix/syslib.h index 357e8debb..70f3aeefd 100644 --- a/minix/include/minix/syslib.h +++ b/minix/include/minix/syslib.h @@ -32,7 +32,7 @@ int sys_enable_iop(endpoint_t proc_ep); int sys_exec(endpoint_t proc_ep, vir_bytes stack_ptr, vir_bytes progname, vir_bytes pc, vir_bytes ps_str); int sys_fork(endpoint_t parent, endpoint_t child, endpoint_t *, - u32_t vm, vir_bytes *); + uint32_t vm, vir_bytes *); int sys_clear(endpoint_t proc_ep); int sys_exit(void); int sys_trace(int req, endpoint_t proc_ep, long addr, long *data_p); @@ -58,8 +58,8 @@ int sys_setgrant(cp_grant_t *grants, int ngrants); int sys_vm_setbuf(phys_bytes base, phys_bytes size, phys_bytes high); int sys_vm_map(endpoint_t proc_ep, int do_map, phys_bytes base, phys_bytes size, phys_bytes offset); -int sys_vmctl(endpoint_t who, int param, u32_t value); -int sys_vmctl_get_pdbr(endpoint_t who, u32_t *pdbr); +int sys_vmctl(endpoint_t who, int param, uint32_t value); +int sys_vmctl_get_pdbr(endpoint_t who, uint32_t *pdbr); int sys_vmctl_get_memreq(endpoint_t *who, vir_bytes *mem, vir_bytes *len, int *wrflag, endpoint_t *who_s, vir_bytes *mem_s, endpoint_t *); int sys_vmctl_enable_paging(void * data); @@ -214,19 +214,19 @@ int sys_vinw(pvw_pair_t *pvw_pairs, int nr_ports); int sys_vinl(pvl_pair_t *pvl_pairs, int nr_ports); /* Shorthands for sys_out() system call. */ -#define sys_outb(p,v) sys_out((p), (u32_t) (v), _DIO_BYTE) -#define sys_outw(p,v) sys_out((p), (u32_t) (v), _DIO_WORD) -#define sys_outl(p,v) sys_out((p), (u32_t) (v), _DIO_LONG) -int sys_out(int port, u32_t value, int type); +#define sys_outb(p,v) sys_out((p), (uint32_t) (v), _DIO_BYTE) +#define sys_outw(p,v) sys_out((p), (uint32_t) (v), _DIO_WORD) +#define sys_outl(p,v) sys_out((p), (uint32_t) (v), _DIO_LONG) +int sys_out(int port, uint32_t value, int type); /* Shorthands for sys_in() system call. */ #define sys_inb(p,v) sys_in((p), (v), _DIO_BYTE) #define sys_inw(p,v) sys_in((p), (v), _DIO_WORD) #define sys_inl(p,v) sys_in((p), (v), _DIO_LONG) -int sys_in(int port, u32_t *value, int type); +int sys_in(int port, uint32_t *value, int type); /* arm pinmux */ -int sys_padconf(u32_t padconf, u32_t mask, u32_t value); +int sys_padconf(uint32_t padconf, uint32_t mask, uint32_t value); /* pci.c */ void pci_init(void); @@ -239,15 +239,15 @@ void pci_ids(int devind, uint16_t *vidp, uint16_t *didp); void pci_rescan_bus(uint8_t busnr); uint8_t pci_attr_r8(int devind, int port); uint16_t pci_attr_r16(int devind, int port); -u32_t pci_attr_r32(int devind, int port); +uint32_t pci_attr_r32(int devind, int port); void pci_attr_w8(int devind, int port, uint8_t value); void pci_attr_w16(int devind, int port, uint16_t value); -void pci_attr_w32(int devind, int port, u32_t value); +void pci_attr_w32(int devind, int port, uint32_t value); char *pci_dev_name(uint16_t vid, uint16_t did); char *pci_slot_name(int devind); int pci_set_acl(struct rs_pci *rs_pci); int pci_del_acl(endpoint_t proc_ep); -int pci_get_bar(int devind, int port, u32_t *base, u32_t *size, int +int pci_get_bar(int devind, int port, uint32_t *base, uint32_t *size, int *ioflag); /* Profiling. */ diff --git a/minix/include/minix/sysutil.h b/minix/include/minix/sysutil.h index dc259949d..4d2db0008 100644 --- a/minix/include/minix/sysutil.h +++ b/minix/include/minix/sysutil.h @@ -57,25 +57,25 @@ int getuptime(clock_t *ticks, clock_t *realtime, time_t *boottime); clock_t getticks(void); int tickdelay(clock_t ticks); int tsc_calibrate(void); -u32_t sys_hz(void); +uint32_t sys_hz(void); double getidle(void); void util_stacktrace(void); -int micro_delay(u32_t micros); -u32_t tsc_64_to_micros(u64_t tsc); -u32_t tsc_to_micros(u32_t low, u32_t high); -u32_t tsc_get_khz(void); -u32_t micros_to_ticks(u32_t micros); +int micro_delay(uint32_t micros); +uint32_t tsc_64_to_micros(u64_t tsc); +uint32_t tsc_to_micros(uint32_t low, uint32_t high); +uint32_t tsc_get_khz(void); +uint32_t micros_to_ticks(uint32_t micros); time_t clock_time(struct timespec *tv); #if defined(__arm__) -void read_frclock(u32_t *frclk); -u32_t delta_frclock(u32_t base, u32_t cur); +void read_frclock(uint32_t *frclk); +uint32_t delta_frclock(uint32_t base, uint32_t cur); #endif void read_frclock_64(u64_t *frclk); u64_t delta_frclock_64(u64_t base, u64_t cur); -u32_t frclock_64_to_micros(u64_t tsc); +uint32_t frclock_64_to_micros(u64_t tsc); void ser_putc(char c); void get_randomness(struct k_randomness *, int); -u32_t sqrt_approx(u32_t); +uint32_t sqrt_approx(uint32_t); int stime(time_t *_top); diff --git a/minix/include/minix/timers.h b/minix/include/minix/timers.h index cfe921ea6..9c8ab8520 100644 --- a/minix/include/minix/timers.h +++ b/minix/include/minix/timers.h @@ -91,7 +91,7 @@ int tmrs_exptimers(minix_timer_t **tmrs, clock_t now, clock_t *new_head); static u64_t _cum_spenttime, _cum_starttime; \ static int _cum_instances; \ u64_t _next_cum_spent, _starttime, _endtime, _dt, _cum_dt; \ - u32_t _dt_micros; \ + uint32_t _dt_micros; \ read_tsc_64(&_starttime); \ do { timed_code_block } while(0); \ read_tsc_64(&_endtime); \ diff --git a/minix/include/minix/type.h b/minix/include/minix/type.h index 7d31b7bae..b9b70f2cd 100644 --- a/minix/include/minix/type.h +++ b/minix/include/minix/type.h @@ -196,7 +196,7 @@ struct k_randomness { /* ARM free-running timer information. */ struct arm_frclock { u64_t hz; /* tcrr frequency */ - u32_t tcrr; /* tcrr address */ + uint32_t tcrr; /* tcrr address */ }; /* The userland ABI portion of general information exposed by the kernel. @@ -227,12 +227,12 @@ struct minix_kerninfo { * layout of the 'kinfo' structure. */ #define KERNINFO_MAGIC 0xfc3b84bf - u32_t kerninfo_magic; - u32_t minix_feature_flags; /* features in minix kernel */ - u32_t ki_flags; /* what is present in this struct */ - u32_t flags_unused2; - u32_t flags_unused3; - u32_t flags_unused4; + uint32_t kerninfo_magic; + uint32_t minix_feature_flags; /* features in minix kernel */ + uint32_t ki_flags; /* what is present in this struct */ + uint32_t flags_unused2; + uint32_t flags_unused3; + uint32_t flags_unused4; struct kinfo *kinfo; /* see note above! */ struct machine *machine; /* NOT userland ABI */ struct kmessages *kmessages; /* NOT userland ABI */ diff --git a/minix/include/minix/usb.h b/minix/include/minix/usb.h index 8b4aab608..6b8721acb 100644 --- a/minix/include/minix/usb.h +++ b/minix/include/minix/usb.h @@ -30,7 +30,7 @@ struct usb_driver { struct usb_device_id { uint16_t idVendor; uint16_t idProduct; - u32_t bcdDevice; + uint32_t bcdDevice; uint8_t bDeviceClass; uint8_t bDeviceSubClass; diff --git a/minix/include/minix/vbox.h b/minix/include/minix/vbox.h index 467f06701..721b220c7 100644 --- a/minix/include/minix/vbox.h +++ b/minix/include/minix/vbox.h @@ -9,17 +9,17 @@ extern int vbox_init(void); extern vbox_conn_t vbox_open(const char *name); extern int vbox_close(vbox_conn_t conn); -extern int vbox_call(vbox_conn_t conn, u32_t function, vbox_param_t *param, +extern int vbox_call(vbox_conn_t conn, uint32_t function, vbox_param_t *param, int count, int *code); -extern void vbox_set_u32(vbox_param_t *param, u32_t value); +extern void vbox_set_u32(vbox_param_t *param, uint32_t value); extern void vbox_set_u64(vbox_param_t *param, u64_t value); extern void vbox_set_ptr(vbox_param_t *param, void *ptr, size_t size, unsigned int dir); extern void vbox_set_grant(vbox_param_t *param, endpoint_t endpt, cp_grant_id_t grant, size_t off, size_t size, unsigned int dir); -extern u32_t vbox_get_u32(vbox_param_t *param); +extern uint32_t vbox_get_u32(vbox_param_t *param); extern u64_t vbox_get_u64(vbox_param_t *param); extern void vbox_put(vbox_param_t *param, int count); diff --git a/minix/include/minix/vboxtype.h b/minix/include/minix/vboxtype.h index cada0f3cf..f5cf9c1cb 100644 --- a/minix/include/minix/vboxtype.h +++ b/minix/include/minix/vboxtype.h @@ -22,7 +22,7 @@ typedef enum { typedef struct { vbox_type_t type; union { - u32_t u32; + uint32_t u32; u64_t u64; struct { cp_grant_id_t grant; diff --git a/minix/include/minix/virtio.h b/minix/include/minix/virtio.h index b39db7993..9aab03356 100644 --- a/minix/include/minix/virtio.h +++ b/minix/include/minix/virtio.h @@ -115,10 +115,10 @@ void virtio_irq_disable(struct virtio_device *dev); int virtio_had_irq(struct virtio_device *dev); -u32_t virtio_read32(struct virtio_device *dev, i32_t offset); +uint32_t virtio_read32(struct virtio_device *dev, i32_t offset); uint16_t virtio_read16(struct virtio_device *dev, i32_t offset); uint8_t virtio_read8(struct virtio_device *dev, i32_t offset); -void virtio_write32(struct virtio_device *dev, i32_t offset, u32_t val); +void virtio_write32(struct virtio_device *dev, i32_t offset, uint32_t val); void virtio_write16(struct virtio_device *dev, i32_t offset, uint16_t val); void virtio_write8(struct virtio_device *dev, i32_t offset, uint8_t val); @@ -130,10 +130,10 @@ void virtio_write8(struct virtio_device *dev, i32_t offset, uint8_t val); * Something like: * read(off) --> readX(20 + (msi ? 4 : 0) + off) */ -u32_t virtio_sread32(struct virtio_device *dev, i32_t offset); +uint32_t virtio_sread32(struct virtio_device *dev, i32_t offset); uint16_t virtio_sread16(struct virtio_device *dev, i32_t offset); uint8_t virtio_sread8(struct virtio_device *dev, i32_t offset); -void virtio_swrite32(struct virtio_device *dev, i32_t offset, u32_t val); +void virtio_swrite32(struct virtio_device *dev, i32_t offset, uint32_t val); void virtio_swrite16(struct virtio_device *dev, i32_t offset, uint16_t val); void virtio_swrite8(struct virtio_device *dev, i32_t offset, uint8_t val); diff --git a/minix/include/minix/vm.h b/minix/include/minix/vm.h index 1dc031db5..7fb62eb76 100644 --- a/minix/include/minix/vm.h +++ b/minix/include/minix/vm.h @@ -21,13 +21,13 @@ int vm_update(endpoint_t src_e, endpoint_t dst_e, int flags); int vm_memctl(endpoint_t ep, int req, void** addr, size_t *len); int vm_prepare(endpoint_t src_e, endpoint_t dst_e, int flags); int minix_vfs_mmap(endpoint_t who, off_t offset, size_t len, - dev_t dev, ino_t ino, int fd, u32_t vaddr, uint16_t clearend, uint16_t + dev_t dev, ino_t ino, int fd, uint32_t vaddr, uint16_t clearend, uint16_t flags); void *minix_mmap_for(endpoint_t forwhom, void *addr, size_t len, int prot, int flags, int fd, off_t offset); int minix_vfs_mmap(endpoint_t who, off_t offset, size_t len, - dev_t dev, ino_t ino, int fd, u32_t vaddr, uint16_t clearend, + dev_t dev, ino_t ino, int fd, uint32_t vaddr, uint16_t clearend, uint16_t flags); /* minix vfs mmap flags */ @@ -73,10 +73,10 @@ int vm_procctl_clear(endpoint_t ep); int vm_procctl_handlemem(endpoint_t ep, vir_bytes m1, vir_bytes m2, int wr); int vm_set_cacheblock(void *block, dev_t dev, off_t dev_offset, - ino_t ino, off_t ino_offset, u32_t *flags, int blocksize, + ino_t ino, off_t ino_offset, uint32_t *flags, int blocksize, int setflags); void *vm_map_cacheblock(dev_t dev, off_t dev_offset, - ino_t ino, off_t ino_offset, u32_t *flags, int blocksize); + ino_t ino, off_t ino_offset, uint32_t *flags, int blocksize); int vm_forget_cacheblock(dev_t dev, off_t dev_offset, int blocksize); int vm_clear_cache(dev_t dev); diff --git a/minix/include/net/gen/arp_io.h b/minix/include/net/gen/arp_io.h index 583cd6f31..3dea2d2c7 100644 --- a/minix/include/net/gen/arp_io.h +++ b/minix/include/net/gen/arp_io.h @@ -7,7 +7,7 @@ Created: Jan 2001 by Philip Homburg typedef struct nwio_arp { int nwa_entno; - u32_t nwa_flags; + uint32_t nwa_flags; ipaddr_t nwa_ipaddr; ether_addr_t nwa_ethaddr; } nwio_arp_t; diff --git a/minix/include/net/gen/dhcp.h b/minix/include/net/gen/dhcp.h index 8661b5c9b..ad3034c11 100644 --- a/minix/include/net/gen/dhcp.h +++ b/minix/include/net/gen/dhcp.h @@ -10,7 +10,7 @@ typedef struct dhcp { uint8_t htype; /* Hardware address type. */ uint8_t hlen; /* Hardware address length. */ uint8_t hops; /* Hop count when relaying. */ - u32_t xid; /* Transaction ID. */ + uint32_t xid; /* Transaction ID. */ uint16_t secs; /* Seconds past since client began. */ uint16_t flags; /* Flags. */ ipaddr_t ciaddr; /* Client IP address. */ @@ -20,7 +20,7 @@ typedef struct dhcp { uint8_t chaddr[16]; /* Client hardware address. */ uint8_t sname[64]; /* Server host name. */ uint8_t file[128]; /* Boot file. */ - u32_t magic; /* Magic number. */ + uint32_t magic; /* Magic number. */ uint8_t options[308]; /* Optional parameters. */ } dhcp_t; diff --git a/minix/include/net/gen/eth_io.h b/minix/include/net/gen/eth_io.h index bcc320514..d995ea24f 100644 --- a/minix/include/net/gen/eth_io.h +++ b/minix/include/net/gen/eth_io.h @@ -9,7 +9,7 @@ server/gen/ip/eth_io.h typedef struct nwio_ethopt { - u32_t nweo_flags; + uint32_t nweo_flags; ether_addr_t nweo_multi, nweo_rem; ether_type_t nweo_type; } nwio_ethopt_t; diff --git a/minix/include/net/gen/icmp_hdr.h b/minix/include/net/gen/icmp_hdr.h index cd88a1618..30cabc3a6 100644 --- a/minix/include/net/gen/icmp_hdr.h +++ b/minix/include/net/gen/icmp_hdr.h @@ -41,7 +41,7 @@ typedef struct icmp_hdr uint16_t ih_chksum; union { - u32_t ihh_unused; + uint32_t ihh_unused; icmp_id_seq_t ihh_idseq; ipaddr_t ihh_gateway; icmp_ram_t ihh_ram; diff --git a/minix/include/net/gen/in.h b/minix/include/net/gen/in.h index ec67237c0..8992154b5 100644 --- a/minix/include/net/gen/in.h +++ b/minix/include/net/gen/in.h @@ -25,7 +25,7 @@ server/ip/gen/in.h #define IP_MC_ALL_SYSTEMS 0xE0000001 /* 224.0.0.1 */ -typedef u32_t ipaddr_t; +typedef uint32_t ipaddr_t; typedef uint8_t ipproto_t; typedef struct ip_hdropt { diff --git a/minix/include/net/gen/ip_io.h b/minix/include/net/gen/ip_io.h index c7a895d2d..138baa9e5 100644 --- a/minix/include/net/gen/ip_io.h +++ b/minix/include/net/gen/ip_io.h @@ -7,14 +7,14 @@ server/ip/gen/ip_io.h typedef struct nwio_ipconf2 { - u32_t nwic_flags; + uint32_t nwic_flags; ipaddr_t nwic_ipaddr; ipaddr_t nwic_netmask; } nwio_ipconf2_t; typedef struct nwio_ipconf { - u32_t nwic_flags; + uint32_t nwic_flags; ipaddr_t nwic_ipaddr; ipaddr_t nwic_netmask; uint16_t nwic_mtu; @@ -28,7 +28,7 @@ typedef struct nwio_ipconf typedef struct nwio_ipopt { - u32_t nwio_flags; + uint32_t nwio_flags; ipaddr_t nwio_rem; ip_hdropt_t nwio_hdropt; uint8_t nwio_tos; diff --git a/minix/include/net/gen/psip_hdr.h b/minix/include/net/gen/psip_hdr.h index 615087ddd..a991dfdef 100644 --- a/minix/include/net/gen/psip_hdr.h +++ b/minix/include/net/gen/psip_hdr.h @@ -9,7 +9,7 @@ typedef struct psip_io_hdr { uint8_t pih_flags; uint8_t pih_dummy[3]; - u32_t pih_nexthop; + uint32_t pih_nexthop; } psip_io_hdr_t; #define PF_LOC_REM_MASK 1 diff --git a/minix/include/net/gen/rip.h b/minix/include/net/gen/rip.h index 3bae96eb3..8f4c43bd6 100644 --- a/minix/include/net/gen/rip.h +++ b/minix/include/net/gen/rip.h @@ -29,19 +29,19 @@ typedef struct rip_entry { uint16_t re_family; uint16_t re_zero0; - u32_t re_address; - u32_t re_zero1; - u32_t re_zero2; - u32_t re_metric; + uint32_t re_address; + uint32_t re_zero1; + uint32_t re_zero2; + uint32_t re_metric; } v1; struct rip_entry_v2 { uint16_t re_family; uint16_t re_tag; - u32_t re_address; - u32_t re_mask; - u32_t re_nexthop; - u32_t re_metric; + uint32_t re_address; + uint32_t re_mask; + uint32_t re_nexthop; + uint32_t re_metric; } v2; } u; } rip_entry_t; diff --git a/minix/include/net/gen/route.h b/minix/include/net/gen/route.h index a2a8c28c5..56412bd0b 100644 --- a/minix/include/net/gen/route.h +++ b/minix/include/net/gen/route.h @@ -7,15 +7,15 @@ server/ip/gen/route.h typedef struct nwio_route { - u32_t nwr_ent_no; - u32_t nwr_ent_count; + uint32_t nwr_ent_no; + uint32_t nwr_ent_count; ipaddr_t nwr_dest; ipaddr_t nwr_netmask; ipaddr_t nwr_gateway; - u32_t nwr_dist; - u32_t nwr_flags; - u32_t nwr_pref; - u32_t nwr_mtu; /* Ignored, compatibility with VMD */ + uint32_t nwr_dist; + uint32_t nwr_flags; + uint32_t nwr_pref; + uint32_t nwr_mtu; /* Ignored, compatibility with VMD */ ipaddr_t nwr_ifaddr; } nwio_route_t; diff --git a/minix/include/net/gen/tcp_hdr.h b/minix/include/net/gen/tcp_hdr.h index 554568dc4..00d0d6fd2 100644 --- a/minix/include/net/gen/tcp_hdr.h +++ b/minix/include/net/gen/tcp_hdr.h @@ -9,8 +9,8 @@ typedef struct tcp_hdr { tcpport_t th_srcport; tcpport_t th_dstport; - u32_t th_seq_nr; - u32_t th_ack_nr; + uint32_t th_seq_nr; + uint32_t th_ack_nr; uint8_t th_data_off; uint8_t th_flags; uint16_t th_window; diff --git a/minix/include/net/gen/tcp_io.h b/minix/include/net/gen/tcp_io.h index db83a8b7d..09aeefaba 100644 --- a/minix/include/net/gen/tcp_io.h +++ b/minix/include/net/gen/tcp_io.h @@ -7,7 +7,7 @@ server/ip/gen/tcp_io.h typedef struct nwio_tcpconf { - u32_t nwtc_flags; + uint32_t nwtc_flags; ipaddr_t nwtc_locaddr; ipaddr_t nwtc_remaddr; tcpport_t nwtc_locport; @@ -48,7 +48,7 @@ typedef struct nwio_tcpatt typedef struct nwio_tcpopt { - u32_t nwto_flags; + uint32_t nwto_flags; } nwio_tcpopt_t; #define NWTO_NOFLAG 0x0000L @@ -71,7 +71,7 @@ typedef struct nwio_tcpopt typedef struct tcp_cookie { - u32_t tc_ref; + uint32_t tc_ref; uint8_t tc_secret[TC_SECRET_SIZE]; } tcp_cookie_t; diff --git a/minix/include/net/gen/vjhc.h b/minix/include/net/gen/vjhc.h index 912860633..c0a7162df 100644 --- a/minix/include/net/gen/vjhc.h +++ b/minix/include/net/gen/vjhc.h @@ -53,7 +53,7 @@ Created: Nov 15, 1993 by Philip Homburg (cp) += 3; \ } \ else \ - (l)= htonl(ntohl((l)) + (u32_t)*(cp)++); \ + (l)= htonl(ntohl((l)) + (uint32_t)*(cp)++); \ } #define VJHC_DECODES(cp, s) \ diff --git a/minix/include/sys/ioc_fbd.h b/minix/include/sys/ioc_fbd.h index 4626d827c..aca51d421 100644 --- a/minix/include/sys/ioc_fbd.h +++ b/minix/include/sys/ioc_fbd.h @@ -30,11 +30,11 @@ struct fbd_rule { struct { u64_t start; /* start position of target area */ u64_t end; /* end position of area (excl) */ - u32_t align; /* alignment to use in target area */ + uint32_t align; /* alignment to use in target area */ } misdir; struct { - u32_t lead; /* # bytes to process normally */ + uint32_t lead; /* # bytes to process normally */ } losttorn; } params; }; diff --git a/minix/include/sys/ioc_memory.h b/minix/include/sys/ioc_memory.h index f025a55bb..dfef1a0cd 100644 --- a/minix/include/sys/ioc_memory.h +++ b/minix/include/sys/ioc_memory.h @@ -9,6 +9,6 @@ #include -#define MIOCRAMSIZE _IOW('m', 3, u32_t) +#define MIOCRAMSIZE _IOW('m', 3, uint32_t) #endif /* _S_I_MEMORY_H */ diff --git a/minix/kernel/arch/earm/arch_do_vmctl.c b/minix/kernel/arch/earm/arch_do_vmctl.c index d1cd417c0..67a4582eb 100644 --- a/minix/kernel/arch/earm/arch_do_vmctl.c +++ b/minix/kernel/arch/earm/arch_do_vmctl.c @@ -13,7 +13,7 @@ #include "arch_proto.h" -static void set_ttbr(struct proc *p, u32_t ttbr, u32_t *v) +static void set_ttbr(struct proc *p, uint32_t ttbr, uint32_t *v) { /* Set process TTBR. */ p->p_seg.p_ttbr = ttbr; @@ -43,7 +43,7 @@ int arch_do_vmctl( m_ptr->SVMCTL_VALUE = p->p_seg.p_ttbr; return OK; case VMCTL_SETADDRSPACE: - set_ttbr(p, m_ptr->SVMCTL_PTROOT, (u32_t *) m_ptr->SVMCTL_PTROOT_V); + set_ttbr(p, m_ptr->SVMCTL_PTROOT, (uint32_t *) m_ptr->SVMCTL_PTROOT_V); return OK; case VMCTL_FLUSHTLB: { diff --git a/minix/kernel/arch/earm/arch_system.c b/minix/kernel/arch/earm/arch_system.c index 7e7de8d61..95eb750a6 100644 --- a/minix/kernel/arch/earm/arch_system.c +++ b/minix/kernel/arch/earm/arch_system.c @@ -72,7 +72,7 @@ void arch_proc_setcontext(struct proc *p, struct stackframe_s *state, } } -void arch_set_secondary_ipc_return(struct proc *p, u32_t val) +void arch_set_secondary_ipc_return(struct proc *p, uint32_t val) { p->p_reg.r1 = val; } @@ -84,7 +84,7 @@ int restore_fpu(struct proc *pr) void cpu_identify(void) { - u32_t midr; + uint32_t midr; unsigned cpu = cpuid; asm volatile("mrc p15, 0, %[midr], c0, c0, 0 @ read MIDR\n\t" @@ -100,7 +100,7 @@ void cpu_identify(void) void arch_init(void) { - u32_t value; + uint32_t value; k_stacks = (void*) &k_stacks_start; assert(!((vir_bytes) k_stacks % K_STACK_SIZE)); diff --git a/minix/kernel/arch/earm/bsp/include/bsp_padconf.h b/minix/kernel/arch/earm/bsp/include/bsp_padconf.h index 5aa9c5341..6f0d2469a 100644 --- a/minix/kernel/arch/earm/bsp/include/bsp_padconf.h +++ b/minix/kernel/arch/earm/bsp/include/bsp_padconf.h @@ -4,7 +4,7 @@ #ifndef __ASSEMBLY__ void bsp_padconf_init(void); -int bsp_padconf_set(u32_t padconf, u32_t mask, u32_t value); +int bsp_padconf_set(uint32_t padconf, uint32_t mask, uint32_t value); #endif /* __ASSEMBLY__ */ diff --git a/minix/kernel/arch/earm/bsp/ti/omap_padconf.c b/minix/kernel/arch/earm/bsp/ti/omap_padconf.c index 318769bea..39751ca6e 100644 --- a/minix/kernel/arch/earm/bsp/ti/omap_padconf.c +++ b/minix/kernel/arch/earm/bsp/ti/omap_padconf.c @@ -47,7 +47,7 @@ static struct omap_padconf *omap_padconf; static kern_phys_map padconf_phys_map; int -bsp_padconf_set(u32_t padconf, u32_t mask, u32_t value) +bsp_padconf_set(uint32_t padconf, uint32_t mask, uint32_t value) { /* check that the value will be inside the padconf memory range */ if (padconf >= (omap_padconf->size - omap_padconf->offset)) { diff --git a/minix/kernel/arch/earm/bsp/ti/omap_timer.c b/minix/kernel/arch/earm/bsp/ti/omap_timer.c index 6226e9a19..c96a67044 100644 --- a/minix/kernel/arch/earm/bsp/ti/omap_timer.c +++ b/minix/kernel/arch/earm/bsp/ti/omap_timer.c @@ -172,7 +172,7 @@ kern_phys_fr_user_mapped(vir_bytes id, phys_bytes address) void omap3_frclock_init(void) { - u32_t tisr; + uint32_t tisr; /* enable the clock */ if (BOARD_IS_BBXM(machine.board_id)) { @@ -267,7 +267,7 @@ void bsp_timer_init(unsigned freq) { /* we only support 1ms resolution */ - u32_t tisr; + uint32_t tisr; if (BOARD_IS_BBXM(machine.board_id)) { timer = &dm37xx_timer; kern_phys_map_ptr(timer->base, ARM_PAGE_SIZE, @@ -333,7 +333,7 @@ bsp_timer_stop(void) mmio_clear(timer->base + timer->regs->TCLR, OMAP3_TCLR_ST); } -static u32_t +static uint32_t read_frc(void) { if (done == 0) { @@ -357,10 +357,10 @@ read_frc(void) * and high_frc. */ static void -frc_overflow_check(u32_t cur_frc) +frc_overflow_check(uint32_t cur_frc) { static int prev_frc_valid; - static u32_t prev_frc; + static uint32_t prev_frc; if (prev_frc_valid && prev_frc > cur_frc) { high_frc++; } @@ -372,7 +372,7 @@ void bsp_timer_int_handler(void) { /* Clear all interrupts */ - u32_t tisr, now; + uint32_t tisr, now; /* when the kernel itself is running interrupts are disabled. We * should therefore also read the overflow counter to detect this as @@ -389,7 +389,7 @@ bsp_timer_int_handler(void) void read_tsc_64(u64_t * t) { - u32_t now; + uint32_t now; now = read_frc(); frc_overflow_check(now); *t = (u64_t) now + (high_frc << 32); diff --git a/minix/kernel/arch/earm/exception.c b/minix/kernel/arch/earm/exception.c index 19c400822..70f73fafb 100644 --- a/minix/kernel/arch/earm/exception.c +++ b/minix/kernel/arch/earm/exception.c @@ -38,8 +38,8 @@ static void proc_stacktrace_execute(struct proc *whichproc, reg_t v_bp, reg_t pc static void pagefault( struct proc *pr, reg_t *saved_lr, int is_nested, - u32_t pagefault_addr, - u32_t pagefault_status) + uint32_t pagefault_addr, + uint32_t pagefault_status) { int in_physcopy = 0, in_memset = 0; diff --git a/minix/kernel/arch/earm/include/arch_proto.h b/minix/kernel/arch/earm/include/arch_proto.h index f88bab3fd..1fe3fce64 100644 --- a/minix/kernel/arch/earm/include/arch_proto.h +++ b/minix/kernel/arch/earm/include/arch_proto.h @@ -14,7 +14,7 @@ /* klib */ __dead void reset(void); phys_bytes vir2phys(void *); -vir_bytes phys_memset(phys_bytes ph, u32_t c, phys_bytes bytes); +vir_bytes phys_memset(phys_bytes ph, uint32_t c, phys_bytes bytes); void __switch_address_space(struct proc *p, struct proc **__ptproc); #define switch_address_space(proc) \ @@ -38,7 +38,7 @@ phys_bytes alloc_lowest(kinfo_t *cbi, phys_bytes len); void vm_enable_paging(void); void cut_memmap(kinfo_t *cbi, phys_bytes start, phys_bytes end); phys_bytes pg_roundup(phys_bytes b); -void pg_info(reg_t *, u32_t **); +void pg_info(reg_t *, uint32_t **); void pg_clear(void); void pg_identity(kinfo_t *); phys_bytes pg_load(void); diff --git a/minix/kernel/arch/earm/include/cpufunc.h b/minix/kernel/arch/earm/include/cpufunc.h index 6839b9185..333a8270a 100644 --- a/minix/kernel/arch/earm/include/cpufunc.h +++ b/minix/kernel/arch/earm/include/cpufunc.h @@ -44,8 +44,8 @@ static inline void barrier(void) /* Read CLIDR, Cache Level ID Register */ -static inline u32_t read_clidr(void){ - u32_t clidr; +static inline uint32_t read_clidr(void){ + uint32_t clidr; asm volatile("mrc p15, 1, %[clidr], c0, c0 , 1 @ READ CLIDR\n\t" : [clidr] "=r" (clidr)); return clidr; @@ -53,47 +53,47 @@ static inline u32_t read_clidr(void){ /* Read CSSELR, Cache Size Selection Register */ -static inline u32_t read_csselr(void){ - u32_t csselr; +static inline uint32_t read_csselr(void){ + uint32_t csselr; asm volatile("mrc p15, 2, %[csselr], c0, c0 , 0 @ READ CSSELR\n\t" : [csselr] "=r" (csselr)); return csselr; } /* Write CSSELR, Cache Size Selection Register */ -static inline void write_csselr(u32_t csselr){ +static inline void write_csselr(uint32_t csselr){ asm volatile("mcr p15, 2, %[csselr], c0, c0 , 0 @ WRITE CSSELR\n\t" : : [csselr] "r" (csselr)); } /* Read Cache Size ID Register */ -static inline u32_t read_ccsidr(void) +static inline uint32_t read_ccsidr(void) { - u32_t ccsidr; + uint32_t ccsidr; asm volatile("mrc p15, 1, %[ccsidr], c0, c0, 0 @ Read CCSIDR\n\t" : [ccsidr] "=r" (ccsidr)); return ccsidr; } /* Read TLBTR, TLB Type Register */ -static inline u32_t read_tlbtr(void) +static inline uint32_t read_tlbtr(void) { - u32_t tlbtr; + uint32_t tlbtr; asm volatile("mrc p15, 0, %[tlbtr], c0, c0, 3 @ Read TLBTR\n\t" : [tlbtr] "=r" (tlbtr)); return tlbtr; } /* keesj:move these out */ -static inline u32_t ilog2(u32_t t) +static inline uint32_t ilog2(uint32_t t) { - u32_t counter =0; + uint32_t counter =0; while( (t = t >> 1) ) counter ++; return counter; } /* keesj:move these out */ -static inline u32_t ipow2(u32_t t) +static inline uint32_t ipow2(uint32_t t) { return 1 << t; } @@ -103,18 +103,18 @@ static inline u32_t ipow2(u32_t t) * type = 2 == INVALIDATE */ static inline void dcache_maint(int type){ - u32_t cache_level ; - u32_t clidr; - u32_t ctype; - u32_t ccsidr; - u32_t line_size,line_length; - u32_t number_of_sets,number_of_ways; - u32_t set,way; + uint32_t cache_level ; + uint32_t clidr; + uint32_t ctype; + uint32_t ccsidr; + uint32_t line_size,line_length; + uint32_t number_of_sets,number_of_ways; + uint32_t set,way; clidr = read_clidr(); - u32_t loc = ( clidr >> 24) & 0x7; - u32_t louu = ( clidr >> 27) & 0x7; - u32_t louis = ( clidr >> 21) & 0x7; + uint32_t loc = ( clidr >> 24) & 0x7; + uint32_t louu = ( clidr >> 27) & 0x7; + uint32_t louis = ( clidr >> 21) & 0x7; for (cache_level =0 ; cache_level < loc; cache_level++){ /* get current cache type */ ctype = ( clidr >> cache_level*3) & 0x7; @@ -127,15 +127,15 @@ static inline void dcache_maint(int type){ number_of_sets = ((ccsidr >> 13) & 0x7fff) + 1; number_of_ways = ((ccsidr >> 3) & 0x3ff) + 1; - u32_t way_bits = ilog2(number_of_ways); + uint32_t way_bits = ilog2(number_of_ways); if(ipow2(ilog2(number_of_ways) < number_of_ways) ) { way_bits++; } - u32_t l = ilog2(line_length); + uint32_t l = ilog2(line_length); for (way =0 ; way < number_of_ways; way++) { for (set =0 ; set < number_of_sets; set++) { - u32_t val = ( way << (32 - way_bits) ) | (set << l) | (cache_level << 1 ); + uint32_t val = ( way << (32 - way_bits) ) | (set << l) | (cache_level << 1 ); if (type == 1) { /* DCCISW, Data Cache Clean and Invalidate by Set/Way */ asm volatile("mcr p15, 0, %[set], c7, c14, 2 @ DCCISW" @@ -189,9 +189,9 @@ static inline void refresh_tlb(void) /* Read System Control Register */ -static inline u32_t read_sctlr(void) +static inline uint32_t read_sctlr(void) { - u32_t ctl; + uint32_t ctl; asm volatile("mrc p15, 0, %[ctl], c1, c0, 0 @ Read SCTLR\n\t" : [ctl] "=r" (ctl)); @@ -200,7 +200,7 @@ static inline u32_t read_sctlr(void) } /* Write System Control Register */ -static inline void write_sctlr(u32_t ctl) +static inline void write_sctlr(uint32_t ctl) { asm volatile("mcr p15, 0, %[ctl], c1, c0, 0 @ Write SCTLR\n\t" : : [ctl] "r" (ctl)); @@ -208,9 +208,9 @@ static inline void write_sctlr(u32_t ctl) } /* Read Translation Table Base Register 0 */ -static inline u32_t read_ttbr0(void) +static inline uint32_t read_ttbr0(void) { - u32_t bar; + uint32_t bar; asm volatile("mrc p15, 0, %[bar], c2, c0, 0 @ Read TTBR0\n\t" : [bar] "=r" (bar)); @@ -219,14 +219,14 @@ static inline u32_t read_ttbr0(void) } /* Write Translation Table Base Register 0 */ -static inline void write_ttbr0(u32_t bar) +static inline void write_ttbr0(uint32_t bar) { barrier(); /* In our setup TTBR contains the base address *and* the flags but other pieces of the kernel code expect ttbr to be the base address of the l1 page table. We therefore add the flags here and remove them in the read_ttbr0 */ - u32_t v = (bar & ARM_TTBR_ADDR_MASK ) | ARM_TTBR_FLAGS_CACHED; + uint32_t v = (bar & ARM_TTBR_ADDR_MASK ) | ARM_TTBR_FLAGS_CACHED; asm volatile("mcr p15, 0, %[bar], c2, c0, 0 @ Write TTBR0\n\t" : : [bar] "r" (v)); @@ -241,9 +241,9 @@ static inline void reload_ttbr0(void) } /* Read Translation Table Base Register 1 */ -static inline u32_t read_ttbr1(void) +static inline uint32_t read_ttbr1(void) { - u32_t bar; + uint32_t bar; asm volatile("mrc p15, 0, %[bar], c2, c0, 1 @ Read TTBR1\n\t" : [bar] "=r" (bar)); @@ -252,7 +252,7 @@ static inline u32_t read_ttbr1(void) } /* Write Translation Table Base Register 1 */ -static inline void write_ttbr1(u32_t bar) +static inline void write_ttbr1(uint32_t bar) { barrier(); @@ -271,9 +271,9 @@ static inline void reload_ttbr1(void) } /* Read Translation Table Base Control Register */ -static inline u32_t read_ttbcr(void) +static inline uint32_t read_ttbcr(void) { - u32_t bcr; + uint32_t bcr; asm volatile("mrc p15, 0, %[bcr], c2, c0, 2 @ Read TTBCR\n\t" : [bcr] "=r" (bcr)); @@ -282,7 +282,7 @@ static inline u32_t read_ttbcr(void) } /* Write Translation Table Base Control Register */ -static inline void write_ttbcr(u32_t bcr) +static inline void write_ttbcr(uint32_t bcr) { asm volatile("mcr p15, 0, %[bcr], c2, c0, 2 @ Write TTBCR\n\t" : : [bcr] "r" (bcr)); @@ -291,9 +291,9 @@ static inline void write_ttbcr(u32_t bcr) } /* Read Domain Access Control Register */ -static inline u32_t read_dacr(void) +static inline uint32_t read_dacr(void) { - u32_t dacr; + uint32_t dacr; asm volatile("mrc p15, 0, %[dacr], c3, c0, 0 @ Read DACR\n\t" : [dacr] "=r" (dacr)); @@ -302,7 +302,7 @@ static inline u32_t read_dacr(void) } /* Write Domain Access Control Register */ -static inline void write_dacr(u32_t dacr) +static inline void write_dacr(uint32_t dacr) { asm volatile("mcr p15, 0, %[dacr], c3, c0, 0 @ Write DACR\n\t" : : [dacr] "r" (dacr)); @@ -311,9 +311,9 @@ static inline void write_dacr(u32_t dacr) } /* Read Data Fault Status Register */ -static inline u32_t read_dfsr(void) +static inline uint32_t read_dfsr(void) { - u32_t fsr; + uint32_t fsr; asm volatile("mrc p15, 0, %[fsr], c5, c0, 0 @ Read DFSR\n\t" : [fsr] "=r" (fsr)); @@ -322,7 +322,7 @@ static inline u32_t read_dfsr(void) } /* Write Data Fault Status Register */ -static inline void write_dfsr(u32_t fsr) +static inline void write_dfsr(uint32_t fsr) { asm volatile("mcr p15, 0, %[fsr], c5, c0, 0 @ Write DFSR\n\t" : : [fsr] "r" (fsr)); @@ -331,9 +331,9 @@ static inline void write_dfsr(u32_t fsr) } /* Read Instruction Fault Status Register */ -static inline u32_t read_ifsr(void) +static inline uint32_t read_ifsr(void) { - u32_t fsr; + uint32_t fsr; asm volatile("mrc p15, 0, %[fsr], c5, c0, 1 @ Read IFSR\n\t" : [fsr] "=r" (fsr)); @@ -342,7 +342,7 @@ static inline u32_t read_ifsr(void) } /* Write Instruction Fault Status Register */ -static inline void write_ifsr(u32_t fsr) +static inline void write_ifsr(uint32_t fsr) { asm volatile("mcr p15, 0, %[fsr], c5, c0, 1 @ Write IFSR\n\t" : : [fsr] "r" (fsr)); @@ -351,9 +351,9 @@ static inline void write_ifsr(u32_t fsr) } /* Read Data Fault Address Register */ -static inline u32_t read_dfar(void) +static inline uint32_t read_dfar(void) { - u32_t far; + uint32_t far; asm volatile("mrc p15, 0, %[far], c6, c0, 0 @ Read DFAR\n\t" : [far] "=r" (far)); @@ -362,7 +362,7 @@ static inline u32_t read_dfar(void) } /* Write Data Fault Address Register */ -static inline void write_dfar(u32_t far) +static inline void write_dfar(uint32_t far) { asm volatile("mcr p15, 0, %[far], c6, c0, 0 @ Write DFAR\n\t" : : [far] "r" (far)); @@ -371,9 +371,9 @@ static inline void write_dfar(u32_t far) } /* Read Instruction Fault Address Register */ -static inline u32_t read_ifar(void) +static inline uint32_t read_ifar(void) { - u32_t far; + uint32_t far; asm volatile("mrc p15, 0, %[far], c6, c0, 2 @ Read IFAR\n\t" : [far] "=r" (far)); @@ -382,7 +382,7 @@ static inline u32_t read_ifar(void) } /* Write Instruction Fault Address Register */ -static inline void write_ifar(u32_t far) +static inline void write_ifar(uint32_t far) { asm volatile("mcr p15, 0, %[far], c6, c0, 2 @ Write IFAR\n\t" : : [far] "r" (far)); @@ -391,9 +391,9 @@ static inline void write_ifar(u32_t far) } /* Read Vector Base Address Register */ -static inline u32_t read_vbar(void) +static inline uint32_t read_vbar(void) { - u32_t vbar; + uint32_t vbar; asm volatile("mrc p15, 0, %[vbar], c12, c0, 0 @ Read VBAR\n\t" : [vbar] "=r" (vbar)); @@ -402,7 +402,7 @@ static inline u32_t read_vbar(void) } /* Write Vector Base Address Register */ -static inline void write_vbar(u32_t vbar) +static inline void write_vbar(uint32_t vbar) { asm volatile("mcr p15, 0, %[vbar], c12, c0, 0 @ Write VBAR\n\t" : : [vbar] "r" (vbar)); @@ -411,9 +411,9 @@ static inline void write_vbar(u32_t vbar) } /* Read the Main ID Register */ -static inline u32_t read_midr(void) +static inline uint32_t read_midr(void) { - u32_t id; + uint32_t id; asm volatile("mrc p15, 0, %[id], c0, c0, 0 @ read MIDR\n\t" : [id] "=r" (id)); @@ -422,9 +422,9 @@ static inline u32_t read_midr(void) } /* Read Auxiliary Control Register */ -static inline u32_t read_actlr(void) +static inline uint32_t read_actlr(void) { - u32_t ctl; + uint32_t ctl; asm volatile("mrc p15, 0, %[ctl], c1, c0, 1 @ Read ACTLR\n\t" : [ctl] "=r" (ctl)); @@ -433,7 +433,7 @@ static inline u32_t read_actlr(void) } /* Write Auxiliary Control Register */ -static inline void write_actlr(u32_t ctl) +static inline void write_actlr(uint32_t ctl) { //http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0344k/Babjbjbb.html asm volatile("mcr p15, 0, %[ctl], c1, c0, 1 @ Write ACTLR\n\t" @@ -443,9 +443,9 @@ static inline void write_actlr(u32_t ctl) } /* Read Current Program Status Register */ -static inline u32_t read_cpsr(void) +static inline uint32_t read_cpsr(void) { - u32_t status; + uint32_t status; asm volatile("mrs %[status], cpsr @ read CPSR" : [status] "=r" (status)); @@ -454,7 +454,7 @@ static inline u32_t read_cpsr(void) } /* Write Current Program Status Register */ -static inline void write_cpsr(u32_t status) +static inline void write_cpsr(uint32_t status) { asm volatile("msr cpsr_c, %[status] @ write CPSR" : : [status] "r" (status)); diff --git a/minix/kernel/arch/earm/include/io.h b/minix/kernel/arch/earm/include/io.h index 7678148e3..b837ea428 100644 --- a/minix/kernel/arch/earm/include/io.h +++ b/minix/kernel/arch/earm/include/io.h @@ -6,8 +6,8 @@ #include /* Access memory-mapped I/O devices */ -#define mmio_read(a) (*(volatile u32_t *)(a)) -#define mmio_write(a,v) (*(volatile u32_t *)(a) = (v)) +#define mmio_read(a) (*(volatile uint32_t *)(a)) +#define mmio_write(a,v) (*(volatile uint32_t *)(a) = (v)) #define mmio_set(a,v) mmio_write((a), mmio_read((a)) | (v)) #define mmio_clear(a,v) mmio_write((a), mmio_read((a)) & ~(v)) diff --git a/minix/kernel/arch/earm/memory.c b/minix/kernel/arch/earm/memory.c index d56d42a69..8a841cc51 100644 --- a/minix/kernel/arch/earm/memory.c +++ b/minix/kernel/arch/earm/memory.c @@ -27,7 +27,7 @@ static int nfreepdes = 0; #define MAXFREEPDES 2 static int freepdes[MAXFREEPDES]; -static u32_t phys_get32(phys_bytes v); +static uint32_t phys_get32(phys_bytes v); /* list of requested physical mapping */ static kern_phys_map *kern_phys_map_head; @@ -38,7 +38,7 @@ void mem_clear_mapcache(void) for(i = 0; i < nfreepdes; i++) { struct proc *ptproc = get_cpulocal_var(ptproc); int pde = freepdes[i]; - u32_t *ptv; + uint32_t *ptv; assert(ptproc); ptv = ptproc->p_seg.p_ttbr_v; assert(ptv); @@ -74,7 +74,7 @@ static phys_bytes createpde( int *changed /* If mapping is made, this is set to 1. */ ) { - u32_t pdeval; + uint32_t pdeval; phys_bytes offset; int pde; @@ -154,7 +154,7 @@ static int check_resumed_caller(struct proc *caller) static int lin_lin_copy(struct proc *srcproc, vir_bytes srclinaddr, struct proc *dstproc, vir_bytes dstlinaddr, vir_bytes bytes) { - u32_t addr; + uint32_t addr; proc_nr_t procslot; assert(get_cpulocal_var(ptproc)); @@ -240,9 +240,9 @@ static int lin_lin_copy(struct proc *srcproc, vir_bytes srclinaddr, return OK; } -static u32_t phys_get32(phys_bytes addr) +static uint32_t phys_get32(phys_bytes addr) { - u32_t v; + uint32_t v; int r; if((r=lin_lin_copy(NULL, addr, @@ -300,11 +300,11 @@ phys_bytes umap_virtual( * vm_lookup * *===========================================================================*/ int vm_lookup(const struct proc *proc, const vir_bytes virtual, - phys_bytes *physical, u32_t *ptent) + phys_bytes *physical, uint32_t *ptent) { - u32_t *root, *pt; + uint32_t *root, *pt; int pde, pte; - u32_t pde_v, pte_v; + uint32_t pde_v, pte_v; assert(proc); assert(physical); @@ -312,11 +312,11 @@ int vm_lookup(const struct proc *proc, const vir_bytes virtual, assert(HASPT(proc)); /* Retrieve page directory entry. */ - root = (u32_t *) (proc->p_seg.p_ttbr & ARM_TTBR_ADDR_MASK); - assert(!((u32_t) root % ARM_PAGEDIR_SIZE)); + root = (uint32_t *) (proc->p_seg.p_ttbr & ARM_TTBR_ADDR_MASK); + assert(!((uint32_t) root % ARM_PAGEDIR_SIZE)); pde = ARM_VM_PDE(virtual); assert(pde >= 0 && pde < ARM_VM_DIR_ENTRIES); - pde_v = phys_get32((u32_t) (root + pde)); + pde_v = phys_get32((uint32_t) (root + pde)); if(! ((pde_v & ARM_VM_PDE_PRESENT) || (pde_v & ARM_VM_SECTION_PRESENT) @@ -330,11 +330,11 @@ int vm_lookup(const struct proc *proc, const vir_bytes virtual, *physical += virtual & ARM_VM_OFFSET_MASK_1MB; } else { /* Retrieve page table entry. */ - pt = (u32_t *) (pde_v & ARM_VM_PDE_MASK); - assert(!((u32_t) pt % ARM_PAGETABLE_SIZE)); + pt = (uint32_t *) (pde_v & ARM_VM_PDE_MASK); + assert(!((uint32_t) pt % ARM_PAGETABLE_SIZE)); pte = ARM_VM_PTE(virtual); assert(pte >= 0 && pte < ARM_VM_PT_ENTRIES); - pte_v = phys_get32((u32_t) (pt + pte)); + pte_v = phys_get32((uint32_t) (pt + pte)); if(!(pte_v & ARM_VM_PTE_PRESENT)) { return EFAULT; } @@ -431,7 +431,7 @@ int vm_check_range(struct proc *caller, struct proc *target, int vm_memset(struct proc* caller, endpoint_t who, phys_bytes ph, int c, phys_bytes count) { - u32_t pattern; + uint32_t pattern; struct proc *whoptr = NULL; phys_bytes cur_ph = ph; phys_bytes left = count; @@ -624,8 +624,8 @@ void memory_init(void) /*===========================================================================* * arch_proc_init * *===========================================================================*/ -void arch_proc_init(struct proc *pr, const u32_t ip, const u32_t sp, - const u32_t ps_str, char *name) +void arch_proc_init(struct proc *pr, const uint32_t ip, const uint32_t sp, + const uint32_t ps_str, char *name) { arch_proc_reset(pr); strcpy(pr->p_name, name); @@ -652,8 +652,8 @@ int arch_phys_map(const int index, kern_phys_map *phys_maps; int freeidx = 0; - u32_t glo_len = (u32_t) &usermapped_nonglo_start - - (u32_t) &usermapped_start; + uint32_t glo_len = (uint32_t) &usermapped_nonglo_start - + (uint32_t) &usermapped_start; if(first) { memset(&minix_kerninfo, 0, sizeof(minix_kerninfo)); @@ -684,8 +684,8 @@ int arch_phys_map(const int index, } else if(index == usermapped_index) { *addr = vir2phys(&usermapped_nonglo_start); - *len = (u32_t) &usermapped_end - - (u32_t) &usermapped_nonglo_start; + *len = (uint32_t) &usermapped_end - + (uint32_t) &usermapped_nonglo_start; *flags = VMMF_USER; return OK; } @@ -710,10 +710,10 @@ int arch_phys_map_reply(const int index, const vir_bytes addr) kern_phys_map *phys_maps; if(index == first_um_idx) { - u32_t usermapped_offset; - assert(addr > (u32_t) &usermapped_start); - usermapped_offset = addr - (u32_t) &usermapped_start; -#define FIXEDPTR(ptr) (void *) ((u32_t)ptr + usermapped_offset) + uint32_t usermapped_offset; + assert(addr > (uint32_t) &usermapped_start); + usermapped_offset = addr - (uint32_t) &usermapped_start; +#define FIXEDPTR(ptr) (void *) ((uint32_t)ptr + usermapped_offset) #define FIXPTR(ptr) ptr = FIXEDPTR(ptr) #define ASSIGN(minixstruct) minix_kerninfo.minixstruct = FIXEDPTR(&minixstruct) ASSIGN(kinfo); diff --git a/minix/kernel/arch/earm/pg_utils.c b/minix/kernel/arch/earm/pg_utils.c index f787e7793..872735c15 100644 --- a/minix/kernel/arch/earm/pg_utils.c +++ b/minix/kernel/arch/earm/pg_utils.c @@ -19,7 +19,7 @@ static phys_bytes kern_phys_start = (phys_bytes) &_kern_phys_base; static phys_bytes kern_kernlen = (phys_bytes) &_kern_size; /* page directory we can use to map things */ -static u32_t pagedir[4096] __aligned(16384); +static uint32_t pagedir[4096] __aligned(16384); void print_memmap(kinfo_t *cbi) { @@ -110,11 +110,11 @@ void add_memmap(kinfo_t *cbi, u64_t addr, u64_t len) panic("no available memmap slot"); } -u32_t *alloc_pagetable(phys_bytes *ph) +uint32_t *alloc_pagetable(phys_bytes *ph) { - u32_t *ret; + uint32_t *ret; #define PG_PAGETABLES 24 - static u32_t pagetables[PG_PAGETABLES][256] __aligned(1024); + static uint32_t pagetables[PG_PAGETABLES][256] __aligned(1024); static int pt_inuse = 0; if(pt_inuse >= PG_PAGETABLES) { panic("no more pagetables"); @@ -143,7 +143,7 @@ phys_bytes pg_alloc_page(kinfo_t *cbi) assert(!(mmap->mm_length % ARM_PAGE_SIZE)); assert(!(mmap->mm_base_addr % ARM_PAGE_SIZE)); - u32_t addr = mmap->mm_base_addr; + uint32_t addr = mmap->mm_base_addr; mmap->mm_base_addr += ARM_PAGE_SIZE; mmap->mm_length -= ARM_PAGE_SIZE; @@ -167,7 +167,7 @@ void pg_identity(kinfo_t *cbi) /* Set up an identity mapping page directory */ for(i = 0; i < ARM_VM_DIR_ENTRIES; i++) { - u32_t flags = ARM_VM_SECTION + uint32_t flags = ARM_VM_SECTION | ARM_VM_SECTION_USER | ARM_VM_SECTION_DOMAIN; @@ -184,7 +184,7 @@ void pg_identity(kinfo_t *cbi) int pg_mapkernel(void) { int pde; - u32_t mapped = 0, kern_phys = kern_phys_start; + uint32_t mapped = 0, kern_phys = kern_phys_start; assert(!(kern_vir_start % ARM_SECTION_SIZE)); assert(!(kern_phys_start % ARM_SECTION_SIZE)); @@ -204,8 +204,8 @@ int pg_mapkernel(void) void vm_enable_paging(void) { - u32_t sctlr; - u32_t actlr; + uint32_t sctlr; + uint32_t actlr; write_ttbcr(0); @@ -265,7 +265,7 @@ void pg_map(phys_bytes phys, vir_bytes vaddr, vir_bytes vaddr_end, kinfo_t *cbi) { static int mapped_pde = -1; - static u32_t *pt = NULL; + static uint32_t *pt = NULL; int pde, pte; assert(kernel_may_alloc); @@ -310,7 +310,7 @@ void pg_map(phys_bytes phys, vir_bytes vaddr, vir_bytes vaddr_end, } } -void pg_info(reg_t *pagedir_ph, u32_t **pagedir_v) +void pg_info(reg_t *pagedir_ph, uint32_t **pagedir_v) { *pagedir_ph = vir2phys(pagedir); *pagedir_v = pagedir; diff --git a/minix/kernel/arch/earm/pre_init.c b/minix/kernel/arch/earm/pre_init.c index 445f6acd5..2d06df2d5 100644 --- a/minix/kernel/arch/earm/pre_init.c +++ b/minix/kernel/arch/earm/pre_init.c @@ -38,8 +38,8 @@ static void setup_mbi(multiboot_info_t *mbi, char *bootargs); int kernel_may_alloc = 1; /* kernel bss */ -extern u32_t _edata; -extern u32_t _end; +extern uint32_t _edata; +extern uint32_t _end; /* kernel unpaged bss */ extern char _kern_unpaged_edata; @@ -193,7 +193,7 @@ void setup_mbi(multiboot_info_t *mbi, char *bootargs) mbi->flags = MULTIBOOT_INFO_MODS | MULTIBOOT_INFO_MEM_MAP | MULTIBOOT_INFO_CMDLINE; mbi->mi_mods_count = MB_MODS_NR; - mbi->mods_addr = (u32_t)&mb_modlist; + mbi->mods_addr = (uint32_t)&mb_modlist; int i; for (i = 0; i < MB_MODS_NR; ++i) { @@ -204,9 +204,9 @@ void setup_mbi(multiboot_info_t *mbi, char *bootargs) } /* morph the bootargs into multiboot */ - mbi->cmdline = (u32_t) bootargs; + mbi->cmdline = (uint32_t) bootargs; - mbi->mmap_addr =(u32_t)&mb_memmap; + mbi->mmap_addr =(uint32_t)&mb_memmap; mbi->mmap_length = sizeof(mb_memmap); mb_memmap.size = sizeof(multiboot_memory_map_t); @@ -378,8 +378,8 @@ kinfo_t *pre_init(int argc, char **argv) from head.S */ /* Clear BSS */ - memset(&_edata, 0, (u32_t)&_end - (u32_t)&_edata); - memset(&_kern_unpaged_edata, 0, (u32_t)&_kern_unpaged_end - (u32_t)&_kern_unpaged_edata); + memset(&_edata, 0, (uint32_t)&_end - (uint32_t)&_edata); + memset(&_kern_unpaged_edata, 0, (uint32_t)&_kern_unpaged_end - (uint32_t)&_kern_unpaged_edata); /* we get called in a c like fashion where the first arg * is the program name (load address) and the rest are diff --git a/minix/kernel/arch/earm/protect.c b/minix/kernel/arch/earm/protect.c index c74214338..614ababb7 100644 --- a/minix/kernel/arch/earm/protect.c +++ b/minix/kernel/arch/earm/protect.c @@ -25,7 +25,7 @@ phys_bytes vir2phys(void *vir) { /* defined in kernel.lds */ extern char _kern_vir_base, _kern_phys_base; - u32_t offset = (vir_bytes) &_kern_vir_base - + uint32_t offset = (vir_bytes) &_kern_vir_base - (vir_bytes) &_kern_phys_base; return (phys_bytes)vir - offset; } diff --git a/minix/kernel/arch/i386/acpi.c b/minix/kernel/arch/i386/acpi.c index 9fdf8a9b8..97ebbca5a 100644 --- a/minix/kernel/arch/i386/acpi.c +++ b/minix/kernel/arch/i386/acpi.c @@ -28,7 +28,7 @@ static acpi_read_t read_func; static struct acpi_rsdt { struct acpi_sdt_header hdr; - u32_t data[MAX_RSDT]; + uint32_t data[MAX_RSDT]; } rsdt; static struct { @@ -56,7 +56,7 @@ static int acpi_check_signature(const char * orig, const char * match) return strncmp(orig, match, ACPI_SDT_SIGNATURE_LEN); } -static u32_t acpi_phys2vir(u32_t p) +static uint32_t acpi_phys2vir(uint32_t p) { if(!vm_running) { DEBUGEXTRA(("acpi: returning 0x%lx as vir addr\n", p)); @@ -320,7 +320,7 @@ void acpi_init(void) s = acpi_read_sdt_at(acpi_rsdp.rsdt_addr, (struct acpi_sdt_header *) &rsdt, sizeof(struct acpi_rsdt), ACPI_SDT_SIGNATURE(RSDT)); - sdt_count = (s - sizeof(struct acpi_sdt_header)) / sizeof(u32_t); + sdt_count = (s - sizeof(struct acpi_sdt_header)) / sizeof(uint32_t); for (i = 0; i < sdt_count; i++) { struct acpi_sdt_header hdr; diff --git a/minix/kernel/arch/i386/acpi.h b/minix/kernel/arch/i386/acpi.h index 23fabaca6..fb25c99d4 100644 --- a/minix/kernel/arch/i386/acpi.h +++ b/minix/kernel/arch/i386/acpi.h @@ -9,8 +9,8 @@ struct acpi_rsdp { uint8_t checksum; char oemid[6]; uint8_t revision; - u32_t rsdt_addr; - u32_t length; + uint32_t rsdt_addr; + uint32_t length; }; #define ACPI_SDT_SIGNATURE_LEN 4 @@ -20,14 +20,14 @@ struct acpi_rsdp { /* header common to all system description tables */ struct acpi_sdt_header { char signature[ACPI_SDT_SIGNATURE_LEN]; - u32_t length; + uint32_t length; uint8_t revision; uint8_t checksum; char oemid[6]; char oem_table_id[8]; - u32_t oem_revision; - u32_t creator_id; - u32_t creator_revision; + uint32_t oem_revision; + uint32_t creator_id; + uint32_t creator_revision; }; struct acpi_generic_address { @@ -41,24 +41,24 @@ struct acpi_generic_address { struct acpi_fadt_header { struct acpi_sdt_header hdr; - u32_t facs; - u32_t dsdt; + uint32_t facs; + uint32_t dsdt; uint8_t model; uint8_t preferred_pm_profile; uint16_t sci_int; - u32_t smi_cmd; + uint32_t smi_cmd; uint8_t acpi_enable; uint8_t acpi_disable; uint8_t s4bios_req; uint8_t pstate_cnt; - u32_t pm1a_evt_blk; - u32_t pm1b_evt_blk; - u32_t pm1a_cnt_blk; - u32_t pm1b_cnt_blk; - u32_t pm2_cnt_blk; - u32_t pm_tmr_blk; - u32_t gpe0_blk; - u32_t gpe1_blk; + uint32_t pm1a_evt_blk; + uint32_t pm1b_evt_blk; + uint32_t pm1a_cnt_blk; + uint32_t pm1b_cnt_blk; + uint32_t pm2_cnt_blk; + uint32_t pm_tmr_blk; + uint32_t gpe0_blk; + uint32_t gpe1_blk; uint8_t pm1_evt_len; uint8_t pm1_cnt_len; uint8_t pm2_cnt_len; @@ -78,7 +78,7 @@ struct acpi_fadt_header uint8_t century; uint16_t iapc_boot_arch; uint8_t reserved1; - u32_t flags; + uint32_t flags; struct acpi_generic_address reset_reg; uint8_t reset_value; uint8_t reserved2[3]; @@ -96,8 +96,8 @@ struct acpi_fadt_header struct acpi_madt_hdr { struct acpi_sdt_header hdr; - u32_t local_apic_address; - u32_t flags; + uint32_t local_apic_address; + uint32_t flags; }; #define ACPI_MADT_TYPE_LAPIC 0 @@ -121,29 +121,29 @@ struct acpi_madt_lapic { struct acpi_madt_item_hdr hdr; uint8_t acpi_cpu_id; uint8_t apic_id; - u32_t flags; + uint32_t flags; }; struct acpi_madt_ioapic { struct acpi_madt_item_hdr hdr; uint8_t id; uint8_t __reserved; - u32_t address; - u32_t global_int_base; + uint32_t address; + uint32_t global_int_base; }; struct acpi_madt_int_src { struct acpi_madt_item_hdr hdr; uint8_t bus; uint8_t bus_int; - u32_t global_int; + uint32_t global_int; uint16_t mps_flags; }; struct acpi_madt_nmi { struct acpi_madt_item_hdr hdr; uint16_t flags; - u32_t global_int; + uint32_t global_int; }; void acpi_init(void); diff --git a/minix/kernel/arch/i386/apic.c b/minix/kernel/arch/i386/apic.c index 938ca45ca..7a4c6ac03 100644 --- a/minix/kernel/arch/i386/apic.c +++ b/minix/kernel/arch/i386/apic.c @@ -142,14 +142,14 @@ static struct irq io_apic_irq[NR_IRQ_VECTORS]; #define VERBOSE_APIC(x) x int ioapic_enabled; -u32_t lapic_addr_vaddr; +uint32_t lapic_addr_vaddr; vir_bytes lapic_addr; vir_bytes lapic_eoi_addr; int bsp_lapic_id; static volatile unsigned probe_ticks; static u64_t tsc0, tsc1; -static u32_t lapic_tctr0, lapic_tctr1; +static uint32_t lapic_tctr0, lapic_tctr1; static unsigned apic_imcrp; static const unsigned nlints = 0; @@ -164,23 +164,23 @@ void arch_eoi(void) * arch specific cpulocals. As this variable is write-once-read-only it is ok to * have at as an array until we resolve the cpulocals properly */ -static u32_t lapic_bus_freq[CONFIG_MAX_CPUS]; +static uint32_t lapic_bus_freq[CONFIG_MAX_CPUS]; /* the probe period will be roughly 100ms */ #define PROBE_TICKS (system_hz / 10) #define IOAPIC_IOREGSEL 0x0 #define IOAPIC_IOWIN 0x10 -static u32_t ioapic_read(u32_t ioa_base, u32_t reg) +static uint32_t ioapic_read(uint32_t ioa_base, uint32_t reg) { - *((volatile u32_t *)(ioa_base + IOAPIC_IOREGSEL)) = (reg & 0xff); - return *(volatile u32_t *)(ioa_base + IOAPIC_IOWIN); + *((volatile uint32_t *)(ioa_base + IOAPIC_IOREGSEL)) = (reg & 0xff); + return *(volatile uint32_t *)(ioa_base + IOAPIC_IOWIN); } -static void ioapic_write(u32_t ioa_base, uint8_t reg, u32_t val) +static void ioapic_write(uint32_t ioa_base, uint8_t reg, uint32_t val) { - *((volatile u32_t *)(ioa_base + IOAPIC_IOREGSEL)) = reg; - *((volatile u32_t *)(ioa_base + IOAPIC_IOWIN)) = val; + *((volatile uint32_t *)(ioa_base + IOAPIC_IOREGSEL)) = reg; + *((volatile uint32_t *)(ioa_base + IOAPIC_IOWIN)) = val; } void lapic_microsec_sleep(unsigned count); @@ -188,7 +188,7 @@ void apic_idt_init(const int reset); static void ioapic_enable_pin(vir_bytes ioapic_addr, int pin) { - u32_t lo = ioapic_read(ioapic_addr, IOAPIC_REDIR_TABLE + pin * 2); + uint32_t lo = ioapic_read(ioapic_addr, IOAPIC_REDIR_TABLE + pin * 2); lo &= ~APIC_ICR_INT_MASK; ioapic_write(ioapic_addr, IOAPIC_REDIR_TABLE + pin * 2, lo); @@ -196,7 +196,7 @@ static void ioapic_enable_pin(vir_bytes ioapic_addr, int pin) static void ioapic_disable_pin(vir_bytes ioapic_addr, int pin) { - u32_t lo = ioapic_read(ioapic_addr, IOAPIC_REDIR_TABLE + pin * 2); + uint32_t lo = ioapic_read(ioapic_addr, IOAPIC_REDIR_TABLE + pin * 2); lo |= APIC_ICR_INT_MASK; ioapic_write(ioapic_addr, IOAPIC_REDIR_TABLE + pin * 2, lo); @@ -205,26 +205,26 @@ static void ioapic_disable_pin(vir_bytes ioapic_addr, int pin) #if 0 static void ioapic_redirt_entry_read(void * ioapic_addr, int entry, - u32_t *hi, - u32_t *lo) + uint32_t *hi, + uint32_t *lo) { - *lo = ioapic_read((u32_t)ioapic_addr, (uint8_t) (IOAPIC_REDIR_TABLE + entry * 2)); - *hi = ioapic_read((u32_t)ioapic_addr, (uint8_t) (IOAPIC_REDIR_TABLE + entry * 2 + 1)); + *lo = ioapic_read((uint32_t)ioapic_addr, (uint8_t) (IOAPIC_REDIR_TABLE + entry * 2)); + *hi = ioapic_read((uint32_t)ioapic_addr, (uint8_t) (IOAPIC_REDIR_TABLE + entry * 2 + 1)); } #endif static void ioapic_redirt_entry_write(void * ioapic_addr, int entry, - u32_t hi, - u32_t lo) + uint32_t hi, + uint32_t lo) { #if 0 VERBOSE_APIC(printf("IO apic redir entry %3d " "write 0x%08x 0x%08x\n", entry, hi, lo)); #endif - ioapic_write((u32_t)ioapic_addr, (uint8_t) (IOAPIC_REDIR_TABLE + entry * 2 + 1), hi); - ioapic_write((u32_t)ioapic_addr, (uint8_t) (IOAPIC_REDIR_TABLE + entry * 2), lo); + ioapic_write((uint32_t)ioapic_addr, (uint8_t) (IOAPIC_REDIR_TABLE + entry * 2 + 1), hi); + ioapic_write((uint32_t)ioapic_addr, (uint8_t) (IOAPIC_REDIR_TABLE + entry * 2), lo); } #define apic_read_tmr_vector(vec) \ @@ -251,7 +251,7 @@ static void ioapic_eoi_level(struct irq * irq) */ if (!lapic_test_delivery_val(tmr, irq->vector)) { int is_masked; - u32_t lo; + uint32_t lo; panic("EDGE instead of LEVEL!"); @@ -294,7 +294,7 @@ void ioapic_eoi(int irq) irq_8259_eoi(irq); } -void ioapic_set_id(u32_t addr, unsigned int id) +void ioapic_set_id(uint32_t addr, unsigned int id) { ioapic_write(addr, IOAPIC_ID, id << 24); } @@ -318,17 +318,17 @@ static void ioapic_disable(struct io_apic * ioapic) unsigned p; for (p = 0; p < io_apic->pins; p++) { - u32_t low_32, hi_32; - low_32 = ioapic_read((u32_t)ioapic->addr, + uint32_t low_32, hi_32; + low_32 = ioapic_read((uint32_t)ioapic->addr, (uint8_t) (IOAPIC_REDIR_TABLE + p * 2)); - hi_32 = ioapic_read((u32_t)ioapic->addr, + hi_32 = ioapic_read((uint32_t)ioapic->addr, (uint8_t) (IOAPIC_REDIR_TABLE + p * 2 + 1)); if (!(low_32 & APIC_ICR_INT_MASK)) { low_32 |= APIC_ICR_INT_MASK; - ioapic_write((u32_t)ioapic->addr, + ioapic_write((uint32_t)ioapic->addr, (uint8_t) (IOAPIC_REDIR_TABLE + p * 2 + 1), hi_32); - ioapic_write((u32_t)ioapic->addr, + ioapic_write((uint32_t)ioapic->addr, (uint8_t) (IOAPIC_REDIR_TABLE + p * 2), low_32); } } @@ -409,7 +409,7 @@ unsigned int apicid(void) static int calib_clk_handler(irq_hook_t * UNUSED(hook)) { - u32_t tcrt; + uint32_t tcrt; u64_t tsc; probe_ticks++; @@ -442,7 +442,7 @@ static int spurious_irq_handler(irq_hook_t * UNUSED(hook)) static void apic_calibrate_clocks(unsigned cpu) { - u32_t lvtt, val, lapic_delta; + uint32_t lvtt, val, lapic_delta; u64_t tsc_delta; u64_t cpu_freq; @@ -523,11 +523,11 @@ static void apic_calibrate_clocks(unsigned cpu) BOOT_VERBOSE(cpu_print_freq(cpuid)); } -void lapic_set_timer_one_shot(const u32_t usec) +void lapic_set_timer_one_shot(const uint32_t usec) { /* sleep in micro seconds */ - u32_t lvtt; - u32_t ticks_per_us; + uint32_t lvtt; + uint32_t ticks_per_us; const uint8_t cpu = cpuid; ticks_per_us = (lapic_bus_freq[cpu] / 1000000) * config_apic_timer_x; @@ -545,8 +545,8 @@ void lapic_set_timer_one_shot(const u32_t usec) void lapic_set_timer_periodic(const unsigned freq) { /* sleep in micro seconds */ - u32_t lvtt; - u32_t lapic_ticks_per_clock_tick; + uint32_t lvtt; + uint32_t lapic_ticks_per_clock_tick; const uint8_t cpu = cpuid; lapic_ticks_per_clock_tick = (lapic_bus_freq[cpu] / freq) * config_apic_timer_x; @@ -563,7 +563,7 @@ void lapic_set_timer_periodic(const unsigned freq) void lapic_stop_timer(void) { - u32_t lvtt; + uint32_t lvtt; lvtt = lapic_read(LAPIC_LVTTR); lapic_write(LAPIC_LVTTR, lvtt | APIC_LVTT_MASK); /* zero the current counter so it can be restarted again */ @@ -585,7 +585,7 @@ void lapic_microsec_sleep(unsigned count) arch_pause(); } -static u32_t lapic_errstatus(void) +static uint32_t lapic_errstatus(void) { lapic_write(LAPIC_ESR, 0); return lapic_read(LAPIC_ESR); @@ -594,7 +594,7 @@ static u32_t lapic_errstatus(void) #ifdef CONFIG_SMP static int lapic_disable_in_msr(void) { - u32_t msr_hi, msr_lo; + uint32_t msr_hi, msr_lo; ia32_msr_read(IA32_APIC_BASE, &msr_hi, &msr_lo); @@ -608,7 +608,7 @@ static int lapic_disable_in_msr(void) void lapic_disable(void) { /* Disable current APIC and close interrupts from PIC */ - u32_t val; + uint32_t val; if (!lapic_addr) return; @@ -644,12 +644,12 @@ void lapic_disable(void) static int lapic_enable_in_msr(void) { - u32_t msr_hi, msr_lo; + uint32_t msr_hi, msr_lo; ia32_msr_read(IA32_APIC_BASE, &msr_hi, &msr_lo); #if 0 - u32_t addr; + uint32_t addr; /*FIXME this is a problem on AP */ /* * FIXME if the location is different (unlikely) then the one we expect, @@ -673,7 +673,7 @@ static int lapic_enable_in_msr(void) int lapic_enable(unsigned cpu) { - u32_t val, nlvt; + uint32_t val, nlvt; if (!lapic_addr) return 0; @@ -867,7 +867,7 @@ static void lapic_set_dummy_handlers(void) /* Build descriptors for interrupt gates in IDT. */ void apic_idt_init(const int reset) { - u32_t val; + uint32_t val; /* Set up idt tables for smp mode. */ @@ -964,7 +964,7 @@ int detect_ioapics(void) void apic_send_ipi(unsigned vector, unsigned cpu, int type) { - u32_t icr1, icr2; + uint32_t icr1, icr2; if (ncpus == 1) /* no need of sending an IPI */ @@ -1004,13 +1004,13 @@ void apic_send_ipi(unsigned vector, unsigned cpu, int type) int apic_send_startup_ipi(unsigned cpu, phys_bytes trampoline) { int timeout; - u32_t errstatus = 0; + uint32_t errstatus = 0; int i; /* INIT-SIPI-SIPI sequence */ for (i = 0; i < 2; i++) { - u32_t val; + uint32_t val; /* clear err status */ lapic_errstatus(); @@ -1023,7 +1023,7 @@ int apic_send_startup_ipi(unsigned cpu, phys_bytes trampoline) /* send SIPI */ val = lapic_read(LAPIC_ICR1) & 0xFFF32000; val |= APIC_ICR_LEVEL_ASSERT |APIC_ICR_DM_STARTUP; - val |= (((u32_t)trampoline >> 12)&0xff); + val |= (((uint32_t)trampoline >> 12)&0xff); lapic_write(LAPIC_ICR1, val); timeout = 1000; @@ -1049,13 +1049,13 @@ int apic_send_startup_ipi(unsigned cpu, phys_bytes trampoline) int apic_send_init_ipi(unsigned cpu, phys_bytes trampoline) { - u32_t ptr, errstatus = 0; + uint32_t ptr, errstatus = 0; int timeout; /* set the warm reset vector */ - ptr = (u32_t)(trampoline & 0xF); + ptr = (uint32_t)(trampoline & 0xF); phys_copy(0x467, vir2phys(&ptr), sizeof(uint16_t )); - ptr = (u32_t)(trampoline >> 4); + ptr = (uint32_t)(trampoline >> 4); phys_copy(0x469, vir2phys(&ptr), sizeof(uint16_t )); /* set shutdown code */ @@ -1170,9 +1170,9 @@ static eoi_method_t set_eoi_method(unsigned irq) return ioapic_eoi_level; } -void set_irq_redir_low(unsigned irq, u32_t * low) +void set_irq_redir_low(unsigned irq, uint32_t * low) { - u32_t val = 0; + uint32_t val = 0; /* clear the polarity, trigger, mask and vector fields */ val &= ~(APIC_ICR_VECTOR | APIC_ICR_INT_MASK | @@ -1212,7 +1212,7 @@ void ioapic_set_irq(unsigned irq) if (io_apic[ioa].gsi_base <= irq && io_apic[ioa].gsi_base + io_apic[ioa].pins > irq) { - u32_t hi_32, low_32; + uint32_t hi_32, low_32; io_apic_irq[irq].ioa = &io_apic[ioa]; io_apic_irq[irq].pin = irq - io_apic[ioa].gsi_base; @@ -1252,7 +1252,7 @@ void ioapic_reset_pic(void) static void irq_lapic_status(int irq) { - u32_t lo; + uint32_t lo; reg_t tmr, irr, isr; int vector; struct irq * intr; diff --git a/minix/kernel/arch/i386/apic.h b/minix/kernel/arch/i386/apic.h index 854345c25..944ab015c 100644 --- a/minix/kernel/arch/i386/apic.h +++ b/minix/kernel/arch/i386/apic.h @@ -119,7 +119,7 @@ struct io_apic { EXTERN struct io_apic io_apic[MAX_NR_IOAPICS]; EXTERN unsigned nioapics; -EXTERN u32_t lapic_addr_vaddr; /* we remember the virtual address here until we +EXTERN uint32_t lapic_addr_vaddr; /* we remember the virtual address here until we switch to paging */ int lapic_enable(unsigned cpu); @@ -131,8 +131,8 @@ EXTERN int ioapic_enabled; EXTERN unsigned nioapics; void lapic_microsec_sleep(unsigned count); -void ioapic_disable_irqs(u32_t irqs); -void ioapic_enable_irqs(u32_t irqs); +void ioapic_disable_irqs(uint32_t irqs); +void ioapic_enable_irqs(uint32_t irqs); int lapic_enable(unsigned cpu); void lapic_disable(void); @@ -147,13 +147,13 @@ void apic_idt_init(int reset); int apic_send_startup_ipi(unsigned cpu, phys_bytes trampoline); int apic_send_init_ipi(unsigned cpu, phys_bytes trampoline); unsigned int apicid(void); -void ioapic_set_id(u32_t addr, unsigned int id); +void ioapic_set_id(uint32_t addr, unsigned int id); #else int apic_single_cpu_init(void); #endif void lapic_set_timer_periodic(const unsigned freq); -void lapic_set_timer_one_shot(const u32_t value); +void lapic_set_timer_one_shot(const uint32_t value); void lapic_stop_timer(void); void lapic_restart_timer(void); @@ -161,7 +161,7 @@ void ioapic_set_irq(unsigned irq); void ioapic_unset_irq(unsigned irq); /* signal the end of interrupt handler to apic */ -#define apic_eoi() do { *((volatile u32_t *) lapic_eoi_addr) = 0; } while(0) +#define apic_eoi() do { *((volatile uint32_t *) lapic_eoi_addr) = 0; } while(0) void ioapic_eoi(int irq); @@ -191,9 +191,9 @@ void apic_ipi_halt_intr(void); #define cpu_feature_apic_on_chip() _cpufeature(_CPUF_I386_APIC_ON_CHIP) -#define lapic_read(what) (*((volatile u32_t *)((what)))) +#define lapic_read(what) (*((volatile uint32_t *)((what)))) #define lapic_write(what, data) do { \ - (*((volatile u32_t *)((what)))) = data; \ + (*((volatile uint32_t *)((what)))) = data; \ } while(0) #endif /* __ASSEMBLY__ */ diff --git a/minix/kernel/arch/i386/arch_do_vmctl.c b/minix/kernel/arch/i386/arch_do_vmctl.c index 159cae70f..9580d03b0 100644 --- a/minix/kernel/arch/i386/arch_do_vmctl.c +++ b/minix/kernel/arch/i386/arch_do_vmctl.c @@ -16,7 +16,7 @@ extern phys_bytes video_mem_vaddr; extern char *video_mem; -static void setcr3(struct proc *p, u32_t cr3, u32_t *v) +static void setcr3(struct proc *p, uint32_t cr3, uint32_t *v) { /* Set process CR3. */ p->p_seg.p_cr3 = cr3; @@ -46,7 +46,7 @@ int arch_do_vmctl( m_ptr->SVMCTL_VALUE = p->p_seg.p_cr3; return OK; case VMCTL_SETADDRSPACE: - setcr3(p, m_ptr->SVMCTL_PTROOT, (u32_t *) m_ptr->SVMCTL_PTROOT_V); + setcr3(p, m_ptr->SVMCTL_PTROOT, (uint32_t *) m_ptr->SVMCTL_PTROOT_V); return OK; case VMCTL_FLUSHTLB: { diff --git a/minix/kernel/arch/i386/arch_smp.c b/minix/kernel/arch/i386/arch_smp.c index 8998b8904..05045467c 100644 --- a/minix/kernel/arch/i386/arch_smp.c +++ b/minix/kernel/arch/i386/arch_smp.c @@ -28,12 +28,12 @@ void trampoline(void); * They have to be in location which is reachable using absolute addressing in * 16-bit mode */ -extern volatile u32_t __ap_id, __ap_pt; +extern volatile uint32_t __ap_id, __ap_pt; extern volatile struct desctableptr_s __ap_gdt, __ap_idt; -extern u32_t __ap_gdt_tab, __ap_idt_tab; +extern uint32_t __ap_gdt_tab, __ap_idt_tab; extern void * __trampoline_end; -extern u32_t busclock[CONFIG_MAX_CPUS]; +extern uint32_t busclock[CONFIG_MAX_CPUS]; extern int panicking; static int volatile ap_cpu_ready; @@ -56,10 +56,10 @@ extern int prot_init_done; /* Indicates they are ready */ static phys_bytes trampoline_base; -static u32_t ap_lin_addr(void *vaddr) +static uint32_t ap_lin_addr(void *vaddr) { assert(trampoline_base); - return (u32_t) vaddr - (u32_t) &trampoline + trampoline_base; + return (uint32_t) vaddr - (uint32_t) &trampoline + trampoline_base; } /* @@ -100,13 +100,13 @@ extern int booting_cpu; /* tell protect.c what to do */ static void smp_start_aps(void) { unsigned cpu; - u32_t biosresetvector; + uint32_t biosresetvector; phys_bytes __ap_id_phys; struct proc *bootstrap_pt = get_cpulocal_var(ptproc); /* TODO hack around the alignment problem */ - phys_copy(0x467, (phys_bytes) &biosresetvector, sizeof(u32_t)); + phys_copy(0x467, (phys_bytes) &biosresetvector, sizeof(uint32_t)); /* set the bios shutdown code to 0xA */ outb(RTC_INDEX, 0xF); @@ -124,7 +124,7 @@ static void smp_start_aps(void) (phys_bytes) &__ap_id - (phys_bytes)&trampoline; /* setup the warm reset vector */ - phys_copy((phys_bytes) &trampoline_base, 0x467, sizeof(u32_t)); + phys_copy((phys_bytes) &trampoline_base, 0x467, sizeof(uint32_t)); /* okay, we're ready to go. boot all of the ap's now. we loop through * using the processor's apic id values. @@ -160,7 +160,7 @@ static void smp_start_aps(void) } } - phys_copy((phys_bytes) &biosresetvector, 0x467, sizeof(u32_t)); + phys_copy((phys_bytes) &biosresetvector, 0x467, sizeof(uint32_t)); outb(RTC_INDEX, 0xF); outb(RTC_IO, 0); diff --git a/minix/kernel/arch/i386/arch_system.c b/minix/kernel/arch/i386/arch_system.c index 05bc31dad..8b16c37ee 100644 --- a/minix/kernel/arch/i386/arch_system.c +++ b/minix/kernel/arch/i386/arch_system.c @@ -64,7 +64,7 @@ void fpu_init(void) write_cr0(read_cr0() | CR0_MP_NE); get_cpulocal_var(fpu_presence) = 1; if(_cpufeature(_CPUF_I386_FXSR)) { - u32_t cr4 = read_cr4() | CR4_OSFXSR; /* Enable FXSR. */ + uint32_t cr4 = read_cr4() | CR4_OSFXSR; /* Enable FXSR. */ /* OSXMMEXCPT if supported * FXSR feature can be available without SSE @@ -181,7 +181,7 @@ void arch_proc_reset(struct proc *pr) arch_proc_setcontext(pr, ®, 0, KTS_FULLCONTEXT); } -void arch_set_secondary_ipc_return(struct proc *p, u32_t val) +void arch_set_secondary_ipc_return(struct proc *p, uint32_t val) { p->p_reg.bx = val; } @@ -211,7 +211,7 @@ int restore_fpu(struct proc *pr) void cpu_identify(void) { - u32_t eax, ebx, ecx, edx; + uint32_t eax, ebx, ecx, edx; unsigned cpu = cpuid; eax = 0; @@ -445,7 +445,7 @@ static void ser_dump_proc_cpu(void) #if SPROFILE -int arch_init_profile_clock(const u32_t freq) +int arch_init_profile_clock(const uint32_t freq) { int r; /* Set CMOS timer frequency. */ diff --git a/minix/kernel/arch/i386/arch_watchdog.c b/minix/kernel/arch/i386/arch_watchdog.c index 775d487c0..efd869d2d 100644 --- a/minix/kernel/arch/i386/arch_watchdog.c +++ b/minix/kernel/arch/i386/arch_watchdog.c @@ -17,7 +17,7 @@ static struct arch_watchdog amd_watchdog; static void intel_arch_watchdog_init(const unsigned cpu) { u64_t cpuf; - u32_t val; + uint32_t val; ia32_msr_write(INTEL_MSR_PERFMON_CRT0, 0, 0); @@ -52,7 +52,7 @@ static void intel_arch_watchdog_reinit(const unsigned cpu) int arch_watchdog_init(void) { - u32_t eax, ebx, ecx, edx; + uint32_t eax, ebx, ecx, edx; unsigned cpu = cpuid; if (!lapic_addr) { @@ -187,7 +187,7 @@ static struct arch_watchdog intel_arch_watchdog = { static void amd_watchdog_init(const unsigned cpu) { u64_t cpuf; - u32_t val; + uint32_t val; ia32_msr_write(AMD_MSR_EVENT_CTR0, 0, 0); diff --git a/minix/kernel/arch/i386/exception.c b/minix/kernel/arch/i386/exception.c index 3317ebbbd..516771879 100644 --- a/minix/kernel/arch/i386/exception.c +++ b/minix/kernel/arch/i386/exception.c @@ -148,7 +148,7 @@ static void inkernel_disaster(struct proc *saved_proc, frame->vector, frame->errcode, frame->eip, frame->cs, frame->eflags, frame); printf("KERNEL registers :\n"); -#define REG(n) (((u32_t *)frame)[-n]) +#define REG(n) (((uint32_t *)frame)[-n]) printf( "\t%%eax 0x%08x %%ebx 0x%08x %%ecx 0x%08x %%edx 0x%08x\n" "\t%%esp 0x%08x %%ebp 0x%08x %%esi 0x%08x %%edi 0x%08x\n", @@ -332,7 +332,7 @@ static void proc_stacktrace_execute(struct proc *whichproc, reg_t v_bp, reg_t pc *===========================================================================*/ void proc_stacktrace(struct proc *whichproc) { - u32_t use_bp; + uint32_t use_bp; if(whichproc->p_seg.p_kern_trap_style == KTS_NONE) { printf("WARNING: stacktrace of running process\n"); @@ -342,7 +342,7 @@ void proc_stacktrace(struct proc *whichproc) case KTS_SYSENTER: case KTS_SYSCALL: { - u32_t sp = whichproc->p_reg.sp; + uint32_t sp = whichproc->p_reg.sp; /* Full context is not available in the p_reg * struct. Obtain it from the user's stack. @@ -374,7 +374,7 @@ void proc_stacktrace(struct proc *whichproc) void enable_fpu_exception(void) { - u32_t cr0 = read_cr0(); + uint32_t cr0 = read_cr0(); if(!(cr0 & I386_CR0_TS)) write_cr0(cr0 | I386_CR0_TS); } diff --git a/minix/kernel/arch/i386/include/arch_proto.h b/minix/kernel/arch/i386/include/arch_proto.h index 14d0a7104..069b850cf 100644 --- a/minix/kernel/arch/i386/include/arch_proto.h +++ b/minix/kernel/arch/i386/include/arch_proto.h @@ -98,13 +98,13 @@ void phys_insb(uint16_t port, phys_bytes buf, size_t count); void phys_insw(uint16_t port, phys_bytes buf, size_t count); void phys_outsb(uint16_t port, phys_bytes buf, size_t count); void phys_outsw(uint16_t port, phys_bytes buf, size_t count); -u32_t read_cr3(void); +uint32_t read_cr3(void); void reload_cr3(void); void i386_invlpg(phys_bytes linaddr); -vir_bytes phys_memset(phys_bytes ph, u32_t c, phys_bytes bytes); +vir_bytes phys_memset(phys_bytes ph, uint32_t c, phys_bytes bytes); void reload_ds(void); -void ia32_msr_read(u32_t reg, u32_t * hi, u32_t * lo); -void ia32_msr_write(u32_t reg, u32_t hi, u32_t lo); +void ia32_msr_read(uint32_t reg, uint32_t * hi, uint32_t * lo); +void ia32_msr_write(uint32_t reg, uint32_t hi, uint32_t lo); void fninit(void); void clts(void); void fxsave(void *); @@ -117,15 +117,15 @@ int __frstor_failure(void *); unsigned short fnstsw(void); void fnstcw(unsigned short* cw); void x86_lgdt(void *); -void x86_lldt(u32_t); -void x86_ltr(u32_t); +void x86_lldt(uint32_t); +void x86_ltr(uint32_t); void x86_lidt(void *); void x86_load_kerncs(void); -void x86_load_ds(u32_t); -void x86_load_ss(u32_t); -void x86_load_es(u32_t); -void x86_load_fs(u32_t); -void x86_load_gs(u32_t); +void x86_load_ds(uint32_t); +void x86_load_ss(uint32_t); +void x86_load_es(uint32_t); +void x86_load_fs(uint32_t); +void x86_load_gs(uint32_t); /* ipc functions in usermapped_ipc.S */ int usermapped_send_softint(endpoint_t dest, message *m_ptr); @@ -196,16 +196,16 @@ struct tss_s { } __attribute__((packed)); void enable_iop(struct proc *pp); -u32_t read_cs(void); -u32_t read_ds(void); -u32_t read_ss(void); +uint32_t read_cs(void); +uint32_t read_ds(void); +uint32_t read_ss(void); void add_memmap(kinfo_t *cbi, u64_t addr, u64_t len); phys_bytes alloc_lowest(kinfo_t *cbi, phys_bytes len); void vm_enable_paging(void); void cut_memmap(kinfo_t *cbi, phys_bytes start, phys_bytes end); phys_bytes pg_roundup(phys_bytes b); -void pg_info(reg_t *, u32_t **); +void pg_info(reg_t *, uint32_t **); void pg_clear(void); void pg_identity(kinfo_t *); phys_bytes pg_load(void); diff --git a/minix/kernel/arch/i386/include/arch_smp.h b/minix/kernel/arch/i386/include/arch_smp.h index 3a013a982..a99638b44 100644 --- a/minix/kernel/arch/i386/include/arch_smp.h +++ b/minix/kernel/arch/i386/include/arch_smp.h @@ -8,7 +8,7 @@ #ifndef __ASSEMBLY__ /* returns the current cpu id */ -#define cpuid (((u32_t *)(((u32_t)get_stack_frame() + (K_STACK_SIZE - 1)) \ +#define cpuid (((uint32_t *)(((uint32_t)get_stack_frame() + (K_STACK_SIZE - 1)) \ & ~(K_STACK_SIZE - 1)))[-1]) /* * in case apic or smp is disabled in boot monitor, we need to finish single cpu diff --git a/minix/kernel/arch/i386/io_outl.S b/minix/kernel/arch/i386/io_outl.S index 7ba581be6..bd02a709f 100644 --- a/minix/kernel/arch/i386/io_outl.S +++ b/minix/kernel/arch/i386/io_outl.S @@ -1,6 +1,6 @@ /* outl() - Output one dword Author: Kees J. Bot */ /* 18 Mar 1996 */ -/* void outl(U16_t port, u32_t value); */ +/* void outl(U16_t port, uint32_t value); */ #include ENTRY(outl) diff --git a/minix/kernel/arch/i386/klib.S b/minix/kernel/arch/i386/klib.S index 253c8a64b..c03b7eb92 100644 --- a/minix/kernel/arch/i386/klib.S +++ b/minix/kernel/arch/i386/klib.S @@ -560,7 +560,7 @@ newcs: /* * Read the Model Specific Register (MSR) of IA32 architecture * - * void ia32_msr_read(u32_t reg, u32_t * hi, u32_t * lo) + * void ia32_msr_read(uint32_t reg, uint32_t * hi, uint32_t * lo) */ ENTRY(ia32_msr_read) push %ebp @@ -579,7 +579,7 @@ ENTRY(ia32_msr_read) /* * Write the Model Specific Register (MSR) of IA32 architecture * - * void ia32_msr_write(u32_t reg, u32_t hi, u32_t lo) + * void ia32_msr_write(uint32_t reg, uint32_t hi, uint32_t lo) */ ENTRY(ia32_msr_write) push %ebp @@ -722,7 +722,7 @@ ENTRY(smp_get_cores) /*===========================================================================*/ /* arch_spinlock_lock */ /*===========================================================================*/ -/* void arch_spinlock_lock (u32_t *lock_data) +/* void arch_spinlock_lock (uint32_t *lock_data) * { * while (test_and_set(lock_data) == 1) * while (*lock_data == 1) diff --git a/minix/kernel/arch/i386/memory.c b/minix/kernel/arch/i386/memory.c index a11625881..7c9a2213e 100644 --- a/minix/kernel/arch/i386/memory.c +++ b/minix/kernel/arch/i386/memory.c @@ -30,7 +30,7 @@ static int nfreepdes = 0; #define MAXFREEPDES 2 static int freepdes[MAXFREEPDES]; -static u32_t phys_get32(phys_bytes v); +static uint32_t phys_get32(phys_bytes v); void mem_clear_mapcache(void) { @@ -38,7 +38,7 @@ void mem_clear_mapcache(void) for(i = 0; i < nfreepdes; i++) { struct proc *ptproc = get_cpulocal_var(ptproc); int pde = freepdes[i]; - u32_t *ptv; + uint32_t *ptv; assert(ptproc); ptv = ptproc->p_seg.p_cr3_v; assert(ptv); @@ -74,7 +74,7 @@ static phys_bytes createpde( int *changed /* If mapping is made, this is set to 1. */ ) { - u32_t pdeval; + uint32_t pdeval; phys_bytes offset; int pde; @@ -149,7 +149,7 @@ static int check_resumed_caller(struct proc *caller) static int lin_lin_copy(struct proc *srcproc, vir_bytes srclinaddr, struct proc *dstproc, vir_bytes dstlinaddr, vir_bytes bytes) { - u32_t addr; + uint32_t addr; proc_nr_t procslot; assert(get_cpulocal_var(ptproc)); @@ -229,9 +229,9 @@ static int lin_lin_copy(struct proc *srcproc, vir_bytes srclinaddr, } -static u32_t phys_get32(phys_bytes addr) +static uint32_t phys_get32(phys_bytes addr) { - u32_t v; + uint32_t v; int r; if((r=lin_lin_copy(NULL, addr, @@ -243,7 +243,7 @@ static u32_t phys_get32(phys_bytes addr) } #if 0 -static char *cr0_str(u32_t e) +static char *cr0_str(uint32_t e) { static char str[80]; strcpy(str, ""); @@ -259,7 +259,7 @@ static char *cr0_str(u32_t e) return str; } -static char *cr4_str(u32_t e) +static char *cr4_str(uint32_t e) { static char str[80]; strcpy(str, ""); @@ -323,11 +323,11 @@ phys_bytes umap_virtual( * vm_lookup * *===========================================================================*/ int vm_lookup(const struct proc *proc, const vir_bytes virtual, - phys_bytes *physical, u32_t *ptent) + phys_bytes *physical, uint32_t *ptent) { - u32_t *root, *pt; + uint32_t *root, *pt; int pde, pte; - u32_t pde_v, pte_v; + uint32_t pde_v, pte_v; assert(proc); assert(physical); @@ -335,11 +335,11 @@ int vm_lookup(const struct proc *proc, const vir_bytes virtual, assert(HASPT(proc)); /* Retrieve page directory entry. */ - root = (u32_t *) proc->p_seg.p_cr3; - assert(!((u32_t) root % I386_PAGE_SIZE)); + root = (uint32_t *) proc->p_seg.p_cr3; + assert(!((uint32_t) root % I386_PAGE_SIZE)); pde = I386_VM_PDE(virtual); assert(pde >= 0 && pde < I386_VM_DIR_ENTRIES); - pde_v = phys_get32((u32_t) (root + pde)); + pde_v = phys_get32((uint32_t) (root + pde)); if(!(pde_v & I386_VM_PRESENT)) { return EFAULT; @@ -352,11 +352,11 @@ int vm_lookup(const struct proc *proc, const vir_bytes virtual, *physical += virtual & I386_VM_OFFSET_MASK_4MB; } else { /* Retrieve page table entry. */ - pt = (u32_t *) I386_VM_PFA(pde_v); - assert(!((u32_t) pt % I386_PAGE_SIZE)); + pt = (uint32_t *) I386_VM_PFA(pde_v); + assert(!((uint32_t) pt % I386_PAGE_SIZE)); pte = I386_VM_PTE(virtual); assert(pte >= 0 && pte < I386_VM_PT_ENTRIES); - pte_v = phys_get32((u32_t) (pt + pte)); + pte_v = phys_get32((uint32_t) (pt + pte)); if(!(pte_v & I386_VM_PRESENT)) { return EFAULT; } @@ -448,7 +448,7 @@ int vm_check_range(struct proc *caller, struct proc *target, } #if 0 -static char *flagstr(u32_t e, const int dir) +static char *flagstr(uint32_t e, const int dir) { static char str[80]; strcpy(str, ""); @@ -465,16 +465,16 @@ static char *flagstr(u32_t e, const int dir) return str; } -static void vm_pt_print(u32_t *pagetable, const u32_t v) +static void vm_pt_print(uint32_t *pagetable, const uint32_t v) { int pte; int col = 0; - assert(!((u32_t) pagetable % I386_PAGE_SIZE)); + assert(!((uint32_t) pagetable % I386_PAGE_SIZE)); for(pte = 0; pte < I386_VM_PT_ENTRIES; pte++) { - u32_t pte_v, pfa; - pte_v = phys_get32((u32_t) (pagetable + pte)); + uint32_t pte_v, pfa; + pte_v = phys_get32((uint32_t) (pagetable + pte)); if(!(pte_v & I386_VM_PRESENT)) continue; pfa = I386_VM_PFA(pte_v); @@ -489,25 +489,25 @@ static void vm_pt_print(u32_t *pagetable, const u32_t v) return; } -static void vm_print(u32_t *root) +static void vm_print(uint32_t *root) { int pde; - assert(!((u32_t) root % I386_PAGE_SIZE)); + assert(!((uint32_t) root % I386_PAGE_SIZE)); printf("page table 0x%lx:\n", root); for(pde = 0; pde < I386_VM_DIR_ENTRIES; pde++) { - u32_t pde_v; - u32_t *pte_a; - pde_v = phys_get32((u32_t) (root + pde)); + uint32_t pde_v; + uint32_t *pte_a; + pde_v = phys_get32((uint32_t) (root + pde)); if(!(pde_v & I386_VM_PRESENT)) continue; if(pde_v & I386_VM_BIGPAGE) { printf("%4d: 0x%lx, flags %s\n", pde, I386_VM_PFA(pde_v), flagstr(pde_v, 1)); } else { - pte_a = (u32_t *) I386_VM_PFA(pde_v); + pte_a = (uint32_t *) I386_VM_PFA(pde_v); printf("%4d: pt %08lx %s\n", pde, pte_a, flagstr(pde_v, 1)); vm_pt_print(pte_a, pde * I386_VM_PT_ENTRIES * I386_PAGE_SIZE); @@ -526,7 +526,7 @@ static void vm_print(u32_t *root) int vm_memset(struct proc* caller, endpoint_t who, phys_bytes ph, int c, phys_bytes count) { - u32_t pattern; + uint32_t pattern; struct proc *whoptr = NULL; phys_bytes cur_ph = ph; phys_bytes left = count; @@ -719,8 +719,8 @@ void memory_init(void) /*===========================================================================* * arch_proc_init * *===========================================================================*/ -void arch_proc_init(struct proc *pr, const u32_t ip, const u32_t sp, - const u32_t ps_str, char *name) +void arch_proc_init(struct proc *pr, const uint32_t ip, const uint32_t sp, + const uint32_t ps_str, char *name) { arch_proc_reset(pr); strlcpy(pr->p_name, name, sizeof(pr->p_name)); @@ -751,8 +751,8 @@ int arch_phys_map(const int index, static int first = 1; int freeidx = 0; static char *ser_var = NULL; - u32_t glo_len = (u32_t) &usermapped_nonglo_start - - (u32_t) &usermapped_start; + uint32_t glo_len = (uint32_t) &usermapped_nonglo_start - + (uint32_t) &usermapped_start; if(first) { memset(&minix_kerninfo, 0, sizeof(minix_kerninfo)); @@ -799,8 +799,8 @@ int arch_phys_map(const int index, } else if(index == usermapped_index) { *addr = vir2phys(&usermapped_nonglo_start); - *len = (u32_t) &usermapped_end - - (u32_t) &usermapped_nonglo_start; + *len = (uint32_t) &usermapped_end - + (uint32_t) &usermapped_nonglo_start; *flags = VMMF_USER; return OK; } @@ -870,10 +870,10 @@ int arch_phys_map_reply(const int index, const vir_bytes addr) extern struct minix_ipcvecs minix_ipcvecs_sysenter, minix_ipcvecs_syscall, minix_ipcvecs_softint; - extern u32_t usermapped_offset; - assert(addr > (u32_t) &usermapped_start); - usermapped_offset = addr - (u32_t) &usermapped_start; -#define FIXEDPTR(ptr) (void *) ((u32_t)ptr + usermapped_offset) + extern uint32_t usermapped_offset; + assert(addr > (uint32_t) &usermapped_start); + usermapped_offset = addr - (uint32_t) &usermapped_start; +#define FIXEDPTR(ptr) (void *) ((uint32_t)ptr + usermapped_offset) #define FIXPTR(ptr) ptr = FIXEDPTR(ptr) #define ASSIGN(minixstruct) minix_kerninfo.minixstruct = FIXEDPTR(&minixstruct) ASSIGN(kinfo); diff --git a/minix/kernel/arch/i386/pg_utils.c b/minix/kernel/arch/i386/pg_utils.c index 585dfc6c8..b7654aa66 100644 --- a/minix/kernel/arch/i386/pg_utils.c +++ b/minix/kernel/arch/i386/pg_utils.c @@ -16,7 +16,7 @@ static phys_bytes kern_phys_start = (phys_bytes) &_kern_phys_base; static phys_bytes kern_kernlen = (phys_bytes) &_kern_size; /* page directory we can use to map things */ -static u32_t pagedir[1024] __aligned(4096); +static uint32_t pagedir[1024] __aligned(4096); void print_memmap(kinfo_t *cbi) { @@ -120,11 +120,11 @@ void add_memmap(kinfo_t *cbi, u64_t addr, u64_t len) panic("no available memmap slot"); } -u32_t *alloc_pagetable(phys_bytes *ph) +uint32_t *alloc_pagetable(phys_bytes *ph) { - u32_t *ret; + uint32_t *ret; #define PG_PAGETABLES 6 - static u32_t pagetables[PG_PAGETABLES][1024] __aligned(4096); + static uint32_t pagetables[PG_PAGETABLES][1024] __aligned(4096); static int pt_inuse = 0; if(pt_inuse >= PG_PAGETABLES) panic("no more pagetables"); assert(sizeof(pagetables[pt_inuse]) == I386_PAGE_SIZE); @@ -171,7 +171,7 @@ void pg_identity(kinfo_t *cbi) /* Set up an identity mapping page directory */ for(i = 0; i < I386_VM_DIR_ENTRIES; i++) { - u32_t flags = I386_VM_PRESENT | I386_VM_BIGPAGE + uint32_t flags = I386_VM_PRESENT | I386_VM_BIGPAGE | I386_VM_USER | I386_VM_WRITE; phys = i * I386_BIG_PAGE_SIZE; @@ -186,7 +186,7 @@ void pg_identity(kinfo_t *cbi) int pg_mapkernel(void) { int pde; - u32_t mapped = 0, kern_phys = kern_phys_start; + uint32_t mapped = 0, kern_phys = kern_phys_start; assert(!(kern_vir_start % I386_BIG_PAGE_SIZE)); assert(!(kern_phys % I386_BIG_PAGE_SIZE)); @@ -203,7 +203,7 @@ int pg_mapkernel(void) void vm_enable_paging(void) { - u32_t cr0, cr4; + uint32_t cr0, cr4; int pgeok; pgeok = _cpufeature(_CPUF_I386_PGE); @@ -268,7 +268,7 @@ void pg_map(phys_bytes phys, vir_bytes vaddr, vir_bytes vaddr_end, kinfo_t *cbi) { static int mapped_pde = -1; - static u32_t *pt = NULL; + static uint32_t *pt = NULL; int pde, pte; assert(kernel_may_alloc); @@ -309,7 +309,7 @@ void pg_map(phys_bytes phys, vir_bytes vaddr, vir_bytes vaddr_end, } } -void pg_info(reg_t *pagedir_ph, u32_t **pagedir_v) +void pg_info(reg_t *pagedir_ph, uint32_t **pagedir_v) { *pagedir_ph = vir2phys(pagedir); *pagedir_v = pagedir; diff --git a/minix/kernel/arch/i386/pre_init.c b/minix/kernel/arch/i386/pre_init.c index 1511bc4d3..f99ba42d5 100644 --- a/minix/kernel/arch/i386/pre_init.c +++ b/minix/kernel/arch/i386/pre_init.c @@ -91,7 +91,7 @@ int overlaps(multiboot_module_t *mod, int n, int cmp_mod) return 0; } -void get_parameters(u32_t ebx, kinfo_t *cbi) +void get_parameters(uint32_t ebx, kinfo_t *cbi) { multiboot_memory_map_t *mmap; multiboot_info_t *mbi = &cbi->mbi; @@ -214,7 +214,7 @@ void get_parameters(u32_t ebx, kinfo_t *cbi) } } -kinfo_t *pre_init(u32_t magic, u32_t ebx) +kinfo_t *pre_init(uint32_t magic, uint32_t ebx) { assert(magic == MULTIBOOT_INFO_MAGIC); diff --git a/minix/kernel/arch/i386/protect.c b/minix/kernel/arch/i386/protect.c index ca9a9fd98..82ae6c151 100644 --- a/minix/kernel/arch/i386/protect.c +++ b/minix/kernel/arch/i386/protect.c @@ -26,14 +26,14 @@ struct segdesc_s gdt[GDT_SIZE] __aligned(DESC_SIZE); struct gatedesc_s idt[IDT_SIZE] __aligned(DESC_SIZE); struct tss_s tss[CONFIG_MAX_CPUS]; -u32_t k_percpu_stacks[CONFIG_MAX_CPUS]; +uint32_t k_percpu_stacks[CONFIG_MAX_CPUS]; int prot_init_done = 0; phys_bytes vir2phys(void *vir) { extern char _kern_vir_base, _kern_phys_base; /* in kernel.lds */ - u32_t offset = (vir_bytes) &_kern_vir_base - + uint32_t offset = (vir_bytes) &_kern_vir_base - (vir_bytes) &_kern_phys_base; return (phys_bytes)vir - offset; } @@ -184,12 +184,12 @@ int tss_init(unsigned cpu, void * kernel_stack) if(minix_feature_flags & MKF_I386_INTEL_SYSENTER) { ia32_msr_write(INTEL_MSR_SYSENTER_CS, 0, KERN_CS_SELECTOR); ia32_msr_write(INTEL_MSR_SYSENTER_ESP, 0, t->sp0); - ia32_msr_write(INTEL_MSR_SYSENTER_EIP, 0, (u32_t) ipc_entry_sysenter); + ia32_msr_write(INTEL_MSR_SYSENTER_EIP, 0, (uint32_t) ipc_entry_sysenter); } /* Set up AMD SYSCALL support if available. */ if(minix_feature_flags & MKF_I386_AMD_SYSCALL) { - u32_t msr_lo, msr_hi; + uint32_t msr_lo, msr_hi; /* set SYSCALL ENABLE bit in EFER MSR */ ia32_msr_read(AMD_MSR_EFER, &msr_hi, &msr_lo); @@ -199,8 +199,8 @@ int tss_init(unsigned cpu, void * kernel_stack) /* set STAR register value */ #define set_star_cpu(forcpu) if(cpu == forcpu) { \ ia32_msr_write(AMD_MSR_STAR, \ - ((u32_t)USER_CS_SELECTOR << 16) | (u32_t)KERN_CS_SELECTOR, \ - (u32_t) ipc_entry_syscall_cpu ## forcpu); } + ((uint32_t)USER_CS_SELECTOR << 16) | (uint32_t)KERN_CS_SELECTOR, \ + (uint32_t) ipc_entry_syscall_cpu ## forcpu); } set_star_cpu(0); set_star_cpu(1); set_star_cpu(2); @@ -331,9 +331,9 @@ void prot_init(void) memset(idt, 0, sizeof(idt)); /* Build GDT, IDT, IDT descriptors. */ - gdt_desc.base = (u32_t) gdt; + gdt_desc.base = (uint32_t) gdt; gdt_desc.limit = sizeof(gdt)-1; - idt_desc.base = (u32_t) idt; + idt_desc.base = (uint32_t) idt; idt_desc.limit = sizeof(idt)-1; tss_init(0, &k_boot_stktop); diff --git a/minix/kernel/debug.c b/minix/kernel/debug.c index 29f003878..90a412ee0 100644 --- a/minix/kernel/debug.c +++ b/minix/kernel/debug.c @@ -134,7 +134,7 @@ int runqueues_ok(void) #endif char * -rtsflagstr(const u32_t flags) +rtsflagstr(const uint32_t flags) { static char str[100]; str[0] = '\0'; @@ -161,7 +161,7 @@ rtsflagstr(const u32_t flags) } char * -miscflagstr(const u32_t flags) +miscflagstr(const uint32_t flags) { static char str[100]; str[0] = '\0'; diff --git a/minix/kernel/proc.h b/minix/kernel/proc.h index 96c5956b4..a5f1f51e5 100644 --- a/minix/kernel/proc.h +++ b/minix/kernel/proc.h @@ -24,8 +24,8 @@ struct proc { struct segframe p_seg; /* segment descriptors */ proc_nr_t p_nr; /* number of this process (for fast access) */ struct priv *p_priv; /* system privileges structure */ - volatile u32_t p_rts_flags; /* process is runnable only if zero */ - volatile u32_t p_misc_flags; /* flags that do not suspend the process */ + volatile uint32_t p_rts_flags; /* process is runnable only if zero */ + volatile uint32_t p_misc_flags; /* flags that do not suspend the process */ char p_priority; /* current process priority */ u64_t p_cpu_time_left; /* time left to use the cpu */ diff --git a/minix/kernel/profile.c b/minix/kernel/profile.c index 61d1ee766..c32425520 100644 --- a/minix/kernel/profile.c +++ b/minix/kernel/profile.c @@ -24,7 +24,7 @@ static irq_hook_t profile_clock_hook; /*===========================================================================* * init_profile_clock * *===========================================================================*/ -void init_profile_clock(u32_t freq) +void init_profile_clock(uint32_t freq) { int irq; diff --git a/minix/kernel/proto.h b/minix/kernel/proto.h index fd6323c5e..946bf8b6c 100644 --- a/minix/kernel/proto.h +++ b/minix/kernel/proto.h @@ -138,8 +138,8 @@ int runqueues_ok(void); #define runqueues_ok_local() runqueues_ok_cpu(cpuid) int runqueues_ok_cpu(unsigned cpu); #endif -char *rtsflagstr(u32_t flags); -char *miscflagstr(u32_t flags); +char *rtsflagstr(uint32_t flags); +char *miscflagstr(uint32_t flags); char *schedulerstr(struct proc *scheduler); /* prints process information */ void print_proc(struct proc *pp); @@ -165,14 +165,14 @@ int do_diagctl(struct proc * caller, message *m); #if SPROFILE /* profile.c */ -void init_profile_clock(u32_t); +void init_profile_clock(uint32_t); void stop_profile_clock(void); #endif /* functions defined in architecture-dependent files. */ void prot_init(void); void arch_post_init(void); -void arch_set_secondary_ipc_return(struct proc *, u32_t val); +void arch_set_secondary_ipc_return(struct proc *, uint32_t val); phys_bytes phys_copy(phys_bytes source, phys_bytes dest, phys_bytes count); void phys_copy_fault(void); @@ -206,21 +206,21 @@ int is_fpu(void); void ser_putc(char); __dead void arch_shutdown(int); void restore_user_context(struct proc * p); -void read_tsc(u32_t *high, u32_t *low); -int arch_init_profile_clock(u32_t freq); +void read_tsc(uint32_t *high, uint32_t *low); +int arch_init_profile_clock(uint32_t freq); void arch_stop_profile_clock(void); void arch_ack_profile_clock(void); void do_ser_debug(void); int arch_get_params(char *parm, int max); void memory_init(void); void mem_clear_mapcache(void); -void arch_proc_init(struct proc *pr, u32_t, u32_t, u32_t, char *); +void arch_proc_init(struct proc *pr, uint32_t, uint32_t, uint32_t, char *); int arch_do_vmctl(message *m_ptr, struct proc *p); int vm_contiguous(const struct proc *targetproc, vir_bytes vir_buf, size_t count); void proc_stacktrace(struct proc *proc); int vm_lookup(const struct proc *proc, vir_bytes virtual, phys_bytes - *result, u32_t *ptent); + *result, uint32_t *ptent); size_t vm_lookup_range(const struct proc *proc, vir_bytes vir_addr, phys_bytes *phys_addr, size_t bytes); void arch_do_syscall(struct proc *proc); diff --git a/minix/kernel/smp.c b/minix/kernel/smp.c index 1a6c86de2..d31643bf7 100644 --- a/minix/kernel/smp.c +++ b/minix/kernel/smp.c @@ -12,8 +12,8 @@ struct cpu cpus[CONFIG_MAX_CPUS]; /* info passed to another cpu along with a sched ipi */ struct sched_ipi_data { - volatile u32_t flags; - volatile u32_t data; + volatile uint32_t flags; + volatile uint32_t data; }; static struct sched_ipi_data sched_ipi_data[CONFIG_MAX_CPUS]; @@ -94,7 +94,7 @@ static void smp_schedule_sync(struct proc * p, unsigned task) BKL_LOCK(); } - sched_ipi_data[cpu].data = (u32_t) p; + sched_ipi_data[cpu].data = (uint32_t) p; sched_ipi_data[cpu].flags |= task; __insn_barrier(); arch_send_smp_schedule_ipi(cpu); diff --git a/minix/kernel/smp.h b/minix/kernel/smp.h index 1dbb2c564..6ce1931a5 100644 --- a/minix/kernel/smp.h +++ b/minix/kernel/smp.h @@ -32,7 +32,7 @@ void smp_init(void); #define CPU_IS_READY 2 struct cpu { - u32_t flags; + uint32_t flags; }; EXTERN struct cpu cpus[CONFIG_MAX_CPUS]; diff --git a/minix/kernel/system/do_exec.c b/minix/kernel/system/do_exec.c index f97901c36..eb4af7491 100644 --- a/minix/kernel/system/do_exec.c +++ b/minix/kernel/system/do_exec.c @@ -43,9 +43,9 @@ int do_exec(struct proc * caller, message * m_ptr) /* Set process state. */ arch_proc_init(rp, - (u32_t) m_ptr->m_lsys_krn_sys_exec.ip, - (u32_t) m_ptr->m_lsys_krn_sys_exec.stack, - (u32_t) m_ptr->m_lsys_krn_sys_exec.ps_str, name); + (uint32_t) m_ptr->m_lsys_krn_sys_exec.ip, + (uint32_t) m_ptr->m_lsys_krn_sys_exec.stack, + (uint32_t) m_ptr->m_lsys_krn_sys_exec.ps_str, name); /* No reply to EXEC call */ RTS_UNSET(rp, RTS_RECEIVING); diff --git a/minix/kernel/system/do_vdevio.c b/minix/kernel/system/do_vdevio.c index dde717df3..72e190178 100644 --- a/minix/kernel/system/do_vdevio.c +++ b/minix/kernel/system/do_vdevio.c @@ -58,7 +58,7 @@ int do_vdevio(struct proc * caller, message * m_ptr) break; case _DIO_LONG: bytes = vec_size * sizeof(pvl_pair_t); - io_size= sizeof(u32_t); + io_size= sizeof(uint32_t); break; default: return(EINVAL); /* check type once and for all */ } diff --git a/minix/lib/libaudiodriver/audio_fw.c b/minix/lib/libaudiodriver/audio_fw.c index 56a91c99c..bebf8e5d7 100644 --- a/minix/lib/libaudiodriver/audio_fw.c +++ b/minix/lib/libaudiodriver/audio_fw.c @@ -627,7 +627,7 @@ static void handle_int_read(int sub_dev_nr) static int get_started(sub_dev_t *sub_dev_ptr) { - u32_t i; + uint32_t i; /* enable interrupt messages from MINIX */ if ((i=sys_irqenable(&irq_hook_id)) != OK) { @@ -756,7 +756,7 @@ static int init_buffers(sub_dev_t *sub_dev_ptr) char *base; size_t size; unsigned left; - u32_t i; + uint32_t i; phys_bytes ph; /* allocate dma buffer space */ diff --git a/minix/lib/libblockdriver/trace.c b/minix/lib/libblockdriver/trace.c index f1a048b19..723589c60 100644 --- a/minix/lib/libblockdriver/trace.c +++ b/minix/lib/libblockdriver/trace.c @@ -11,7 +11,7 @@ #include "trace.h" #define NO_TRACEDEV ((devminor_t) -1) -#define NO_TIME ((u32_t) -1) +#define NO_TIME ((uint32_t) -1) static int trace_enabled = FALSE; static devminor_t trace_dev = NO_TRACEDEV; @@ -30,7 +30,7 @@ static btrace_entry *trace_ptr[MAX_THREADS + 1] = { NULL }; /*===========================================================================* * trace_gettime * *===========================================================================*/ -static u32_t trace_gettime(void) +static uint32_t trace_gettime(void) { /* Return the current time, in microseconds since the start of the trace. */ diff --git a/minix/lib/libc/arch/arm/read_tsc.c b/minix/lib/libc/arch/arm/read_tsc.c index de829f8b0..c30a3d32d 100644 --- a/minix/lib/libc/arch/arm/read_tsc.c +++ b/minix/lib/libc/arch/arm/read_tsc.c @@ -2,10 +2,10 @@ #include void -read_tsc(u32_t *hi, u32_t *lo) +read_tsc(uint32_t *hi, uint32_t *lo) { /* Read Clock Cycle Counter (CCNT). Intel calls it Time Stamp Counter (TSC) */ - u32_t ccnt; + uint32_t ccnt; /* Get value from the Performance Monitors Cycle Counter Register. * See ARM Architecture Reference Manual B5.1.113. diff --git a/minix/lib/libc/arch/i386/_cpufeature.c b/minix/lib/libc/arch/i386/_cpufeature.c index 7448c5c9a..18148eb03 100644 --- a/minix/lib/libc/arch/i386/_cpufeature.c +++ b/minix/lib/libc/arch/i386/_cpufeature.c @@ -7,8 +7,8 @@ int _cpufeature(int cpufeature) { - u32_t eax, ebx, ecx, edx; - u32_t ef_eax = 0, ef_ebx = 0, ef_ecx = 0, ef_edx = 0; + uint32_t eax, ebx, ecx, edx; + uint32_t ef_eax = 0, ef_ebx = 0, ef_ecx = 0, ef_edx = 0; unsigned int family, model, stepping; int is_intel = 0, is_amd = 0; diff --git a/minix/lib/libc/arch/i386/_cpuid.S b/minix/lib/libc/arch/i386/_cpuid.S index 9b0929fcd..124195601 100644 --- a/minix/lib/libc/arch/i386/_cpuid.S +++ b/minix/lib/libc/arch/i386/_cpuid.S @@ -1,7 +1,7 @@ /* _cpuid() - interface to cpuid instruction */ -/* void _cpuid(u32_t *eax, u32_t *ebx, u32_t *ecx, u32_t *edx); */ +/* void _cpuid(uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx); */ /* 0 for OK, nonzero for unsupported */ #include diff --git a/minix/lib/libc/gen/read_tsc_64.c b/minix/lib/libc/gen/read_tsc_64.c index 63faa10ad..482a01645 100644 --- a/minix/lib/libc/gen/read_tsc_64.c +++ b/minix/lib/libc/gen/read_tsc_64.c @@ -8,7 +8,7 @@ void read_tsc_64(t) u64_t* t; { - u32_t lo, hi; + uint32_t lo, hi; read_tsc (&hi, &lo); *t = make64 (lo, hi); } diff --git a/minix/lib/libc/sys/mmap.c b/minix/lib/libc/sys/mmap.c index 76452529a..3c83647b0 100644 --- a/minix/lib/libc/sys/mmap.c +++ b/minix/lib/libc/sys/mmap.c @@ -47,7 +47,7 @@ void *minix_mmap_for(endpoint_t forwhom, } int minix_vfs_mmap(endpoint_t who, off_t offset, size_t len, - dev_t dev, ino_t ino, int fd, u32_t vaddr, uint16_t clearend, + dev_t dev, ino_t ino, int fd, uint32_t vaddr, uint16_t clearend, uint16_t flags) { message m; diff --git a/minix/lib/libclkconf/clkconf.c b/minix/lib/libclkconf/clkconf.c index cf634dce3..44ca574d3 100644 --- a/minix/lib/libclkconf/clkconf.c +++ b/minix/lib/libclkconf/clkconf.c @@ -29,8 +29,8 @@ static struct log clk_log = { #define DM37XX_CM_BASE 0x48004000 #define AM335X_CM_BASE 0x44E00000 -static u32_t base = 0; -static u32_t use_count = 0; +static uint32_t base = 0; +static uint32_t use_count = 0; int clkconf_init() @@ -38,7 +38,7 @@ clkconf_init() use_count++; struct machine machine; sys_getmachine(&machine); - u32_t cm_base = 0; + uint32_t cm_base = 0; if (base != 0) { @@ -73,7 +73,7 @@ clkconf_init() } int -clkconf_set(u32_t clk, u32_t mask, u32_t value) +clkconf_set(uint32_t clk, uint32_t mask, uint32_t value) { set32(base + clk, mask, value); return OK; diff --git a/minix/lib/libddekit/src/resource.c b/minix/lib/libddekit/src/resource.c index 29965c3bc..04849a5a5 100644 --- a/minix/lib/libddekit/src/resource.c +++ b/minix/lib/libddekit/src/resource.c @@ -73,7 +73,7 @@ int ddekit_release_mem(ddekit_addr_t start, ddekit_addr_t size) /* ddekit_inb */ /****************************************************************************/ unsigned char ddekit_inb(ddekit_addr_t port) { - u32_t ret; + uint32_t ret; if (sys_inb(port, &ret)) { ddekit_panic("sys_inb failed."); } @@ -85,7 +85,7 @@ unsigned char ddekit_inb(ddekit_addr_t port) { /* ddekit_inw */ /****************************************************************************/ unsigned short ddekit_inw(ddekit_addr_t port) { - u32_t ret; + uint32_t ret; if (sys_inw(port, &ret)) { ddekit_panic("sys_inw failed."); } @@ -97,7 +97,7 @@ unsigned short ddekit_inw(ddekit_addr_t port) { /* ddekit_inl */ /****************************************************************************/ unsigned long ddekit_inl(ddekit_addr_t port){ - u32_t ret; + uint32_t ret; if (sys_inl(port, &ret)) { ddekit_panic("sys_outl failed."); } diff --git a/minix/lib/libfsdriver/call.c b/minix/lib/libfsdriver/call.c index f7bb9e50a..ee0319452 100644 --- a/minix/lib/libfsdriver/call.c +++ b/minix/lib/libfsdriver/call.c @@ -227,7 +227,7 @@ static ssize_t builtin_peek(const struct fsdriver * __restrict fdp, ino_t ino_nr, size_t nbytes, off_t pos) { - static u32_t flags = 0; /* storage for the VMMC_ flags of all blocks */ + static uint32_t flags = 0; /* storage for the VMMC_ flags of all blocks */ static off_t dev_off = 0; /* fake device offset, see below */ struct fsdriver_data data; char *buf; diff --git a/minix/lib/libgpio/gpio_omap.c b/minix/lib/libgpio/gpio_omap.c index a5c99334f..da2a5f63c 100644 --- a/minix/lib/libgpio/gpio_omap.c +++ b/minix/lib/libgpio/gpio_omap.c @@ -379,7 +379,7 @@ omap_message_hook(message * m) return OK; } -static int revision_matches(u32_t board_id,u32_t rev) { +static int revision_matches(uint32_t board_id,uint32_t rev) { /* figures out if the collected resition matches the one expected * from the board */ if (BOARD_IS_BBXM(board_id)){ @@ -403,7 +403,7 @@ static int revision_matches(u32_t board_id,u32_t rev) { static int omap_gpio_init(struct gpio_driver *gpdrv) { - u32_t revision; + uint32_t revision; int i; struct minix_mem_range mr; struct omap_gpio_bank *bank; diff --git a/minix/lib/libhgfs/attr.c b/minix/lib/libhgfs/attr.c index b3a7428d1..2ff3556ef 100644 --- a/minix/lib/libhgfs/attr.c +++ b/minix/lib/libhgfs/attr.c @@ -13,7 +13,7 @@ void attr_get(struct sffs_attr *attr) * in the given attr structure. */ mode_t mode; - u32_t size_lo, size_hi; + uint32_t size_lo, size_hi; mode = (RPC_NEXT32) ? S_IFDIR : S_IFREG; diff --git a/minix/lib/libhgfs/channel.c b/minix/lib/libhgfs/channel.c index 985e84293..754b78d9a 100644 --- a/minix/lib/libhgfs/channel.c +++ b/minix/lib/libhgfs/channel.c @@ -21,14 +21,14 @@ enum { *===========================================================================*/ int channel_open( struct channel *ch, /* struct describing the new channel */ - u32_t type /* channel type: CH_IN or CH_OUT */ + uint32_t type /* channel type: CH_IN or CH_OUT */ ) { /* Open a new backdoor channel. Upon success, the given channel structure will * be filled with information and can be used in subsequent channel calls. * Return OK on success, or a negative error code on error. */ - u32_t ptr[6]; + uint32_t ptr[6]; ptr[1] = type | 0x80000000; ptr[2] = MAKELONG(CMD_XFER, XFER_OPEN); @@ -53,7 +53,7 @@ void channel_close( { /* Close a previously opened backdoor channel. */ - u32_t ptr[6]; + uint32_t ptr[6]; ptr[2] = MAKELONG(CMD_XFER, XFER_CLOSE); ptr[3] = MAKELONG(0, ch->id); @@ -75,7 +75,7 @@ int channel_send( /* Receive data over a backdoor channel. Return OK on success, or a negative * error code on error. */ - u32_t ptr[7]; + uint32_t ptr[7]; ptr[1] = len; ptr[2] = MAKELONG(CMD_XFER, XFER_SENDLEN); @@ -92,7 +92,7 @@ int channel_send( ptr[1] = MAKELONG(0, 1); ptr[2] = len; ptr[3] = MAKELONG(0, ch->id); - ptr[4] = (u32_t)buf; + ptr[4] = (uint32_t)buf; ptr[5] = ch->cookie2; ptr[6] = ch->cookie1; @@ -113,7 +113,7 @@ int channel_recv( /* Receive data on a backdoor channel. Return the number of bytes received, or * a negative error code on error. */ - u32_t ptr[7]; + uint32_t ptr[7]; int len; ptr[2] = MAKELONG(CMD_XFER, XFER_RECVLEN); @@ -133,7 +133,7 @@ int channel_recv( ptr[2] = len; ptr[3] = MAKELONG(0, ch->id); ptr[4] = ch->cookie1; - ptr[5] = (u32_t)buf; + ptr[5] = (uint32_t)buf; ptr[6] = ch->cookie2; backdoor_in(ptr); diff --git a/minix/lib/libhgfs/const.h b/minix/lib/libhgfs/const.h index d34d21eef..11dcc42f6 100644 --- a/minix/lib/libhgfs/const.h +++ b/minix/lib/libhgfs/const.h @@ -18,7 +18,7 @@ /* ..all this because ACK can't pack structures :( */ #define RPC_NEXT8 *(((uint8_t*)(++rpc_ptr))-1) /* get/set next byte */ #define RPC_NEXT16 *(((uint16_t*)(rpc_ptr+=2))-1) /* get/set next short */ -#define RPC_NEXT32 *(((u32_t*)(rpc_ptr+=4))-1) /* get/set next long */ +#define RPC_NEXT32 *(((uint32_t*)(rpc_ptr+=4))-1) /* get/set next long */ #define RPC_LEN (rpc_ptr - rpc_buf) /* request length thus far */ #define RPC_ADVANCE(n) rpc_ptr += n /* skip n bytes in buffer */ #define RPC_PTR (rpc_ptr) /* pointer to next data */ diff --git a/minix/lib/libhgfs/dir.c b/minix/lib/libhgfs/dir.c index e09c69304..75edd076b 100644 --- a/minix/lib/libhgfs/dir.c +++ b/minix/lib/libhgfs/dir.c @@ -38,7 +38,7 @@ int hgfs_readdir(sffs_dir_t handle, unsigned int index, char *buf, int r; RPC_REQUEST(HGFS_REQ_READDIR); - RPC_NEXT32 = (u32_t)handle; + RPC_NEXT32 = (uint32_t)handle; RPC_NEXT32 = index; /* EINVAL signifies end of directory. */ @@ -66,7 +66,7 @@ int hgfs_closedir(sffs_dir_t handle) */ RPC_REQUEST(HGFS_REQ_CLOSEDIR); - RPC_NEXT32 = (u32_t)handle; + RPC_NEXT32 = (uint32_t)handle; return rpc_query(); } diff --git a/minix/lib/libhgfs/file.c b/minix/lib/libhgfs/file.c index 768919697..ad987f35c 100644 --- a/minix/lib/libhgfs/file.c +++ b/minix/lib/libhgfs/file.c @@ -64,11 +64,11 @@ ssize_t hgfs_read( int r; RPC_REQUEST(HGFS_REQ_READ); - RPC_NEXT32 = (u32_t)handle; + RPC_NEXT32 = (uint32_t)handle; RPC_NEXT32 = ex64lo(off); RPC_NEXT32 = ex64hi(off); - max = RPC_BUF_SIZE - RPC_LEN - sizeof(u32_t); + max = RPC_BUF_SIZE - RPC_LEN - sizeof(uint32_t); RPC_NEXT32 = (size < max) ? size : max; if ((r = rpc_query()) != OK) @@ -99,7 +99,7 @@ ssize_t hgfs_write( int r; RPC_REQUEST(HGFS_REQ_WRITE); - RPC_NEXT32 = (u32_t)handle; + RPC_NEXT32 = (uint32_t)handle; RPC_NEXT8 = 0; /* append flag */ RPC_NEXT32 = ex64lo(off); RPC_NEXT32 = ex64hi(off); @@ -127,7 +127,7 @@ int hgfs_close( */ RPC_REQUEST(HGFS_REQ_CLOSE); - RPC_NEXT32 = (u32_t)handle; + RPC_NEXT32 = (uint32_t)handle; return rpc_query(); } @@ -142,9 +142,9 @@ size_t hgfs_readbuf(char **ptr) * size. The results are static, but must only be used directly prior to a * hgfs_read() call (with a NULL data buffer address). */ - u32_t off; + uint32_t off; - off = RPC_HDR_SIZE + sizeof(u32_t); + off = RPC_HDR_SIZE + sizeof(uint32_t); RPC_RESET; RPC_ADVANCE(off); @@ -163,9 +163,9 @@ size_t hgfs_writebuf(char **ptr) * size. The results are static, but must only be used immediately after a * hgfs_write() call (with a NULL data buffer address). */ - u32_t off; + uint32_t off; - off = RPC_HDR_SIZE + sizeof(u32_t) + sizeof(uint8_t) + sizeof(u32_t) * 3; + off = RPC_HDR_SIZE + sizeof(uint32_t) + sizeof(uint8_t) + sizeof(uint32_t) * 3; RPC_RESET; RPC_ADVANCE(off); diff --git a/minix/lib/libhgfs/info.c b/minix/lib/libhgfs/info.c index 420977200..db5a21a42 100644 --- a/minix/lib/libhgfs/info.c +++ b/minix/lib/libhgfs/info.c @@ -10,7 +10,7 @@ int hgfs_queryvol(const char *path, u64_t *free, u64_t *total) /* Retrieve information about available and total volume space associated with * a given path. */ - u32_t lo, hi; + uint32_t lo, hi; int r; RPC_REQUEST(HGFS_REQ_QUERYVOL); diff --git a/minix/lib/libhgfs/proto.h b/minix/lib/libhgfs/proto.h index fcd1f1834..e618fba8a 100644 --- a/minix/lib/libhgfs/proto.h +++ b/minix/lib/libhgfs/proto.h @@ -10,16 +10,16 @@ int hgfs_setattr(const char *path, struct sffs_attr *attr); #define backdoor PREFIX(backdoor) #define backdoor_in PREFIX(backdoor_in) #define backdoor_out PREFIX(backdoor_out) -u32_t backdoor(u32_t ptr[6]); -u32_t backdoor_in(u32_t ptr[6]); -u32_t backdoor_out(u32_t ptr[6]); +uint32_t backdoor(uint32_t ptr[6]); +uint32_t backdoor_in(uint32_t ptr[6]); +uint32_t backdoor_out(uint32_t ptr[6]); /* channel.c */ #define channel_open PREFIX(channel_open) #define channel_close PREFIX(channel_close) #define channel_send PREFIX(channel_send) #define channel_recv PREFIX(channel_recv) -int channel_open(struct channel *ch, u32_t type); +int channel_open(struct channel *ch, uint32_t type); void channel_close(struct channel *ch); int channel_send(struct channel *ch, char *buf, int len); int channel_recv(struct channel *ch, char *buf, int max); diff --git a/minix/lib/libhgfs/rpc.c b/minix/lib/libhgfs/rpc.c index 2899d6b2c..bd259a47f 100644 --- a/minix/lib/libhgfs/rpc.c +++ b/minix/lib/libhgfs/rpc.c @@ -61,7 +61,7 @@ int rpc_query(void) if (len <= 2) return OK; - RPC_ADVANCE(sizeof(u32_t)); /* Skip over id field. */ + RPC_ADVANCE(sizeof(uint32_t)); /* Skip over id field. */ err = RPC_NEXT32; return error_convert(err); diff --git a/minix/lib/libhgfs/time.c b/minix/lib/libhgfs/time.c index 1767db276..84f86645d 100644 --- a/minix/lib/libhgfs/time.c +++ b/minix/lib/libhgfs/time.c @@ -54,7 +54,7 @@ void time_get(struct timespec *tsp) * NULL, however, simply skip over the timestamp in the RPC buffer. */ u64_t hgfstime; - u32_t time_lo, time_hi; + uint32_t time_lo, time_hi; if (tsp != NULL) { time_lo = RPC_NEXT32; @@ -65,5 +65,5 @@ void time_get(struct timespec *tsp) tsp->tv_sec = (unsigned long)(hgfstime / 10000000); tsp->tv_nsec = (unsigned)(hgfstime % 10000000) * 100; } - else RPC_ADVANCE(sizeof(u32_t) * 2); + else RPC_ADVANCE(sizeof(uint32_t) * 2); } diff --git a/minix/lib/libhgfs/type.h b/minix/lib/libhgfs/type.h index 428d654e3..02377a1b9 100644 --- a/minix/lib/libhgfs/type.h +++ b/minix/lib/libhgfs/type.h @@ -2,6 +2,6 @@ struct channel { uint16_t id; - u32_t cookie1; - u32_t cookie2; + uint32_t cookie1; + uint32_t cookie2; }; diff --git a/minix/lib/libi2cdriver/i2cdriver.c b/minix/lib/libi2cdriver/i2cdriver.c index 0aca71db3..15428553a 100644 --- a/minix/lib/libi2cdriver/i2cdriver.c +++ b/minix/lib/libi2cdriver/i2cdriver.c @@ -120,7 +120,7 @@ i2cdriver_handle_bus_update(endpoint_t * bus_endpoint, uint32_t bus, i2c_addr_t address) { char key[DS_MAX_KEYLEN]; - u32_t value; + uint32_t value; int type; endpoint_t owner_endpoint, old_endpoint; int r; diff --git a/minix/lib/libmagicrt/include/magic_mem.h b/minix/lib/libmagicrt/include/magic_mem.h index c84955ca5..3d19c238b 100644 --- a/minix/lib/libmagicrt/include/magic_mem.h +++ b/minix/lib/libmagicrt/include/magic_mem.h @@ -142,9 +142,9 @@ PUBLIC void *(*magic_real_mmap64)(void *start, size_t length, int prot, int flag #include PUBLIC void *magic_vm_map_cacheblock(__MA_ARGS__ dev_t dev, off_t dev_offset, - ino_t ino, off_t ino_offset, u32_t *flags, int blocksize); + ino_t ino, off_t ino_offset, uint32_t *flags, int blocksize); PUBLIC void *(*magic_real_vm_map_cacheblock)(dev_t dev, off_t dev_offset, - ino_t ino, off_t ino_offset, u32_t *flags, int blocksize); + ino_t ino, off_t ino_offset, uint32_t *flags, int blocksize); #endif /* wrappers to skip alloction */ diff --git a/minix/lib/libmagicrt/include/st/typedefs.h b/minix/lib/libmagicrt/include/st/typedefs.h index 29d9e35c0..6605b6ecc 100644 --- a/minix/lib/libmagicrt/include/st/typedefs.h +++ b/minix/lib/libmagicrt/include/st/typedefs.h @@ -25,7 +25,7 @@ typedef int32_t* PREFIX ## i32_ptr_t #define ST_DECLARE_STD_PTRINT_TYPEDEFS(PREFIX) \ - typedef uint32_t PREFIX ## u32_t; \ + typedef uint32_t PREFIX ## uint32_t; \ typedef int PREFIX ## int_t; \ typedef long PREFIX ## long_t; \ typedef unsigned int PREFIX ## uint_t; \ diff --git a/minix/lib/libmagicrt/magic_mem.c b/minix/lib/libmagicrt/magic_mem.c index 795c8af1d..ce1a36fd5 100644 --- a/minix/lib/libmagicrt/magic_mem.c +++ b/minix/lib/libmagicrt/magic_mem.c @@ -91,7 +91,7 @@ PUBLIC void *(*magic_real_mmap64)(void *start, size_t length, int prot, int flag int fd, off_t pgoffset) = &mmap64; #else PUBLIC void *(*magic_real_vm_map_cacheblock)(dev_t dev, off_t dev_offset, - ino_t ino, off_t ino_offset, u32_t *flags, int blocksize) = &vm_map_cacheblock; + ino_t ino, off_t ino_offset, uint32_t *flags, int blocksize) = &vm_map_cacheblock; #endif /* Use magic_real* functions in the rest of the file. */ @@ -2061,7 +2061,7 @@ PUBLIC void *magic_mmap64(__MA_ARGS__ void *start, size_t length, int prot, int * magic_vm_map_cacheblock * *===========================================================================*/ PUBLIC void *magic_vm_map_cacheblock(__MA_ARGS__ dev_t dev, off_t dev_offset, - ino_t ino, off_t ino_offset, u32_t *flags, int length) + ino_t ino, off_t ino_offset, uint32_t *flags, int length) { void *ptr, *data_ptr, *aligned_ptr; int dsentry_flags = MAGIC_STATE_MAP; diff --git a/minix/lib/libminixfs/cache.c b/minix/lib/libminixfs/cache.c index d022709c7..a358317cf 100644 --- a/minix/lib/libminixfs/cache.c +++ b/minix/lib/libminixfs/cache.c @@ -75,8 +75,8 @@ static int fs_bufs_heuristic(int minbufs, fsblkcnt_t btotal, { struct vm_stats_info vsi; int bufs; - u32_t kbytes_used_fs, kbytes_total_fs, kbcache, kb_fsmax; - u32_t kbytes_remain_mem; + uint32_t kbytes_used_fs, kbytes_total_fs, kbcache, kb_fsmax; + uint32_t kbytes_remain_mem; /* set a reasonable cache size; cache at most a certain * portion of the used FS, and at most a certain %age of remaining diff --git a/minix/lib/libsys/arch/earm/frclock_util.c b/minix/lib/libsys/arch/earm/frclock_util.c index dc71be80f..58d80d231 100644 --- a/minix/lib/libsys/arch/earm/frclock_util.c +++ b/minix/lib/libsys/arch/earm/frclock_util.c @@ -16,7 +16,7 @@ static u64_t Hz; int -micro_delay(u32_t micros) +micro_delay(uint32_t micros) { struct minix_kerninfo *minix_kerninfo; u64_t start, delta, delta_end; @@ -48,28 +48,28 @@ micro_delay(u32_t micros) return 0; } -u32_t frclock_64_to_micros(u64_t tsc) +uint32_t frclock_64_to_micros(u64_t tsc) { - return (u32_t) + return (uint32_t) (tsc / (get_minix_kerninfo()->arm_frclock->hz / MICROHZ)); } void -read_frclock(u32_t *frclk) +read_frclock(uint32_t *frclk) { struct minix_kerninfo *minix_kerninfo = get_minix_kerninfo(); assert(frclk); assert(minix_kerninfo->arm_frclock); assert(minix_kerninfo->arm_frclock->tcrr); - *frclk = *(volatile u32_t *)((uint8_t *) + *frclk = *(volatile uint32_t *)((uint8_t *) minix_kerninfo->arm_frclock->tcrr); } -u32_t -delta_frclock(u32_t base, u32_t cur) +uint32_t +delta_frclock(uint32_t base, uint32_t cur) { - u32_t delta; + uint32_t delta; if (cur < base) { /* We have wrapped around, so delta is base to wrapping point @@ -86,12 +86,12 @@ delta_frclock(u32_t base, u32_t cur) void read_frclock_64(u64_t *frclk) { - read_frclock((u32_t *) frclk); + read_frclock((uint32_t *) frclk); } u64_t delta_frclock_64(u64_t base, u64_t cur) { - return (u64_t) delta_frclock((u32_t) base, (u32_t) cur); + return (u64_t) delta_frclock((uint32_t) base, (uint32_t) cur); } diff --git a/minix/lib/libsys/arch/earm/spin.c b/minix/lib/libsys/arch/earm/spin.c index e65816647..a22d2a142 100644 --- a/minix/lib/libsys/arch/earm/spin.c +++ b/minix/lib/libsys/arch/earm/spin.c @@ -28,7 +28,7 @@ enum { STATE_UPTIME /* use the clock to spin */ }; -void spin_init(spin_t *s, u32_t usecs) +void spin_init(spin_t *s, uint32_t usecs) { /* Initialize the given spin state structure, set to spin at most the * given number of microseconds. diff --git a/minix/lib/libsys/arch/earm/tsc_util.c b/minix/lib/libsys/arch/earm/tsc_util.c index 4f973e9a1..87a74819e 100644 --- a/minix/lib/libsys/arch/earm/tsc_util.c +++ b/minix/lib/libsys/arch/earm/tsc_util.c @@ -18,17 +18,17 @@ #define MICROHZ 1000000 /* number of micros per second */ #define MICROSPERTICK(h) (MICROHZ/(h)) /* number of micros per HZ tick */ -static u32_t calib_hz = 600000000; +static uint32_t calib_hz = 600000000; -u32_t tsc_64_to_micros(u64_t tsc) +uint32_t tsc_64_to_micros(u64_t tsc) { u64_t tmp; tmp = tsc / calib_hz; - return (u32_t) tmp; + return (uint32_t) tmp; } -u32_t tsc_to_micros(u32_t low, u32_t high) +uint32_t tsc_to_micros(uint32_t low, uint32_t high) { return tsc_64_to_micros(make64(low, high)); } diff --git a/minix/lib/libsys/arch/i386/get_randomness.c b/minix/lib/libsys/arch/i386/get_randomness.c index 0a7f9e9d5..541fd92e4 100644 --- a/minix/lib/libsys/arch/i386/get_randomness.c +++ b/minix/lib/libsys/arch/i386/get_randomness.c @@ -24,7 +24,7 @@ int source; source %= RANDOM_SOURCES; if (rand->bin[source].r_size >= RANDOM_ELEMENTS) return; r_next= rand->bin[source].r_next; - read_tsc((u32_t *) &tsc_high, (u32_t *) &tsc_low); + read_tsc((uint32_t *) &tsc_high, (uint32_t *) &tsc_low); rand->bin[source].r_buf[r_next] = tsc_low; if (rand->bin[source].r_size < RANDOM_ELEMENTS) { rand->bin[source].r_size ++; diff --git a/minix/lib/libsys/arch/i386/ser_putc.c b/minix/lib/libsys/arch/i386/ser_putc.c index 87b12e858..3e86e7bc9 100644 --- a/minix/lib/libsys/arch/i386/ser_putc.c +++ b/minix/lib/libsys/arch/i386/ser_putc.c @@ -10,7 +10,7 @@ *===========================================================================*/ void ser_putc(char c) { - u32_t b; + uint32_t b; int i; int lsr, thr; diff --git a/minix/lib/libsys/arch/i386/spin.c b/minix/lib/libsys/arch/i386/spin.c index 57a00018f..9a10100a2 100644 --- a/minix/lib/libsys/arch/i386/spin.c +++ b/minix/lib/libsys/arch/i386/spin.c @@ -28,7 +28,7 @@ enum { STATE_UPTIME /* use the clock to spin */ }; -void spin_init(spin_t *s, u32_t usecs) +void spin_init(spin_t *s, uint32_t usecs) { /* Initialize the given spin state structure, set to spin at most the * given number of microseconds. diff --git a/minix/lib/libsys/arch/i386/sys_in.c b/minix/lib/libsys/arch/i386/sys_in.c index 4a792ac3d..4e5f11e74 100644 --- a/minix/lib/libsys/arch/i386/sys_in.c +++ b/minix/lib/libsys/arch/i386/sys_in.c @@ -5,7 +5,7 @@ *===========================================================================*/ int sys_in(port, value, type) int port; /* port address to read from */ -u32_t *value; /* pointer where to store value */ +uint32_t *value; /* pointer where to store value */ int type; /* byte, word, long */ { message m_io; diff --git a/minix/lib/libsys/arch/i386/sys_out.c b/minix/lib/libsys/arch/i386/sys_out.c index e34d1f7fe..13103561d 100644 --- a/minix/lib/libsys/arch/i386/sys_out.c +++ b/minix/lib/libsys/arch/i386/sys_out.c @@ -5,7 +5,7 @@ *===========================================================================*/ int sys_out(port, value, type) int port; /* port address to write to */ -u32_t value; /* value to write */ +uint32_t value; /* value to write */ int type; /* byte, word, long */ { message m_io; diff --git a/minix/lib/libsys/arch/i386/tsc_util.c b/minix/lib/libsys/arch/i386/tsc_util.c index c4bc19222..0387d1809 100644 --- a/minix/lib/libsys/arch/i386/tsc_util.c +++ b/minix/lib/libsys/arch/i386/tsc_util.c @@ -25,7 +25,7 @@ panic("calibrate failed: %d", r); \ } -static u32_t calib_mhz, Hz = 0; +static uint32_t calib_mhz, Hz = 0; static int calibrated = 0; int @@ -53,7 +53,7 @@ tsc_calibrate(void) } int -micro_delay(u32_t micros) +micro_delay(uint32_t micros) { u64_t now, end; @@ -81,7 +81,7 @@ micro_delay(u32_t micros) return OK; } -u32_t tsc_64_to_micros(u64_t tsc) +uint32_t tsc_64_to_micros(u64_t tsc) { u64_t tmp; @@ -96,12 +96,12 @@ u32_t tsc_64_to_micros(u64_t tsc) } } -u32_t tsc_to_micros(u32_t low, u32_t high) +uint32_t tsc_to_micros(uint32_t low, uint32_t high) { return tsc_64_to_micros(make64(low, high)); } -u32_t tsc_get_khz(void) +uint32_t tsc_get_khz(void) { CALIBRATE; diff --git a/minix/lib/libsys/arch/i386/vbox.c b/minix/lib/libsys/arch/i386/vbox.c index f26acb996..092889414 100644 --- a/minix/lib/libsys/arch/i386/vbox.c +++ b/minix/lib/libsys/arch/i386/vbox.c @@ -86,7 +86,7 @@ int vbox_close(vbox_conn_t conn) return m.VBOX_RESULT; } -int vbox_call(vbox_conn_t conn, u32_t function, vbox_param_t *param, int count, +int vbox_call(vbox_conn_t conn, uint32_t function, vbox_param_t *param, int count, int *code) { /* Call a VirtualBox HGCM function. The caller must set up all buffer grants. @@ -153,7 +153,7 @@ int vbox_call(vbox_conn_t conn, u32_t function, vbox_param_t *param, int count, return m.VBOX_RESULT; } -void vbox_set_u32(vbox_param_t *param, u32_t value) +void vbox_set_u32(vbox_param_t *param, uint32_t value) { /* Set the given parameter to a 32-bit value. */ @@ -237,7 +237,7 @@ void vbox_put(vbox_param_t *param, int count) } } -u32_t vbox_get_u32(vbox_param_t *param) +uint32_t vbox_get_u32(vbox_param_t *param) { /* Retrieve the 32-bit value from the given parameter. */ diff --git a/minix/lib/libsys/ds.c b/minix/lib/libsys/ds.c index 7f665e9b0..2ac010f65 100644 --- a/minix/lib/libsys/ds.c +++ b/minix/lib/libsys/ds.c @@ -43,7 +43,7 @@ int ds_publish_label(const char *ds_name, endpoint_t endpoint, int flags) return do_invoke_ds(&m, DS_PUBLISH, ds_name); } -int ds_publish_u32(const char *ds_name, u32_t value, int flags) +int ds_publish_u32(const char *ds_name, uint32_t value, int flags) { message m; @@ -112,7 +112,7 @@ int ds_retrieve_label_endpt(const char *ds_name, endpoint_t *endpoint) return r; } -int ds_retrieve_u32(const char *ds_name, u32_t *value) +int ds_retrieve_u32(const char *ds_name, uint32_t *value) { message m; int r; diff --git a/minix/lib/libsys/pci_attr_r32.c b/minix/lib/libsys/pci_attr_r32.c index 40e969735..4dd421e7c 100644 --- a/minix/lib/libsys/pci_attr_r32.c +++ b/minix/lib/libsys/pci_attr_r32.c @@ -9,7 +9,7 @@ pci_attr_r32.c /*===========================================================================* * pci_attr_r32 * *===========================================================================*/ -u32_t pci_attr_r32(devind, port) +uint32_t pci_attr_r32(devind, port) int devind; int port; { diff --git a/minix/lib/libsys/pci_attr_w32.c b/minix/lib/libsys/pci_attr_w32.c index df8bfba94..e70b1c978 100644 --- a/minix/lib/libsys/pci_attr_w32.c +++ b/minix/lib/libsys/pci_attr_w32.c @@ -9,7 +9,7 @@ pci_attr_w32.c /*===========================================================================* * pci_attr_w32 * *===========================================================================*/ -void pci_attr_w32(int devind, int port, u32_t value) +void pci_attr_w32(int devind, int port, uint32_t value) { int r; message m; diff --git a/minix/lib/libsys/pci_get_bar.c b/minix/lib/libsys/pci_get_bar.c index 7fff04341..f2d3c4f46 100644 --- a/minix/lib/libsys/pci_get_bar.c +++ b/minix/lib/libsys/pci_get_bar.c @@ -12,8 +12,8 @@ pci_get_bar.c int pci_get_bar(devind, port, base, size, ioflag) int devind; int port; -u32_t *base; -u32_t *size; +uint32_t *base; +uint32_t *size; int *ioflag; { int r; diff --git a/minix/lib/libsys/sef.c b/minix/lib/libsys/sef.c index b19dd539a..2ac18f8d3 100644 --- a/minix/lib/libsys/sef.c +++ b/minix/lib/libsys/sef.c @@ -29,7 +29,7 @@ EXTERN __attribute__((weak)) int __vm_init_fresh; #define SEF_DEBUG_HEADER_MAXLEN 50 static int sef_debug_init = 0; static time_t sef_debug_boottime = 0; -static u32_t sef_debug_system_hz = 0; +static uint32_t sef_debug_system_hz = 0; static time_t sef_debug_time_sec = 0; static time_t sef_debug_time_us = 0; static char sef_debug_header_buff[SEF_DEBUG_HEADER_MAXLEN]; diff --git a/minix/lib/libsys/sqrt_approx.c b/minix/lib/libsys/sqrt_approx.c index 07eeaec4f..7689b4214 100644 --- a/minix/lib/libsys/sqrt_approx.c +++ b/minix/lib/libsys/sqrt_approx.c @@ -1,10 +1,10 @@ #include -u32_t sqrt_approx(u32_t in) +uint32_t sqrt_approx(uint32_t in) { int b, v = 0; for(b = (sizeof(in)*8)/2-1; b >= 0; b--) { - u32_t n = v | (1UL << b); + uint32_t n = v | (1UL << b); if(n*n <= in) v = n; } diff --git a/minix/lib/libsys/sys_fork.c b/minix/lib/libsys/sys_fork.c index 4eab41fa9..4ccdde2f9 100644 --- a/minix/lib/libsys/sys_fork.c +++ b/minix/lib/libsys/sys_fork.c @@ -4,7 +4,7 @@ int sys_fork(parent, child, child_endpoint, flags, msgaddr) endpoint_t parent; /* process doing the fork */ endpoint_t child; /* which proc has been created by the fork */ endpoint_t *child_endpoint; -u32_t flags; +uint32_t flags; vir_bytes *msgaddr; { /* A process has forked. Tell the kernel. */ diff --git a/minix/lib/libsys/sys_hz.c b/minix/lib/libsys/sys_hz.c index 1f2c77658..ffd0df12c 100644 --- a/minix/lib/libsys/sys_hz.c +++ b/minix/lib/libsys/sys_hz.c @@ -8,9 +8,9 @@ #include "sysutil.h" -static u32_t Hz; +static uint32_t Hz; -u32_t +uint32_t sys_hz(void) { if(Hz <= 0) { @@ -26,12 +26,12 @@ sys_hz(void) return Hz; } -u32_t -micros_to_ticks(u32_t micros) +uint32_t +micros_to_ticks(uint32_t micros) { - u32_t ticks; + uint32_t ticks; - ticks = (u32_t)(((u64_t)micros * sys_hz()) / 1000000); + ticks = (uint32_t)(((u64_t)micros * sys_hz()) / 1000000); if(ticks < 1) ticks = 1; return ticks; diff --git a/minix/lib/libsys/sys_padconf.c b/minix/lib/libsys/sys_padconf.c index fbf8795b5..c95f59e84 100644 --- a/minix/lib/libsys/sys_padconf.c +++ b/minix/lib/libsys/sys_padconf.c @@ -2,7 +2,7 @@ #include "syslib.h" -int sys_padconf(u32_t padconf, u32_t mask, u32_t value) +int sys_padconf(uint32_t padconf, uint32_t mask, uint32_t value) { message m; diff --git a/minix/lib/libsys/sys_vmctl.c b/minix/lib/libsys/sys_vmctl.c index f7472ece0..ffd0047da 100644 --- a/minix/lib/libsys/sys_vmctl.c +++ b/minix/lib/libsys/sys_vmctl.c @@ -1,6 +1,6 @@ #include "syslib.h" -int sys_vmctl(endpoint_t who, int param, u32_t value) +int sys_vmctl(endpoint_t who, int param, uint32_t value) { message m; int r; @@ -13,7 +13,7 @@ int sys_vmctl(endpoint_t who, int param, u32_t value) } /* Get page directory base register */ -int sys_vmctl_get_pdbr(endpoint_t who, u32_t *pdbr) +int sys_vmctl_get_pdbr(endpoint_t who, uint32_t *pdbr) { message m; int r; diff --git a/minix/lib/libsys/vm_cache.c b/minix/lib/libsys/vm_cache.c index c91e4e396..0e7ed373c 100644 --- a/minix/lib/libsys/vm_cache.c +++ b/minix/lib/libsys/vm_cache.c @@ -13,7 +13,7 @@ #include static int vm_cachecall(message *m, int call, void *addr, dev_t dev, - off_t dev_offset, ino_t ino, off_t ino_offset, u32_t *flags, + off_t dev_offset, ino_t ino, off_t ino_offset, uint32_t *flags, int blocksize, int setflags) { if(blocksize % PAGE_SIZE) @@ -45,7 +45,7 @@ static int vm_cachecall(message *m, int call, void *addr, dev_t dev, } void *vm_map_cacheblock(dev_t dev, off_t dev_offset, - ino_t ino, off_t ino_offset, u32_t *flags, int blocksize) + ino_t ino, off_t ino_offset, uint32_t *flags, int blocksize) { message m; @@ -57,7 +57,7 @@ void *vm_map_cacheblock(dev_t dev, off_t dev_offset, } int vm_set_cacheblock(void *block, dev_t dev, off_t dev_offset, - ino_t ino, off_t ino_offset, u32_t *flags, int blocksize, int setflags) + ino_t ino, off_t ino_offset, uint32_t *flags, int blocksize, int setflags) { message m; diff --git a/minix/lib/libvboxfs/info.c b/minix/lib/libvboxfs/info.c index 87fa5a9ab..74c44e813 100644 --- a/minix/lib/libvboxfs/info.c +++ b/minix/lib/libvboxfs/info.c @@ -6,7 +6,7 @@ * Get or set file information. */ int -vboxfs_getset_info(vboxfs_handle_t handle, u32_t flags, void *data, +vboxfs_getset_info(vboxfs_handle_t handle, uint32_t flags, void *data, size_t size) { vbox_param_t param[5]; diff --git a/minix/lib/libvboxfs/link.c b/minix/lib/libvboxfs/link.c index 7d61dac8b..83a8a8612 100644 --- a/minix/lib/libvboxfs/link.c +++ b/minix/lib/libvboxfs/link.c @@ -72,7 +72,7 @@ rename_file(const char *opath, const char *npath, int dir) { vbox_param_t param[4]; vboxfs_path_t opathbuf, npathbuf; - u32_t flags; + uint32_t flags; int r; if ((r = vboxfs_set_path(&opathbuf, opath)) != OK) diff --git a/minix/lib/libvboxfs/proto.h b/minix/lib/libvboxfs/proto.h index bdbbec11e..344db64f4 100644 --- a/minix/lib/libvboxfs/proto.h +++ b/minix/lib/libvboxfs/proto.h @@ -27,7 +27,7 @@ int vboxfs_open_file(const char *path, int flags, int mode, void vboxfs_close_file(vboxfs_handle_t handle); /* info.c */ -int vboxfs_getset_info(vboxfs_handle_t handle, u32_t flags, void *data, +int vboxfs_getset_info(vboxfs_handle_t handle, uint32_t flags, void *data, size_t size); int vboxfs_query_vol(const char *path, vboxfs_volinfo_t *volinfo); int vboxfs_queryvol(const char *path, u64_t *free, u64_t *total); diff --git a/minix/lib/libvboxfs/vboxfs.h b/minix/lib/libvboxfs/vboxfs.h index acaa056d6..6bf2283e8 100644 --- a/minix/lib/libvboxfs/vboxfs.h +++ b/minix/lib/libvboxfs/vboxfs.h @@ -17,7 +17,7 @@ #define VBOXFS_INVALID_HANDLE ((vboxfs_handle_t) ~0LL) -typedef u32_t vboxfs_root_t; +typedef uint32_t vboxfs_root_t; typedef u64_t vboxfs_handle_t; typedef struct { @@ -38,18 +38,18 @@ typedef struct { #define VBOXFS_OBJATTR_ADD_EATTR 3 /* extended attributes */ typedef struct { - u32_t mode; - u32_t add; + uint32_t mode; + uint32_t add; union { struct { - u32_t uid; - u32_t gid; - u32_t nlinks; - u32_t dev; + uint32_t uid; + uint32_t gid; + uint32_t nlinks; + uint32_t dev; u64_t inode; - u32_t flags; - u32_t gen; - u32_t rdev; + uint32_t flags; + uint32_t gen; + uint32_t rdev; }; struct { u64_t easize; @@ -87,8 +87,8 @@ typedef struct { typedef struct { vboxfs_handle_t handle; - u32_t result; - u32_t flags; + uint32_t result; + uint32_t flags; vboxfs_objinfo_t info; } vboxfs_crinfo_t; @@ -115,7 +115,7 @@ typedef struct { #define VBOXFS_RENAME_REPLACE 0x04 /* replace target if it exists */ typedef struct { - u32_t namemax; + uint32_t namemax; uint8_t remote; uint8_t casesens; uint8_t readonly; @@ -128,9 +128,9 @@ typedef struct { typedef struct { u64_t total; u64_t free; - u32_t blocksize; - u32_t sectorsize; - u32_t serial; + uint32_t blocksize; + uint32_t sectorsize; + uint32_t serial; vboxfs_fsprops_t props; } vboxfs_volinfo_t; diff --git a/minix/lib/libvirtio/virtio.c b/minix/lib/libvirtio/virtio.c index 8007f2111..da0044136 100644 --- a/minix/lib/libvirtio/virtio.c +++ b/minix/lib/libvirtio/virtio.c @@ -55,10 +55,10 @@ struct virtio_queue { void *vaddr; /* virtual addr of ring */ phys_bytes paddr; /* physical addr of ring */ - u32_t page; /* physical guest page */ + uint32_t page; /* physical guest page */ uint16_t num; /* number of descriptors */ - u32_t ring_size; /* size of ring in bytes */ + uint32_t ring_size; /* size of ring in bytes */ struct vring vring; uint16_t free_num; /* free descriptors */ @@ -187,7 +187,7 @@ err: static int init_device(int devind, struct virtio_device *dev) { - u32_t base, size; + uint32_t base, size; int iof, r; pci_reserve(devind); @@ -222,7 +222,7 @@ init_device(int devind, struct virtio_device *dev) static int exchange_features(struct virtio_device *dev) { - u32_t guest_features = 0, host_features = 0; + uint32_t guest_features = 0, host_features = 0; struct virtio_feature *f; host_features = virtio_read32(dev, VIRTIO_HOST_F_OFF); @@ -834,7 +834,7 @@ u##xx##_t \ virtio_read##xx(struct virtio_device *dev, i32_t off) \ { \ int r; \ - u32_t ret; \ + uint32_t ret; \ if ((r = sys_in##suff(dev->port + off, &ret)) != OK) \ panic("%s: Read failed %d %d r=%d", dev->name, \ dev->port, \ @@ -871,7 +871,7 @@ u##xx##_t \ virtio_sread##xx(struct virtio_device *dev, i32_t off) \ { \ int r; \ - u32_t ret; \ + uint32_t ret; \ off += VIRTIO_DEV_SPECIFIC_OFF; \ \ if (dev->msi) \ diff --git a/minix/lib/libvirtio/virtio_ring.h b/minix/lib/libvirtio/virtio_ring.h index 2b7216a7e..0f603ce0f 100644 --- a/minix/lib/libvirtio/virtio_ring.h +++ b/minix/lib/libvirtio/virtio_ring.h @@ -62,7 +62,7 @@ struct vring_desc { /* Address (guest-physical). */ u64_t addr; /* Length. */ - u32_t len; + uint32_t len; /* The flags as indicated above. */ uint16_t flags; /* We chain unused descriptors via this, too */ @@ -78,9 +78,9 @@ struct vring_avail { /* u32 is used here for ids for padding reasons. */ struct vring_used_elem { /* Index of start of used descriptor chain. */ - u32_t id; + uint32_t id; /* Total length of the descriptor chain which was used (written to) */ - u32_t len; + uint32_t len; }; struct vring_used { diff --git a/minix/man/man2/svrctl.2 b/minix/man/man2/svrctl.2 index 9463bcf4f..c7a127e5e 100644 --- a/minix/man/man2/svrctl.2 +++ b/minix/man/man2/svrctl.2 @@ -9,7 +9,7 @@ svrctl \- special server control functions .ft B #include -int svrctl(u32_t \fIrequest\fP, void *\fIdata\fP); +int svrctl(uint32_t \fIrequest\fP, void *\fIdata\fP); .ft R .fi .SH DESCRIPTION diff --git a/minix/servers/ds/store.c b/minix/servers/ds/store.c index f9d2407ac..27c9e528d 100644 --- a/minix/servers/ds/store.c +++ b/minix/servers/ds/store.c @@ -238,7 +238,7 @@ static int map_service(const struct rprocpub *rpub) /* Set attributes. */ strcpy(dsp->key, rpub->label); - dsp->u.u32 = (u32_t) rpub->endpoint; + dsp->u.u32 = (uint32_t) rpub->endpoint; strcpy(dsp->owner, "rs"); dsp->flags = DSF_IN_USE | DSF_TYPE_LABEL; diff --git a/minix/servers/input/input.c b/minix/servers/input/input.c index 089e779b9..503834b8d 100644 --- a/minix/servers/input/input.c +++ b/minix/servers/input/input.c @@ -560,7 +560,7 @@ input_check(void) { char key[DS_MAX_KEYLEN], *label; const char *driver_prefix = "drv.inp."; - u32_t value; + uint32_t value; size_t len; int i, r, type; endpoint_t owner; diff --git a/minix/servers/mib/vm.c b/minix/servers/mib/vm.c index 5a9844fcd..691e444ad 100644 --- a/minix/servers/mib/vm.c +++ b/minix/servers/mib/vm.c @@ -16,7 +16,7 @@ mib_vm_loadavg(struct mib_call * call __unused, struct loadavg loadavg; struct loadinfo loadinfo; unsigned long proc_load; - u32_t ticks_per_slot, ticks; + uint32_t ticks_per_slot, ticks; unsigned int p; int unfilled_ticks; int h, slots, latest, slot; diff --git a/minix/servers/pm/glo.h b/minix/servers/pm/glo.h index 39720a573..1a268d270 100644 --- a/minix/servers/pm/glo.h +++ b/minix/servers/pm/glo.h @@ -22,7 +22,7 @@ EXTERN sigset_t core_sset; /* which signals cause core images */ EXTERN sigset_t ign_sset; /* which signals are by default ignored */ EXTERN sigset_t noign_sset; /* which signals cannot be ignored */ -EXTERN u32_t system_hz; /* System clock frequency. */ +EXTERN uint32_t system_hz; /* System clock frequency. */ EXTERN int abort_flag; EXTERN struct machine machine; /* machine info */ diff --git a/minix/servers/vfs/glo.h b/minix/servers/vfs/glo.h index 6be3b66e9..030c7908b 100644 --- a/minix/servers/vfs/glo.h +++ b/minix/servers/vfs/glo.h @@ -19,7 +19,7 @@ EXTERN int verbose; EXTERN dev_t ROOT_DEV; /* device number of the root device */ EXTERN int ROOT_FS_E; /* kernel endpoint of the root FS proc */ -EXTERN u32_t system_hz; /* system clock frequency. */ +EXTERN uint32_t system_hz; /* system clock frequency. */ /* The parameters of the call are kept here. */ EXTERN message m_in; /* the input message itself */ diff --git a/minix/servers/vfs/misc.c b/minix/servers/vfs/misc.c index b9336f3cc..e179a8a0b 100644 --- a/minix/servers/vfs/misc.c +++ b/minix/servers/vfs/misc.c @@ -386,10 +386,10 @@ int do_vm_call(void) */ int req = job_m_in.VFS_VMCALL_REQ; int req_fd = job_m_in.VFS_VMCALL_FD; - u32_t req_id = job_m_in.VFS_VMCALL_REQID; + uint32_t req_id = job_m_in.VFS_VMCALL_REQID; endpoint_t ep = job_m_in.VFS_VMCALL_ENDPOINT; u64_t offset = job_m_in.VFS_VMCALL_OFFSET; - u32_t length = job_m_in.VFS_VMCALL_LENGTH; + uint32_t length = job_m_in.VFS_VMCALL_LENGTH; int result = OK; int slot; struct fproc *rfp; @@ -945,7 +945,7 @@ ds_event(void) char *blkdrv_prefix = "drv.blk."; char *chrdrv_prefix = "drv.chr."; char *sckdrv_prefix = "drv.sck."; - u32_t value; + uint32_t value; int type, ftype, r; endpoint_t owner_endpoint; diff --git a/minix/servers/vm/alloc.c b/minix/servers/vm/alloc.c index 3ba55bdeb..1039c166d 100644 --- a/minix/servers/vm/alloc.c +++ b/minix/servers/vm/alloc.c @@ -68,7 +68,7 @@ static struct reserved_pages { phys_bytes phys; void *vir; } slots[MAXRESERVEDPAGES]; - u32_t magic; + uint32_t magic; } reservedqueues[MAXRESERVEDQUEUES], *first_reserved_inuse = NULL; int missing_spares = 0; @@ -239,7 +239,7 @@ void alloc_cycle(void) /*===========================================================================* * alloc_mem * *===========================================================================*/ -phys_clicks alloc_mem(phys_clicks clicks, u32_t memflags) +phys_clicks alloc_mem(phys_clicks clicks, uint32_t memflags) { /* Allocate a block of memory from the free list using first fit. The block * consists of a sequence of contiguous bytes, whose length in clicks is @@ -508,7 +508,7 @@ void usedpages_reset(void) *===========================================================================*/ int usedpages_add_f(phys_bytes addr, phys_bytes len, const char *file, int line) { - u32_t pagestart, pages; + uint32_t pagestart, pages; if(!incheck) return OK; diff --git a/minix/servers/vm/cache.c b/minix/servers/vm/cache.c index ecd7529ee..67a93407c 100644 --- a/minix/servers/vm/cache.c +++ b/minix/servers/vm/cache.c @@ -24,7 +24,7 @@ static struct cached_page *cache_hash_bydev[HASHSIZE]; static struct cached_page *cache_hash_byino[HASHSIZE]; static struct cached_page *lru_oldest = NULL, *lru_newest = NULL; -static u32_t cached_pages = 0; +static uint32_t cached_pages = 0; static void lru_rm(struct cached_page *hb) { @@ -73,9 +73,9 @@ void cache_lru_touch(struct cached_page *hb) lru_add(hb); } -static __inline u32_t makehash(u32_t p1, u64_t p2) +static __inline uint32_t makehash(uint32_t p1, u64_t p2) { - u32_t offlo = ex64lo(p2), offhi = ex64hi(p2), + uint32_t offlo = ex64lo(p2), offhi = ex64hi(p2), v = 0x12345678; hash_mix(p1, offlo, offhi); hash_final(offlo, offhi, v); diff --git a/minix/servers/vm/mem_anon.c b/minix/servers/vm/mem_anon.c index 172e30ed9..8d26cb469 100644 --- a/minix/servers/vm/mem_anon.c +++ b/minix/servers/vm/mem_anon.c @@ -27,7 +27,7 @@ static int anon_pagefault(struct vmproc *vmp, struct vir_region *region, static int anon_sanitycheck(struct phys_region *pr, const char *file, int line); static int anon_writable(struct phys_region *pr); static int anon_resize(struct vmproc *vmp, struct vir_region *vr, vir_bytes l); -static u32_t anon_regionid(struct vir_region *region); +static uint32_t anon_regionid(struct vir_region *region); static int anon_refcount(struct vir_region *vr); static int anon_pt_flags(struct vir_region *vr); @@ -66,7 +66,7 @@ static int anon_pagefault(struct vmproc *vmp, struct vir_region *region, int len, int *io) { phys_bytes new_page, new_page_cl; - u32_t allocflags; + uint32_t allocflags; allocflags = vrallocflags(region->flags); @@ -129,7 +129,7 @@ static int anon_resize(struct vmproc *vmp, struct vir_region *vr, vir_bytes l) return OK; } -static u32_t anon_regionid(struct vir_region *region) +static uint32_t anon_regionid(struct vir_region *region) { return region->id; } diff --git a/minix/servers/vm/mem_anon_contig.c b/minix/servers/vm/mem_anon_contig.c index 76fb3dc52..a6ca2fd86 100644 --- a/minix/servers/vm/mem_anon_contig.c +++ b/minix/servers/vm/mem_anon_contig.c @@ -51,7 +51,7 @@ static int anon_contig_pagefault(struct vmproc *vmp, struct vir_region *region, static int anon_contig_new(struct vir_region *region) { - u32_t allocflags; + uint32_t allocflags; phys_bytes new_pages, new_page_cl, cur_ph; phys_bytes p, pages; diff --git a/minix/servers/vm/mem_file.c b/minix/servers/vm/mem_file.c index 5632846b7..9ad3336aa 100644 --- a/minix/servers/vm/mem_file.c +++ b/minix/servers/vm/mem_file.c @@ -85,7 +85,7 @@ static int mappedfile_pagefault(struct vmproc *vmp, struct vir_region *region, struct phys_region *ph, int write, vfs_callback_t cb, void *state, int statelen, int *io) { - u32_t allocflags; + uint32_t allocflags; int procfd = region->param.file.fdref->fd; allocflags = vrallocflags(region->flags); diff --git a/minix/servers/vm/mem_shared.c b/minix/servers/vm/mem_shared.c index 93e791dc4..3e963a4e4 100644 --- a/minix/servers/vm/mem_shared.c +++ b/minix/servers/vm/mem_shared.c @@ -20,7 +20,7 @@ static int shared_pagefault(struct vmproc *vmp, struct vir_region *region, static int shared_sanitycheck(struct phys_region *pr, const char *file, int line); static int shared_writable(struct phys_region *pr); static void shared_delete(struct vir_region *region); -static u32_t shared_regionid(struct vir_region *region); +static uint32_t shared_regionid(struct vir_region *region); static int shared_copy(struct vir_region *vr, struct vir_region *newvr); static int shared_refcount(struct vir_region *vr); static int shared_pt_flags(struct vir_region *vr); @@ -96,7 +96,7 @@ static int getsrc(struct vir_region *region, return OK; } -static u32_t shared_regionid(struct vir_region *vr) +static uint32_t shared_regionid(struct vir_region *vr) { struct vir_region *src_region; struct vmproc *src_vmp; diff --git a/minix/servers/vm/memtype.h b/minix/servers/vm/memtype.h index a7edaa3a5..cc5f06e40 100644 --- a/minix/servers/vm/memtype.h +++ b/minix/servers/vm/memtype.h @@ -25,7 +25,7 @@ typedef struct mem_type { int (*ev_sanitycheck)(struct phys_region *pr, const char *file, int line); int (*ev_copy)(struct vir_region *vr, struct vir_region *newvr); int (*ev_lowshrink)(struct vir_region *vr, vir_bytes len); - u32_t (*regionid)(struct vir_region *vr); + uint32_t (*regionid)(struct vir_region *vr); int (*refcount)(struct vir_region *vr); int (*pt_flags)(struct vir_region *vr); /* page table flags */ } mem_type_t; diff --git a/minix/servers/vm/mmap.c b/minix/servers/vm/mmap.c index c9449d092..9365bd4b1 100644 --- a/minix/servers/vm/mmap.c +++ b/minix/servers/vm/mmap.c @@ -34,10 +34,10 @@ static struct vir_region *mmap_region(struct vmproc *vmp, vir_bytes addr, - u32_t vmm_flags, size_t len, u32_t vrflags, + uint32_t vmm_flags, size_t len, uint32_t vrflags, mem_type_t *mt, int execpriv) { - u32_t mfflags = 0; + uint32_t mfflags = 0; struct vir_region *vr = NULL; if(vmm_flags & MAP_LOWER16M) vrflags |= VR_LOWER16MB; @@ -90,7 +90,7 @@ static int mmap_file(struct vmproc *vmp, struct vir_region *vr; u64_t page_offset; int result = OK; - u32_t vrflags = 0; + uint32_t vrflags = 0; if(writable) vrflags |= VR_WRITABLE; @@ -368,7 +368,7 @@ int do_remap(message *m) int dn, sn; vir_bytes da, sa; size_t size; - u32_t flags; + uint32_t flags; struct vir_region *src_region, *vr; struct vmproc *dvmp, *svmp; int r; diff --git a/minix/servers/vm/pagefaults.c b/minix/servers/vm/pagefaults.c index ff396415f..f843dc75d 100644 --- a/minix/servers/vm/pagefaults.c +++ b/minix/servers/vm/pagefaults.c @@ -33,7 +33,7 @@ struct pf_state { endpoint_t ep; vir_bytes vaddr; - u32_t err; + uint32_t err; }; struct hm_state { @@ -56,7 +56,7 @@ static void handle_memory_final(struct hm_state *state, int result); /*===========================================================================* * pf_errstr * *===========================================================================*/ -char *pf_errstr(u32_t err) +char *pf_errstr(uint32_t err) { static char buf[100]; @@ -73,7 +73,7 @@ static void pf_cont(struct vmproc *vmp, message *m, void *arg, void *statearg); static void handle_memory_continue(struct vmproc *vmp, message *m, void *arg, void *statearg); -static void handle_pagefault(endpoint_t ep, vir_bytes addr, u32_t err, int retry) +static void handle_pagefault(endpoint_t ep, vir_bytes addr, uint32_t err, int retry) { struct vmproc *vmp; int s, result; diff --git a/minix/servers/vm/pagetable.c b/minix/servers/vm/pagetable.c index f7f6101b2..511b2cb20 100644 --- a/minix/servers/vm/pagetable.c +++ b/minix/servers/vm/pagetable.c @@ -37,9 +37,9 @@ static int vm_self_pages; #define MAX_PAGEDIR_PDES 5 static struct pdm { int pdeno; - u32_t val; + uint32_t val; phys_bytes phys; - u32_t *page_directories; + uint32_t *page_directories; } pagedir_mappings[MAX_PAGEDIR_PDES]; static multiboot_module_t *kern_mb_mod = NULL; @@ -70,7 +70,7 @@ struct vmproc *vmprocess = &vmproc[VM_PROC_NR]; #endif #ifdef __i386__ -static u32_t global_bit = 0; +static uint32_t global_bit = 0; #endif #define SPAREPAGEDIRS 1 @@ -152,15 +152,15 @@ void pt_sanitycheck(pt_t *pt, const char *file, int line) /*===========================================================================* * findhole * *===========================================================================*/ -static u32_t findhole(int pages) +static uint32_t findhole(int pages) { /* Find a space in the virtual address space of VM. */ - u32_t curv; + uint32_t curv; int pde = 0, try_restart; static void *lastv = 0; pt_t *pt = &vmprocess->vm_pt; vir_bytes vmin, vmax; - u32_t holev = NO_MEM; + uint32_t holev = NO_MEM; int holesize = -1; vmin = VM_OWN_MMAPBASE; @@ -173,7 +173,7 @@ static u32_t findhole(int pages) assert((vmax % VM_PAGE_SIZE) == 0); assert(pages > 0); - curv = (u32_t) lastv; + curv = (uint32_t) lastv; if(curv < vmin || curv >= vmax) curv = vmin; @@ -336,7 +336,7 @@ void *vm_allocpages(phys_bytes *phys, int reason, int pages) phys_bytes newpage; static int level = 0; void *ret; - u32_t mem_flags = 0; + uint32_t mem_flags = 0; assert(reason >= 0 && reason < VMP_CATEGORIES); @@ -405,7 +405,7 @@ void vm_pagelock(void *vir, int lockflag) /* Mark a page allocated by vm_allocpage() unwritable, i.e. only for VM. */ vir_bytes m = (vir_bytes) vir; int r; - u32_t flags = ARCH_VM_PTE_PRESENT | ARCH_VM_PTE_USER; + uint32_t flags = ARCH_VM_PTE_PRESENT | ARCH_VM_PTE_USER; pt_t *pt; pt = &vmprocess->vm_pt; @@ -491,12 +491,12 @@ int vm_addrok(void *vir, int writeflag) /*===========================================================================* * pt_ptalloc * *===========================================================================*/ -static int pt_ptalloc(pt_t *pt, int pde, u32_t flags) +static int pt_ptalloc(pt_t *pt, int pde, uint32_t flags) { /* Allocate a page table and write its address into the page directory. */ int i; phys_bytes pt_phys; - u32_t *p; + uint32_t *p; /* Argument must make sense. */ assert(pde >= 0 && pde < ARCH_VM_DIR_ENTRIES); @@ -543,7 +543,7 @@ static int pt_ptalloc(pt_t *pt, int pde, u32_t flags) * pt_ptalloc_in_range * *===========================================================================*/ int pt_ptalloc_in_range(pt_t *pt, vir_bytes start, vir_bytes end, - u32_t flags, int verify) + uint32_t flags, int verify) { /* Allocate all the page tables in the range specified. */ int pde, first_pde, last_pde; @@ -584,7 +584,7 @@ int pt_ptalloc_in_range(pt_t *pt, vir_bytes start, vir_bytes end, return OK; } -static const char *ptestr(u32_t pte) +static const char *ptestr(uint32_t pte) { #define FLAG(constant, name) { \ if(pte & (constant)) { strcat(str, name); strcat(str, " "); } \ @@ -760,7 +760,7 @@ void pt_clearmapcache(void) int pt_writable(struct vmproc *vmp, vir_bytes v) { - u32_t entry; + uint32_t entry; pt_t *pt = &vmp->vm_pt; assert(!(v % VM_PAGE_SIZE)); int pde = ARCH_VM_PDE(v); @@ -786,8 +786,8 @@ int pt_writemap(struct vmproc * vmp, vir_bytes v, phys_bytes physaddr, size_t bytes, - u32_t flags, - u32_t writemapflags) + uint32_t flags, + uint32_t writemapflags) { /* Write mapping into page table. Allocate a new page table if necessary. */ /* Page directory and table entries for this virtual address. */ @@ -836,7 +836,7 @@ int pt_writemap(struct vmproc * vmp, /* Now write in them. */ for(p = 0; p < pages; p++) { - u32_t entry; + uint32_t entry; int pde = ARCH_VM_PDE(v); int pte = ARCH_VM_PTE(v); @@ -875,7 +875,7 @@ int pt_writemap(struct vmproc * vmp, #endif if(verify) { - u32_t maskedentry; + uint32_t maskedentry; maskedentry = pt->pt_pt[pde][pte]; #if defined(__i386__) maskedentry &= ~(I386_VM_ACC|I386_VM_DIRTY); @@ -1008,7 +1008,7 @@ int pt_new(pt_t *pt) return ENOMEM; } - assert(!((u32_t)pt->pt_dir_phys % ARCH_PAGEDIR_SIZE)); + assert(!((uint32_t)pt->pt_dir_phys % ARCH_PAGEDIR_SIZE)); for(i = 0; i < ARCH_VM_DIR_ENTRIES; i++) { pt->pt_dir[i] = 0; /* invalid entry (PRESENT bit = 0) */ @@ -1094,13 +1094,13 @@ void pt_init(void) #if defined(__arm__) vir_bytes sparepagedirs_mem; #endif - static u32_t currentpagedir[ARCH_VM_DIR_ENTRIES]; + static uint32_t currentpagedir[ARCH_VM_DIR_ENTRIES]; int m = kernel_boot_info.kern_mod; #if defined(__i386__) int global_bit_ok = 0; - u32_t mypdbr; /* Page Directory Base Register (cr3) value */ + uint32_t mypdbr; /* Page Directory Base Register (cr3) value */ #elif defined(__arm__) - u32_t myttbr; + uint32_t myttbr; #endif /* Find what the physical location of the kernel is. */ @@ -1176,7 +1176,7 @@ void pt_init(void) int kernmap_pde; phys_bytes addr, len; int flags, pindex = 0; - u32_t offset = 0; + uint32_t offset = 0; kernmap_pde = freepde(); offset = kernmap_pde * ARCH_BIG_PAGE_SIZE; @@ -1276,7 +1276,7 @@ void pt_init(void) * mapping bits; just map in VM. */ for(p = 0; p < ARCH_VM_DIR_ENTRIES; p++) { - u32_t entry = currentpagedir[p]; + uint32_t entry = currentpagedir[p]; phys_bytes ptaddr_kern, ptaddr_us; /* BIGPAGEs are kernel mapping (do ourselves) or boot @@ -1358,7 +1358,7 @@ void pt_init(void) int pt_bind(pt_t *pt, struct vmproc *who) { int procslot, pdeslot; - u32_t phys; + uint32_t phys; void *pdes; int pagedir_pde; int slots_per_pde; diff --git a/minix/servers/vm/pb.c b/minix/servers/vm/pb.c index 34491922c..15759713f 100644 --- a/minix/servers/vm/pb.c +++ b/minix/servers/vm/pb.c @@ -139,7 +139,7 @@ int mem_cow(struct vir_region *region, struct phys_block *pb; if(new_page == MAP_NONE) { - u32_t allocflags; + uint32_t allocflags; allocflags = vrallocflags(region->flags); if((new_page_cl = alloc_mem(1, allocflags)) == NO_MEM) diff --git a/minix/servers/vm/proto.h b/minix/servers/vm/proto.h index 86d1d1fc0..61492d1f2 100644 --- a/minix/servers/vm/proto.h +++ b/minix/servers/vm/proto.h @@ -29,7 +29,7 @@ int reservedqueue_alloc(void *, phys_bytes *, void **); void reservedqueue_add(void *, void *, phys_bytes); void alloc_cycle(void); void mem_sanitycheck(const char *file, int line); -phys_clicks alloc_mem(phys_clicks clicks, u32_t flags); +phys_clicks alloc_mem(phys_clicks clicks, uint32_t flags); void memstats(int *nodes, int *pages, int *largest); void printmemstats(void); void usedpages_reset(void); @@ -86,7 +86,7 @@ int do_vfs_mmap(message *m); /* pagefaults.c */ void do_pagefaults(message *m); void do_memory(void); -char *pf_errstr(u32_t err); +char *pf_errstr(uint32_t err); int handle_memory_start(struct vmproc *vmp, vir_bytes mem, vir_bytes len, int wrflag, endpoint_t caller, endpoint_t requestor, int transid, int vfs_avail); @@ -103,11 +103,11 @@ void pt_free(pt_t *pt); int pt_map_in_range(struct vmproc *src_vmp, struct vmproc *dst_vmp, vir_bytes start, vir_bytes end); int pt_ptmap(struct vmproc *src_vmp, struct vmproc *dst_vmp); -int pt_ptalloc_in_range(pt_t *pt, vir_bytes start, vir_bytes end, u32_t +int pt_ptalloc_in_range(pt_t *pt, vir_bytes start, vir_bytes end, uint32_t flags, int verify); void pt_clearmapcache(void); int pt_writemap(struct vmproc * vmp, pt_t *pt, vir_bytes v, phys_bytes - physaddr, size_t bytes, u32_t flags, u32_t writemapflags); + physaddr, size_t bytes, uint32_t flags, uint32_t writemapflags); int pt_checkrange(pt_t *pt, vir_bytes v, size_t bytes, int write); int pt_bind(pt_t *pt, struct vmproc *who); void *vm_mappages(phys_bytes p, int pages); @@ -142,7 +142,7 @@ int slabsane_f(const char *file, int line, void *mem, int bytes); /* region.c */ void map_region_init(void); struct vir_region * map_page_region(struct vmproc *vmp, vir_bytes min, - vir_bytes max, vir_bytes length, u32_t flags, int mapflags, + vir_bytes max, vir_bytes length, uint32_t flags, int mapflags, mem_type_t *memtype); struct vir_region * map_proc_kernel(struct vmproc *dst); int map_region_extend(struct vmproc *vmp, struct vir_region *vr, @@ -168,7 +168,7 @@ void map_printmap(struct vmproc *vmp); int map_writept(struct vmproc *vmp); void printregionstats(struct vmproc *vmp); void map_setparent(struct vmproc *vmp); -u32_t vrallocflags(u32_t flags); +uint32_t vrallocflags(uint32_t flags); int map_free(struct vir_region *region); struct phys_region *physblock_get(struct vir_region *region, vir_bytes offset); void physblock_set(struct vir_region *region, vir_bytes offset, @@ -176,7 +176,7 @@ void physblock_set(struct vir_region *region, vir_bytes offset, int map_ph_writept(struct vmproc *vmp, struct vir_region *vr, struct phys_region *pr); -struct vir_region* map_region_lookup_type(struct vmproc *vmp, u32_t flags); +struct vir_region* map_region_lookup_type(struct vmproc *vmp, uint32_t flags); int map_get_phys(struct vmproc *vmp, vir_bytes addr, phys_bytes *r); int map_get_ref(struct vmproc *vmp, vir_bytes addr, uint8_t *cnt); unsigned int physregions(struct vir_region *vr); @@ -235,7 +235,7 @@ void clear_cache_bydev(dev_t dev); /* vfs.c */ int vfs_request(int reqno, int fd, struct vmproc *vmp, u64_t offset, - u32_t len, vfs_callback_t reply_callback, void *cbarg, void *state, + uint32_t len, vfs_callback_t reply_callback, void *cbarg, void *state, int statelen); int do_vfs_reply(message *m); diff --git a/minix/servers/vm/pt.h b/minix/servers/vm/pt.h index 6d43758a1..7e61bb838 100644 --- a/minix/servers/vm/pt.h +++ b/minix/servers/vm/pt.h @@ -10,18 +10,18 @@ /* A pagetable. */ typedef struct { /* Directory entries in VM addr space - root of page table. */ - u32_t *pt_dir; /* page aligned (ARCH_VM_DIR_ENTRIES) */ - u32_t pt_dir_phys; /* physical address of pt_dir */ + uint32_t *pt_dir; /* page aligned (ARCH_VM_DIR_ENTRIES) */ + uint32_t pt_dir_phys; /* physical address of pt_dir */ /* Pointers to page tables in VM address space. */ - u32_t *pt_pt[ARCH_VM_DIR_ENTRIES]; + uint32_t *pt_pt[ARCH_VM_DIR_ENTRIES]; /* When looking for a hole in virtual address space, start * looking here. This is in linear addresses, i.e., * not as the process sees it but the position in the page * page table. This is just a hint. */ - u32_t pt_virtop; + uint32_t pt_virtop; } pt_t; #define CLICKSPERPAGE (VM_PAGE_SIZE/CLICK_SIZE) diff --git a/minix/servers/vm/region.c b/minix/servers/vm/region.c index 712fabc2a..eb81e6121 100644 --- a/minix/servers/vm/region.c +++ b/minix/servers/vm/region.c @@ -426,7 +426,7 @@ static struct vir_region *region_new(struct vmproc *vmp, vir_bytes startv, vir_b { struct vir_region *newregion; struct phys_region **newphysregions; - static u32_t id; + static uint32_t id; int slots = phys_slot(length); if(!(SLABALLOC(newregion))) { @@ -461,7 +461,7 @@ USE(newregion, * map_page_region * *===========================================================================*/ struct vir_region *map_page_region(struct vmproc *vmp, vir_bytes minv, - vir_bytes maxv, vir_bytes length, u32_t flags, int mapflags, + vir_bytes maxv, vir_bytes length, uint32_t flags, int mapflags, mem_type_t *memtype) { struct vir_region *newregion; @@ -642,9 +642,9 @@ struct vir_region *map_lookup(struct vmproc *vmp, return NULL; } -u32_t vrallocflags(u32_t flags) +uint32_t vrallocflags(uint32_t flags) { - u32_t allocflags = 0; + uint32_t allocflags = 0; if(flags & VR_PHYS64K) allocflags |= PAF_ALIGN64K; @@ -1300,7 +1300,7 @@ int map_unmap_range(struct vmproc *vmp, vir_bytes unmap_start, vir_bytes length) /*========================================================================* * map_region_lookup_type * *========================================================================*/ -struct vir_region* map_region_lookup_type(struct vmproc *vmp, u32_t type) +struct vir_region* map_region_lookup_type(struct vmproc *vmp, uint32_t type) { struct vir_region *vr; struct phys_region *pr; diff --git a/minix/servers/vm/region.h b/minix/servers/vm/region.h index b2b55b212..713544874 100644 --- a/minix/servers/vm/region.h +++ b/minix/servers/vm/region.h @@ -22,7 +22,7 @@ struct phys_block { #if SANITYCHECKS - u32_t seencount; + uint32_t seencount; #endif phys_bytes phys; /* physical memory */ diff --git a/minix/servers/vm/rs.c b/minix/servers/vm/rs.c index 9801a39e7..0916c9240 100644 --- a/minix/servers/vm/rs.c +++ b/minix/servers/vm/rs.c @@ -218,7 +218,7 @@ int do_rs_update(message *m_ptr) static int rs_memctl_make_vm_instance(struct vmproc *new_vm_vmp) { int r; - u32_t flags; + uint32_t flags; int verify; struct vmproc *this_vm_vmp; diff --git a/minix/servers/vm/slaballoc.c b/minix/servers/vm/slaballoc.c index 4549a3e3e..7ca79800b 100644 --- a/minix/servers/vm/slaballoc.c +++ b/minix/servers/vm/slaballoc.c @@ -95,7 +95,7 @@ typedef element_t elements_t[USEELEMENTS]; struct sdh { #if SANITYCHECKS - u32_t magic1; + uint32_t magic1; #endif int freeguess; struct slabdata *next, *prev; @@ -103,7 +103,7 @@ struct sdh { phys_bytes phys; #if SANITYCHECKS int writable; /* data item number or WRITABLE_* */ - u32_t magic2; + uint32_t magic2; #endif uint16_t nused; /* Number of data items used in this slab. */ }; @@ -316,7 +316,7 @@ void *slaballoc(int bytes) nojunkwarning--; assert(!nojunkwarning); #endif - *(u32_t *) ret = NOJUNK; + *(uint32_t *) ret = NOJUNK; #if MEMPROTECT slablock(ret, bytes); #endif @@ -364,7 +364,7 @@ static inline int objstats(void *mem, int bytes, OBJSTATSCHECK((char *) mem >= (char *) VM_PAGE_SIZE); #if SANITYCHECKS - if(*(u32_t *) mem == JUNK && !nojunkwarning) { + if(*(uint32_t *) mem == JUNK && !nojunkwarning) { util_stacktrace(); printf("VM: WARNING: JUNK seen in slab object, likely freed\n"); } @@ -418,7 +418,7 @@ void slabfree(void *mem, int bytes) } #if SANITYCHECKS - if(*(u32_t *) mem == JUNK) { + if(*(uint32_t *) mem == JUNK) { printf("VM: WARNING: likely double free, JUNK seen\n"); } #endif @@ -430,7 +430,7 @@ void slabfree(void *mem, int bytes) #if JUNKFREE memset(mem, 0xa6, bytes); #endif - *(u32_t *) mem = JUNK; + *(uint32_t *) mem = JUNK; nojunkwarning++; #if MEMPROTECT slablock(mem, bytes); diff --git a/minix/servers/vm/vfs.c b/minix/servers/vm/vfs.c index 98488f933..13dbb63a0 100644 --- a/minix/servers/vm/vfs.c +++ b/minix/servers/vm/vfs.c @@ -57,7 +57,7 @@ static void activate(void) /*===========================================================================* * vfs_request * *===========================================================================*/ -int vfs_request(int reqno, int fd, struct vmproc *vmp, u64_t offset, u32_t len, +int vfs_request(int reqno, int fd, struct vmproc *vmp, u64_t offset, uint32_t len, vfs_callback_t reply_callback, void *cbarg, void *state, int statelen) { /* Perform an asynchronous request to VFS. diff --git a/minix/servers/vm/vm.h b/minix/servers/vm/vm.h index 751e7a819..02b70a856 100644 --- a/minix/servers/vm/vm.h +++ b/minix/servers/vm/vm.h @@ -29,7 +29,7 @@ #define MARK do { if(mark) { printf("%d\n", __LINE__); } } while(0) /* special value for v in pt_allocmap */ -#define AM_AUTO ((u32_t) -1) +#define AM_AUTO ((uint32_t) -1) /* How noisy are we supposed to be? */ #define VERBOSE 0 diff --git a/minix/tests/blocktest/blocktest.c b/minix/tests/blocktest/blocktest.c index d6b80b322..d0acbdd93 100644 --- a/minix/tests/blocktest/blocktest.c +++ b/minix/tests/blocktest/blocktest.c @@ -509,11 +509,11 @@ static void bad_read1(void) cpf_revoke(grant); } -static u32_t get_sum(uint8_t *ptr, size_t size) +static uint32_t get_sum(uint8_t *ptr, size_t size) { /* Compute a checksum over the given buffer. */ - u32_t sum; + uint32_t sum; for (sum = 0; size > 0; size--, ptr++) sum = sum ^ (sum << 5) ^ *ptr; @@ -521,7 +521,7 @@ static u32_t get_sum(uint8_t *ptr, size_t size) return sum; } -static u32_t fill_rand(uint8_t *ptr, size_t size) +static uint32_t fill_rand(uint8_t *ptr, size_t size) { /* Fill the given buffer with random data. Return a checksum over the * resulting data. @@ -534,14 +534,14 @@ static u32_t fill_rand(uint8_t *ptr, size_t size) return get_sum(ptr, size); } -static void test_sum(uint8_t *ptr, size_t size, u32_t sum, int should_match, +static void test_sum(uint8_t *ptr, size_t size, uint32_t sum, int should_match, result_t *res) { /* If the test succeeded so far, check whether the given buffer does * or does not match the given checksum, and adjust the test result * accordingly. */ - u32_t sum2; + uint32_t sum2; if (res->type != RESULT_OK) return; @@ -566,7 +566,7 @@ static void bad_read2(void) uint8_t *buf_ptr, *buf2_ptr, *buf3_ptr, c1, c2; size_t buf_size, buf2_size, buf3_size; cp_grant_id_t buf_grant, buf2_grant, buf3_grant, grant; - u32_t buf_sum, buf2_sum, buf3_sum; + uint32_t buf_sum, buf2_sum, buf3_sum; iovec_s_t iov[3], iovt[3]; result_t res; @@ -838,7 +838,7 @@ static void bad_write(void) size_t buf_size, buf2_size, buf3_size, sector_unalign; cp_grant_id_t buf_grant, buf2_grant, buf3_grant; cp_grant_id_t grant; - u32_t buf_sum, buf2_sum, buf3_sum; + uint32_t buf_sum, buf2_sum, buf3_sum; iovec_s_t iov[3], iovt[3]; result_t res; @@ -950,8 +950,8 @@ static void vector_and_large_sub(size_t small_size) large_size = small_size * NR_IOREQS; - buf_size = large_size + sizeof(u32_t) * 2; - buf2_size = large_size + sizeof(u32_t) * (NR_IOREQS + 1); + buf_size = large_size + sizeof(uint32_t) * 2; + buf2_size = large_size + sizeof(uint32_t) * (NR_IOREQS + 1); buf_ptr = alloc_dma_memory(buf_size); buf2_ptr = alloc_dma_memory(buf2_size); @@ -962,14 +962,14 @@ static void vector_and_large_sub(size_t small_size) * has dword-sized guards before each chunk and after the last chunk. * SPTR(n) points to the start of the nth small chunk. */ -#define SPTR(n) (buf2_ptr + sizeof(u32_t) + (n) * (sizeof(u32_t) + small_size)) -#define LPTR(n) (buf_ptr + sizeof(u32_t) + small_size * (n)) +#define SPTR(n) (buf2_ptr + sizeof(uint32_t) + (n) * (sizeof(uint32_t) + small_size)) +#define LPTR(n) (buf_ptr + sizeof(uint32_t) + small_size * (n)) /* Write one large chunk, if writing is allowed. */ if (may_write) { fill_rand(buf_ptr, buf_size); /* don't need the checksum */ - iovec[0].iov_addr = (vir_bytes) (buf_ptr + sizeof(u32_t)); + iovec[0].iov_addr = (vir_bytes) (buf_ptr + sizeof(uint32_t)); iovec[0].iov_size = large_size; vir_xfer(driver_minor, base_pos, iovec, 1, TRUE, large_size, @@ -982,21 +982,21 @@ static void vector_and_large_sub(size_t small_size) * check checksums. */ for (i = 0; i < NR_IOREQS; i++) { - * (((u32_t *) SPTR(i)) - 1) = 0xDEADBEEFL + i; + * (((uint32_t *) SPTR(i)) - 1) = 0xDEADBEEFL + i; iovec[i].iov_addr = (vir_bytes) SPTR(i); iovec[i].iov_size = small_size; } - * (((u32_t *) SPTR(i)) - 1) = 0xFEEDFACEL; + * (((uint32_t *) SPTR(i)) - 1) = 0xFEEDFACEL; vir_xfer(driver_minor, base_pos, iovec, NR_IOREQS, FALSE, large_size, &res); if (res.type == RESULT_OK) { for (i = 0; i < NR_IOREQS; i++) { - if (* (((u32_t *) SPTR(i)) - 1) != 0xDEADBEEFL + i) + if (* (((uint32_t *) SPTR(i)) - 1) != 0xDEADBEEFL + i) set_result(&res, RESULT_OVERFLOW, 0); } - if (* (((u32_t *) SPTR(i)) - 1) != 0xFEEDFACEL) + if (* (((uint32_t *) SPTR(i)) - 1) != 0xFEEDFACEL) set_result(&res, RESULT_OVERFLOW, 0); } @@ -1029,18 +1029,18 @@ static void vector_and_large_sub(size_t small_size) * In both cases, the expected content is in the second buffer. */ - * (u32_t *) buf_ptr = 0xCAFEBABEL; - * (u32_t *) (buf_ptr + sizeof(u32_t) + large_size) = 0xDECAFBADL; + * (uint32_t *) buf_ptr = 0xCAFEBABEL; + * (uint32_t *) (buf_ptr + sizeof(uint32_t) + large_size) = 0xDECAFBADL; - iovec[0].iov_addr = (vir_bytes) (buf_ptr + sizeof(u32_t)); + iovec[0].iov_addr = (vir_bytes) (buf_ptr + sizeof(uint32_t)); iovec[0].iov_size = large_size; vir_xfer(driver_minor, base_pos, iovec, 1, FALSE, large_size, &res); if (res.type == RESULT_OK) { - if (* (u32_t *) buf_ptr != 0xCAFEBABEL) + if (* (uint32_t *) buf_ptr != 0xCAFEBABEL) set_result(&res, RESULT_OVERFLOW, 0); - if (* (u32_t *) (buf_ptr + sizeof(u32_t) + large_size) != + if (* (uint32_t *) (buf_ptr + sizeof(uint32_t) + large_size) != 0xDECAFBADL) set_result(&res, RESULT_OVERFLOW, 0); } @@ -1253,7 +1253,7 @@ static void read_limits(dev_t sub0_minor, dev_t sub1_minor, size_t sub_size) */ uint8_t *buf_ptr; size_t buf_size; - u32_t sum, sum2, sum3; + uint32_t sum, sum2, sum3; result_t res; test_group("read around subpartition limits", TRUE); @@ -1368,7 +1368,7 @@ static void write_limits(dev_t sub0_minor, dev_t sub1_minor, size_t sub_size) */ uint8_t *buf_ptr; size_t buf_size; - u32_t sum, sum2, sum3, sub1_sum; + uint32_t sum, sum2, sum3, sub1_sum; result_t res; test_group("write around subpartition limits", may_write); @@ -1739,7 +1739,7 @@ static void part_limits(void) } static void unaligned_size_io(u64_t base_pos, uint8_t *buf_ptr, size_t buf_size, - uint8_t *sec_ptr[2], int sectors, int pattern, u32_t ssum[5]) + uint8_t *sec_ptr[2], int sectors, int pattern, uint32_t ssum[5]) { /* Perform a single small-element I/O read, write, readback test. * The number of sectors and the pattern varies with each call. @@ -1747,7 +1747,7 @@ static void unaligned_size_io(u64_t base_pos, uint8_t *buf_ptr, size_t buf_size, * checksums on disk, if writing is enabled. Note that for */ iovec_t iov[3], iovt[3]; - u32_t rsum[3]; + uint32_t rsum[3]; result_t res; size_t total_size; int i, nr_req; @@ -1914,7 +1914,7 @@ static void unaligned_size(void) */ uint8_t *buf_ptr, *sec_ptr[2]; size_t buf_size; - u32_t sum = 0L, ssum[5]; + uint32_t sum = 0L, ssum[5]; u64_t base_pos; result_t res; int i; @@ -2012,7 +2012,7 @@ static void unaligned_pos1(void) */ uint8_t *buf_ptr, *buf2_ptr; size_t buf_size, buf2_size, size; - u32_t sum, sum2; + uint32_t sum, sum2; u64_t base_pos; result_t res; @@ -2161,7 +2161,7 @@ static void unaligned_pos2(void) */ uint8_t *buf_ptr, *buf2_ptr; size_t buf_size, buf2_size, max_block; - u32_t sum = 0L, sum2 = 0L, rsum[NR_IOREQS]; + uint32_t sum = 0L, sum2 = 0L, rsum[NR_IOREQS]; u64_t base_pos; iovec_t iov[NR_IOREQS]; result_t res; @@ -2301,7 +2301,7 @@ static void sweep_area(u64_t base_pos) */ uint8_t *buf_ptr; size_t buf_size; - u32_t sum = 0L, ssum[8]; + uint32_t sum = 0L, ssum[8]; result_t res; int i, j; @@ -2391,7 +2391,7 @@ static void sweep_and_check(u64_t pos, int check_integ) */ uint8_t *buf_ptr; size_t buf_size; - u32_t sum = 0L; + uint32_t sum = 0L; result_t res; if (check_integ) { diff --git a/minix/tests/ds/dstest.c b/minix/tests/ds/dstest.c index afd97624c..515761bfc 100644 --- a/minix/tests/ds/dstest.c +++ b/minix/tests/ds/dstest.c @@ -11,7 +11,7 @@ char *key_label = "test_label"; void test_u32(void) { int r; - u32_t value; + uint32_t value; /* Publish and retrieve. */ r = ds_publish_u32(key_u32, 1234, 0); diff --git a/minix/tests/ds/subs.c b/minix/tests/ds/subs.c index d63ebe3b5..d6ed244c2 100644 --- a/minix/tests/ds/subs.c +++ b/minix/tests/ds/subs.c @@ -14,7 +14,7 @@ int main(void) message mess; char key[DS_MAX_KEYLEN]; int type; - u32_t num; + uint32_t num; char string[17]; char buf[1000]; size_t length = 1000; diff --git a/minix/tests/safecopy/requestor.c b/minix/tests/safecopy/requestor.c index 9c6ce8b6a..942c41bb9 100644 --- a/minix/tests/safecopy/requestor.c +++ b/minix/tests/safecopy/requestor.c @@ -11,8 +11,8 @@ char *buf; *===========================================================================*/ int test(size_t size) { - u32_t low1, high1; - u32_t low2, high2; + uint32_t low1, high1; + uint32_t low2, high2; int r; /* Timing. */ diff --git a/minix/tests/test53.c b/minix/tests/test53.c index 672d20931..48f7c6e42 100644 --- a/minix/tests/test53.c +++ b/minix/tests/test53.c @@ -35,7 +35,7 @@ static void err(int line) static u64_t getargval(int index, int *done) { - u32_t values[] = { + uint32_t values[] = { /* corner cases */ 0, 1, @@ -126,7 +126,7 @@ static inline int bsr64(u64_t i) static void testmul(void) { int kdone, kidx; - u32_t ilo = ex64lo(i), jlo = ex64lo(j); + uint32_t ilo = ex64lo(i), jlo = ex64lo(j); u64_t prod = i * j; int prodbits; diff --git a/minix/tests/test71.c b/minix/tests/test71.c index 954b972c8..13f93d522 100644 --- a/minix/tests/test71.c +++ b/minix/tests/test71.c @@ -24,7 +24,7 @@ #include "testcache.h" int -dowriteblock(int b, int blocksize, u32_t seed, char *data) +dowriteblock(int b, int blocksize, uint32_t seed, char *data) { u64_t offset; int fd; @@ -40,7 +40,7 @@ dowriteblock(int b, int blocksize, u32_t seed, char *data) } int -readblock(int b, int blocksize, u32_t seed, char *data) +readblock(int b, int blocksize, uint32_t seed, char *data) { u64_t offset; int fd; @@ -82,7 +82,7 @@ main(int argc, char *argv[]) if(dotest(PAGE_SIZE, 20000, iter)) e(5); if(bigflag) { - u32_t totalmem, freemem, cachedmem; + uint32_t totalmem, freemem, cachedmem; if(dotest(PAGE_SIZE, 150000, iter)) e(5); getmem(&totalmem, &freemem, &cachedmem); if(dotest(PAGE_SIZE, totalmem*1.5, iter)) e(6); diff --git a/minix/tests/test72.c b/minix/tests/test72.c index 8e6cc1103..dec7c2c6b 100644 --- a/minix/tests/test72.c +++ b/minix/tests/test72.c @@ -38,7 +38,7 @@ static char *writtenblocks[MAXBLOCKS]; /* Some functions used by testcache.c */ int -dowriteblock(int b, int blocksize, u32_t seed, char *data) +dowriteblock(int b, int blocksize, uint32_t seed, char *data) { struct buf *bp; int r; @@ -60,7 +60,7 @@ dowriteblock(int b, int blocksize, u32_t seed, char *data) } int -readblock(int b, int blocksize, u32_t seed, char *data) +readblock(int b, int blocksize, uint32_t seed, char *data) { struct buf *bp; int r; @@ -220,19 +220,19 @@ int free_contig(void *addr, size_t len) return 0; } -u32_t sqrt_approx(u32_t v) +uint32_t sqrt_approx(uint32_t v) { - return (u32_t) sqrt(v); + return (uint32_t) sqrt(v); } int vm_set_cacheblock(void *block, dev_t dev, off_t dev_offset, - ino_t ino, off_t ino_offset, u32_t *flags, int blocksize, int setflags) + ino_t ino, off_t ino_offset, uint32_t *flags, int blocksize, int setflags) { return ENOSYS; } void *vm_map_cacheblock(dev_t dev, off_t dev_offset, - ino_t ino, off_t ino_offset, u32_t *flags, int blocksize) + ino_t ino, off_t ino_offset, uint32_t *flags, int blocksize) { return MAP_FAILED; } diff --git a/minix/tests/test74.c b/minix/tests/test74.c index e9733d29c..3ea440ef1 100644 --- a/minix/tests/test74.c +++ b/minix/tests/test74.c @@ -51,7 +51,7 @@ int max_error = 0; /* make all e()'s fatal */ int -dowriteblock(int b, int blocksize, u32_t seed, char *data) +dowriteblock(int b, int blocksize, uint32_t seed, char *data) { u64_t offset; int fd; @@ -67,7 +67,7 @@ dowriteblock(int b, int blocksize, u32_t seed, char *data) } int -readblock(int b, int blocksize, u32_t seed, char *data) +readblock(int b, int blocksize, uint32_t seed, char *data) { u64_t offset; int fd; @@ -915,7 +915,7 @@ main(int argc, char *argv[]) if(dotest(PAGE_SIZE, 20000, iter)) e(5); if(bigflag) { - u32_t totalmem, freemem, cachedmem; + uint32_t totalmem, freemem, cachedmem; if(dotest(PAGE_SIZE, 150000, iter)) e(5); getmem(&totalmem, &freemem, &cachedmem); if(dotest(PAGE_SIZE, totalmem*1.5, iter)) e(6); diff --git a/minix/tests/testcache.c b/minix/tests/testcache.c index e58925067..4a8526ec8 100644 --- a/minix/tests/testcache.c +++ b/minix/tests/testcache.c @@ -26,22 +26,22 @@ extern int quietflag; int fds[MAXFILES]; static void -genblock(int b, char *blockdata, int blocksize, u32_t seed) +genblock(int b, char *blockdata, int blocksize, uint32_t seed) { - u32_t *p = (u32_t *) blockdata, - *plimit = (u32_t *) (blockdata + blocksize), + uint32_t *p = (uint32_t *) blockdata, + *plimit = (uint32_t *) (blockdata + blocksize), i = 0; srandom(seed ^ b); - for(p = (u32_t *) blockdata; p < plimit; p++) { + for(p = (uint32_t *) blockdata; p < plimit; p++) { i++; *p = random(); } } static int -checkblock(int b, int blocksize, u32_t seed) +checkblock(int b, int blocksize, uint32_t seed) { static char data[MAXBLOCKSIZE], expected_data[MAXBLOCKSIZE]; int r; @@ -66,7 +66,7 @@ checkblock(int b, int blocksize, u32_t seed) } static int -writeblock(int b, int blocksize, u32_t seed) +writeblock(int b, int blocksize, uint32_t seed) { static char data[MAXBLOCKSIZE]; @@ -101,7 +101,7 @@ makepermutation(int nblocks, int *permutation) } static int -checkblocks(int nblocks, int blocksize, u32_t seed) +checkblocks(int nblocks, int blocksize, uint32_t seed) { int b; int nrandom = nblocks * 3; @@ -142,7 +142,7 @@ dotest(int blocksize, int nblocks, int iterations) int nrandom = nblocks * iterations; static int perm1[MAXBLOCKS], perm2[MAXBLOCKS]; static int newblock[MAXBLOCKS]; - u32_t seed = random(), newseed; + uint32_t seed = random(), newseed; int mb; assert(nblocks > 0 && nblocks <= MAXBLOCKS); diff --git a/minix/tests/testcache.h b/minix/tests/testcache.h index b423a5e78..93285d9d9 100644 --- a/minix/tests/testcache.h +++ b/minix/tests/testcache.h @@ -11,8 +11,8 @@ #define MAXBLOCKSIZE (4*PAGE_SIZE) -int dowriteblock(int b, int blocksize, u32_t seed, char *block); -int readblock(int b, int blocksize, u32_t seed, char *block); +int dowriteblock(int b, int blocksize, uint32_t seed, char *block); +int readblock(int b, int blocksize, uint32_t seed, char *block); void testend(void); int dotest(int blocksize, int nblocks, int iterations); void cachequiet(int quiet); diff --git a/minix/tests/testvm.c b/minix/tests/testvm.c index 1f5f8e989..f29be593d 100644 --- a/minix/tests/testvm.c +++ b/minix/tests/testvm.c @@ -24,7 +24,7 @@ int memfd; static char *bdata = NULL; -int dowriteblock(int b, int blocksize, u32_t seed, char *block) +int dowriteblock(int b, int blocksize, uint32_t seed, char *block) { int r; char *bdata; @@ -57,7 +57,7 @@ int dowriteblock(int b, int blocksize, u32_t seed, char *block) return blocksize; } -int readblock(int b, int blocksize, u32_t seed, char *block) +int readblock(int b, int blocksize, uint32_t seed, char *block) { char *bdata; u64_t dev_off = (u64_t) b * blocksize; @@ -142,7 +142,7 @@ main(int argc, char *argv[]) { struct info info; int big; - u32_t totalmem, freemem, cachedmem; + uint32_t totalmem, freemem, cachedmem; progname = argv[0]; diff --git a/minix/usr.bin/mtop/mtop.c b/minix/usr.bin/mtop/mtop.c index 858d9e8da..0bbfe0e18 100644 --- a/minix/usr.bin/mtop/mtop.c +++ b/minix/usr.bin/mtop/mtop.c @@ -44,7 +44,7 @@ #define ORDER_HIGHEST ORDER_MEMORY int order = ORDER_CPU; -u32_t system_hz; +uint32_t system_hz; /* name of cpu cycle types, in the order they appear in /psinfo. */ const char *cputimenames[] = { "user", "ipc", "kernelcall" }; @@ -616,7 +616,7 @@ int main(int argc, char *argv[]) return 1; } - system_hz = (u32_t) sysconf(_SC_CLK_TCK); + system_hz = (uint32_t) sysconf(_SC_CLK_TCK); getkinfo(); diff --git a/minix/usr.bin/trace/ioctl/block.c b/minix/usr.bin/trace/ioctl/block.c index 4430ddf25..3151986bb 100644 --- a/minix/usr.bin/trace/ioctl/block.c +++ b/minix/usr.bin/trace/ioctl/block.c @@ -188,7 +188,7 @@ block_ioctl_arg(struct trace_proc * proc, unsigned long req, void * ptr, if (ptr == NULL) return IF_OUT; - put_value(proc, NULL, "%"PRIu32, *(u32_t *)ptr); + put_value(proc, NULL, "%"PRIu32, *(uint32_t *)ptr); return IF_ALL; case VNDIOCSET: diff --git a/minix/usr.sbin/fbdctl/fbdctl.c b/minix/usr.sbin/fbdctl/fbdctl.c index 957f97fa0..9c29df780 100644 --- a/minix/usr.sbin/fbdctl/fbdctl.c +++ b/minix/usr.sbin/fbdctl/fbdctl.c @@ -114,7 +114,7 @@ do_list(int fd) static int scan_hex64(char * input, u64_t * val) { - u32_t lo, hi; + uint32_t lo, hi; char buf[9]; int len;