diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/acpica/acpi_hpet.c | 2 | ||||
| -rw-r--r-- | sys/dev/amr/amrio.h | 2 | ||||
| -rw-r--r-- | sys/dev/ath/if_ath_ahb.c | 3 | ||||
| -rw-r--r-- | sys/dev/ath/if_ath_pci.c | 3 | ||||
| -rw-r--r-- | sys/dev/atkbdc/atkbdc.c | 2 | ||||
| -rw-r--r-- | sys/dev/drm/drm.h | 2 | ||||
| -rw-r--r-- | sys/dev/drm/drm_sarea.h | 2 | ||||
| -rw-r--r-- | sys/dev/drm2/drm.h | 2 | ||||
| -rw-r--r-- | sys/dev/drm2/drm_sarea.h | 2 | ||||
| -rw-r--r-- | sys/dev/fb/fbreg.h | 24 | ||||
| -rw-r--r-- | sys/dev/hwpmc/hwpmc_ia64.c | 66 | ||||
| -rw-r--r-- | sys/dev/pci/vga_pci.c | 6 | ||||
| -rw-r--r-- | sys/dev/sound/pcm/pcm.h | 2 | ||||
| -rw-r--r-- | sys/dev/sym/sym_hipd.c | 2 | ||||
| -rw-r--r-- | sys/dev/txp/if_txp.c | 2 | ||||
| -rw-r--r-- | sys/dev/uart/uart_cpu_ia64.c | 113 | ||||
| -rw-r--r-- | sys/dev/vt/hw/vga/vt_vga.c | 5 |
17 files changed, 13 insertions, 227 deletions
diff --git a/sys/dev/acpica/acpi_hpet.c b/sys/dev/acpica/acpi_hpet.c index 4d600f5..2558648 100644 --- a/sys/dev/acpica/acpi_hpet.c +++ b/sys/dev/acpica/acpi_hpet.c @@ -29,7 +29,7 @@ __FBSDID("$FreeBSD$"); #include "opt_acpi.h" -#if defined(__amd64__) || defined(__ia64__) +#if defined(__amd64__) #define DEV_APIC #else #include "opt_apic.h" diff --git a/sys/dev/amr/amrio.h b/sys/dev/amr/amrio.h index bc06a86..9c81d2d 100644 --- a/sys/dev/amr/amrio.h +++ b/sys/dev/amr/amrio.h @@ -108,7 +108,7 @@ struct amr_user_ioctl { #define AMR_IO_COMMAND _IOWR('A', 0x201, struct amr_user_ioctl) -#if defined(__amd64__) || defined(__ia64__) +#if defined(__amd64__) struct amr_user_ioctl32 { unsigned char au_cmd[32]; /* command text from userspace */ diff --git a/sys/dev/ath/if_ath_ahb.c b/sys/dev/ath/if_ath_ahb.c index 362257f..4511ae4 100644 --- a/sys/dev/ath/if_ath_ahb.c +++ b/sys/dev/ath/if_ath_ahb.c @@ -164,8 +164,7 @@ ath_ahb_attach(device_t dev) goto bad0; } - /* XXX uintptr_t is a bandaid for ia64; to be fixed */ - sc->sc_st = (HAL_BUS_TAG)(uintptr_t) rman_get_bustag(psc->sc_sr); + sc->sc_st = (HAL_BUS_TAG) rman_get_bustag(psc->sc_sr); sc->sc_sh = (HAL_BUS_HANDLE) rman_get_bushandle(psc->sc_sr); /* * Mark device invalid so any interrupts (shared or otherwise) diff --git a/sys/dev/ath/if_ath_pci.c b/sys/dev/ath/if_ath_pci.c index 0b1153c..dbbc411 100644 --- a/sys/dev/ath/if_ath_pci.c +++ b/sys/dev/ath/if_ath_pci.c @@ -173,8 +173,7 @@ ath_pci_attach(device_t dev) device_printf(dev, "cannot map register space\n"); goto bad; } - /* XXX uintptr_t is a bandaid for ia64; to be fixed */ - sc->sc_st = (HAL_BUS_TAG)(uintptr_t) rman_get_bustag(psc->sc_sr); + sc->sc_st = (HAL_BUS_TAG) rman_get_bustag(psc->sc_sr); sc->sc_sh = (HAL_BUS_HANDLE) rman_get_bushandle(psc->sc_sr); /* * Mark device invalid so any interrupts (shared or otherwise) diff --git a/sys/dev/atkbdc/atkbdc.c b/sys/dev/atkbdc/atkbdc.c index 460626c..9368dbe 100644 --- a/sys/dev/atkbdc/atkbdc.c +++ b/sys/dev/atkbdc/atkbdc.c @@ -176,8 +176,6 @@ atkbdc_configure(void) /* XXX: tag should be passed from the caller */ #if defined(__amd64__) || defined(__i386__) tag = X86_BUS_SPACE_IO; -#elif defined(__ia64__) - tag = IA64_BUS_SPACE_IO; #elif defined(__sparc64__) tag = &atkbdc_bst_store[0]; #else diff --git a/sys/dev/drm/drm.h b/sys/dev/drm/drm.h index 592b5b3..e579a16 100644 --- a/sys/dev/drm/drm.h +++ b/sys/dev/drm/drm.h @@ -163,7 +163,7 @@ struct drm_hw_lock { /* This is beyond ugly, and only works on GCC. However, it allows me to use * drm.h in places (i.e., in the X-server) where I can't use size_t. The real * fix is to use uint32_t instead of size_t, but that fix will break existing - * LP64 (i.e., PowerPC64, SPARC64, IA-64, Alpha, etc.) systems. That *will* + * LP64 (i.e., PowerPC64, SPARC64, Alpha, etc.) systems. That *will* * eventually happen, though. I chose 'unsigned long' to be the fallback type * because that works on all the platforms I know about. Hopefully, the * real fix will happen before that bites us. diff --git a/sys/dev/drm/drm_sarea.h b/sys/dev/drm/drm_sarea.h index bf5b464..bb95759 100644 --- a/sys/dev/drm/drm_sarea.h +++ b/sys/dev/drm/drm_sarea.h @@ -40,8 +40,6 @@ __FBSDID("$FreeBSD$"); /* SAREA area needs to be at least a page */ #if defined(__alpha__) #define SAREA_MAX 0x2000 -#elif defined(__ia64__) -#define SAREA_MAX 0x10000 /* 64kB */ #else /* Intel 830M driver needs at least 8k SAREA */ #define SAREA_MAX 0x2000UL diff --git a/sys/dev/drm2/drm.h b/sys/dev/drm2/drm.h index d2eac91..dff0f94 100644 --- a/sys/dev/drm2/drm.h +++ b/sys/dev/drm2/drm.h @@ -163,7 +163,7 @@ struct drm_hw_lock { /* This is beyond ugly, and only works on GCC. However, it allows me to use * drm.h in places (i.e., in the X-server) where I can't use size_t. The real * fix is to use uint32_t instead of size_t, but that fix will break existing - * LP64 (i.e., PowerPC64, SPARC64, IA-64, Alpha, etc.) systems. That *will* + * LP64 (i.e., PowerPC64, SPARC64, Alpha, etc.) systems. That *will* * eventually happen, though. I chose 'unsigned long' to be the fallback type * because that works on all the platforms I know about. Hopefully, the * real fix will happen before that bites us. diff --git a/sys/dev/drm2/drm_sarea.h b/sys/dev/drm2/drm_sarea.h index 9f37fcb..f800cfe 100644 --- a/sys/dev/drm2/drm_sarea.h +++ b/sys/dev/drm2/drm_sarea.h @@ -40,8 +40,6 @@ __FBSDID("$FreeBSD$"); /* SAREA area needs to be at least a page */ #if defined(__alpha__) #define SAREA_MAX 0x2000 -#elif defined(__ia64__) -#define SAREA_MAX 0x10000 /* 64kB */ #else /* Intel 830M driver needs at least 8k SAREA */ #define SAREA_MAX 0x2000UL diff --git a/sys/dev/fb/fbreg.h b/sys/dev/fb/fbreg.h index e13408a..0ae2d54 100644 --- a/sys/dev/fb/fbreg.h +++ b/sys/dev/fb/fbreg.h @@ -49,27 +49,7 @@ copyw(uint16_t *src, uint16_t *dst, size_t size) #define bzero_io(d, c) bzero((void *)(d), (c)) #define fill_io(p, d, c) fill((p), (void *)(d), (c)) #define fillw_io(p, d, c) fillw((p), (void *)(d), (c)) -#elif defined(__ia64__) || defined(__sparc64__) -#if defined(__ia64__) -#include <machine/bus.h> -#define bcopy_fromio(s, d, c) \ - bus_space_read_region_1(IA64_BUS_SPACE_MEM, s, 0, (void*)(d), c) -#define bcopy_io(s, d, c) \ - bus_space_copy_region_1(IA64_BUS_SPACE_MEM, s, 0, d, 0, c) -#define bcopy_toio(s, d, c) \ - bus_space_write_region_1(IA64_BUS_SPACE_MEM, d, 0, (void*)(s), c) -#define bzero_io(d, c) \ - bus_space_set_region_1(IA64_BUS_SPACE_MEM, (intptr_t)(d), 0, 0, c) -#define fill_io(p, d, c) \ - bus_space_set_region_1(IA64_BUS_SPACE_MEM, (intptr_t)(d), 0, p, c) -#define fillw_io(p, d, c) \ - bus_space_set_region_2(IA64_BUS_SPACE_MEM, (intptr_t)(d), 0, p, c) -#define readb(a) bus_space_read_1(IA64_BUS_SPACE_MEM, a, 0) -#define readw(a) bus_space_read_2(IA64_BUS_SPACE_MEM, a, 0) -#define writeb(a, v) bus_space_write_1(IA64_BUS_SPACE_MEM, a, 0, v) -#define writew(a, v) bus_space_write_2(IA64_BUS_SPACE_MEM, a, 0, v) -#define writel(a, v) bus_space_write_4(IA64_BUS_SPACE_MEM, a, 0, v) -#endif /* __ia64__ */ +#elif defined(__sparc64__) static __inline void fillw(int val, uint16_t *buf, size_t size) { @@ -120,7 +100,7 @@ fillw(int val, uint16_t *buf, size_t size) #define writew(a, v) (*(uint16_t*)(a) = (v)) #endif -#else /* !__i386__ && !__amd64__ && !__ia64__ && !__sparc64__ && !__powerpc__ */ +#else /* !__i386__ && !__amd64__ && !__sparc64__ && !__powerpc__ */ #define bcopy_io(s, d, c) memcpy_io((d), (s), (c)) #define bcopy_toio(s, d, c) memcpy_toio((d), (void *)(s), (c)) #define bcopy_fromio(s, d, c) memcpy_fromio((void *)(d), (s), (c)) diff --git a/sys/dev/hwpmc/hwpmc_ia64.c b/sys/dev/hwpmc/hwpmc_ia64.c deleted file mode 100644 index ce1caf6..0000000 --- a/sys/dev/hwpmc/hwpmc_ia64.c +++ /dev/null @@ -1,66 +0,0 @@ -/*- - * Copyright (c) 2005, Joseph Koshy - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - */ - -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - -#include <sys/param.h> -#include <sys/pmc.h> - -#include <machine/pmc_mdep.h> - -struct pmc_mdep * -pmc_md_initialize() -{ - return NULL; -} - -void -pmc_md_finalize(struct pmc_mdep *md) -{ - (void) md; -} - -int -pmc_save_kernel_callchain(uintptr_t *cc, int maxsamples, - struct trapframe *tf) -{ - (void) cc; - (void) maxsamples; - (void) tf; - return (0); -} - -int -pmc_save_user_callchain(uintptr_t *cc, int maxsamples, - struct trapframe *tf) -{ - (void) cc; - (void) maxsamples; - (void) tf; - return (0); -} diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c index 46f3250..7083582 100644 --- a/sys/dev/pci/vga_pci.c +++ b/sys/dev/pci/vga_pci.c @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); #include <sys/sysctl.h> #include <sys/systm.h> -#if defined(__amd64__) || defined(__i386__) || defined(__ia64__) +#if defined(__amd64__) || defined(__i386__) #include <vm/vm.h> #include <vm/pmap.h> #endif @@ -137,7 +137,7 @@ vga_pci_map_bios(device_t dev, size_t *size) int rid; struct resource *res; -#if defined(__amd64__) || defined(__i386__) || defined(__ia64__) +#if defined(__amd64__) || defined(__i386__) if (vga_pci_is_boot_display(dev)) { /* * On x86, the System BIOS copy the default display @@ -173,7 +173,7 @@ vga_pci_unmap_bios(device_t dev, void *bios) return; } -#if defined(__amd64__) || defined(__i386__) || defined(__ia64__) +#if defined(__amd64__) || defined(__i386__) if (vga_pci_is_boot_display(dev)) { /* We mapped the BIOS shadow copy located at 0xC0000. */ pmap_unmapdev((vm_offset_t)bios, VGA_PCI_BIOS_SHADOW_SIZE); diff --git a/sys/dev/sound/pcm/pcm.h b/sys/dev/sound/pcm/pcm.h index aab3750..a3a4ec3 100644 --- a/sys/dev/sound/pcm/pcm.h +++ b/sys/dev/sound/pcm/pcm.h @@ -42,7 +42,7 @@ /* * Automatically turn on 64bit arithmetic on suitable archs - * (amd64 64bit, ia64, etc..) for wider 32bit samples / integer processing. + * (amd64 64bit, etc..) for wider 32bit samples / integer processing. */ #if LONG_BIT >= 64 #undef SND_PCM_64 diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c index 4dc5ca5..bd533f5 100644 --- a/sys/dev/sym/sym_hipd.c +++ b/sys/dev/sym/sym_hipd.c @@ -132,8 +132,6 @@ typedef u_int32_t u32; #define MEMORY_BARRIER() do { ; } while(0) #elif defined __powerpc__ #define MEMORY_BARRIER() __asm__ volatile("eieio; sync" : : : "memory") -#elif defined __ia64__ -#define MEMORY_BARRIER() __asm__ volatile("mf.a; mf" : : : "memory") #elif defined __sparc64__ #define MEMORY_BARRIER() __asm__ volatile("membar #Sync" : : : "memory") #elif defined __arm__ diff --git a/sys/dev/txp/if_txp.c b/sys/dev/txp/if_txp.c index f513225..e0452be 100644 --- a/sys/dev/txp/if_txp.c +++ b/sys/dev/txp/if_txp.c @@ -112,7 +112,7 @@ MODULE_DEPEND(txp, ether, 1, 1, 1); * restriction by copying received frame to align the frame on * 32bit boundary on strict-alignment architectures. This adds a * lot of CPU burden and it effectively reduce Rx performance on - * strict-alignment architectures(e.g. sparc64, arm, mips and ia64). + * strict-alignment architectures(e.g. sparc64, arm and mips). * * Unfortunately it seems that 3Com have no longer interests in * releasing fixed firmware so we may have to live with these bugs. diff --git a/sys/dev/uart/uart_cpu_ia64.c b/sys/dev/uart/uart_cpu_ia64.c deleted file mode 100644 index 9a71e20..0000000 --- a/sys/dev/uart/uart_cpu_ia64.c +++ /dev/null @@ -1,113 +0,0 @@ -/*- - * Copyright (c) 2003, 2004 Marcel Moolenaar - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - -#include <sys/param.h> -#include <sys/systm.h> -#include <sys/bus.h> - -#include <machine/bus.h> -#include <machine/dig64.h> -#include <machine/md_var.h> -#include <machine/vmparam.h> - -#include <dev/uart/uart.h> -#include <dev/uart/uart_cpu.h> - -bus_space_tag_t uart_bus_space_io = IA64_BUS_SPACE_IO; -bus_space_tag_t uart_bus_space_mem = IA64_BUS_SPACE_MEM; - -static int dig64_to_uart_parity[] = { - UART_PARITY_NONE, UART_PARITY_NONE, UART_PARITY_EVEN, - UART_PARITY_ODD, UART_PARITY_MARK, UART_PARITY_SPACE -}; - -int -uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2) -{ - - return ((b1->bsh == b2->bsh && b1->bst == b2->bst) ? 1 : 0); -} - -int -uart_cpu_getdev(int devtype, struct uart_devinfo *di) -{ - struct dig64_hcdp_table *tbl; - struct dig64_hcdp_entry *ent; - struct uart_class *class; - bus_addr_t addr; - uint64_t hcdp; - unsigned int i; - - class = &uart_ns8250_class; - if (class == NULL) - return (ENXIO); - - /* - * Use the DIG64 HCDP table if present. - */ - hcdp = ia64_get_hcdp(); - if (hcdp != 0) { - tbl = (void*)IA64_PHYS_TO_RR7(hcdp); - for (i = 0; i < tbl->entries; i++) { - ent = tbl->entry + i; - - if (devtype == UART_DEV_CONSOLE && - ent->type != DIG64_HCDP_CONSOLE) - continue; - - if (devtype == UART_DEV_DBGPORT && - ent->type != DIG64_HCDP_DBGPORT) - continue; - - addr = ent->address.addr_high; - addr = (addr << 32) + ent->address.addr_low; - di->ops = uart_getops(class); - di->bas.chan = 0; - di->bas.bst = (ent->address.addr_space == 0) - ? uart_bus_space_mem : uart_bus_space_io; - if (bus_space_map(di->bas.bst, addr, - uart_getrange(class), 0, &di->bas.bsh) != 0) - continue; - di->bas.regshft = 0; - di->bas.rclk = ent->pclock << 4; - /* We don't deal with 64-bit baud rates. */ - di->baudrate = ent->baud_low; - di->databits = ent->databits; - di->stopbits = ent->stopbits; - di->parity = (ent->parity >= 6) ? UART_PARITY_NONE - : dig64_to_uart_parity[ent->parity]; - return (0); - } - - /* FALLTHROUGH */ - } - - /* Check the environment. */ - return (uart_getenv(devtype, di, class)); -} diff --git a/sys/dev/vt/hw/vga/vt_vga.c b/sys/dev/vt/hw/vga/vt_vga.c index 15bed12..cac752f 100644 --- a/sys/dev/vt/hw/vga/vt_vga.c +++ b/sys/dev/vt/hw/vga/vt_vga.c @@ -656,11 +656,6 @@ vga_init(struct vt_device *vd) sc->vga_fb_handle = KERNBASE + VGA_MEM_BASE; sc->vga_reg_tag = X86_BUS_SPACE_IO; sc->vga_reg_handle = VGA_REG_BASE; -#elif defined(__ia64__) - sc->vga_fb_tag = IA64_BUS_SPACE_MEM; - sc->vga_fb_handle = IA64_PHYS_TO_RR6(VGA_MEM_BASE); - sc->vga_reg_tag = IA64_BUS_SPACE_IO; - sc->vga_reg_handle = VGA_REG_BASE; #else # error "Architecture not yet supported!" #endif |
