From 8a2e8d98efc80861aa9ae65be26555c61f691cd1 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Thu, 26 May 2005 23:22:13 +0000 Subject: [PATCH] Remove DEC Alpha support. --- sys/dev/disk/isp/isp_pci.c | 7 +------ sys/dev/disk/isp/isp_tpublic.h | 5 ++--- sys/dev/disk/ncr/ncr.c | 8 +------- sys/dev/disk/sym/sym_hipd.c | 37 +--------------------------------- 4 files changed, 5 insertions(+), 52 deletions(-) diff --git a/sys/dev/disk/isp/isp_pci.c b/sys/dev/disk/isp/isp_pci.c index 47f6c3549d..001198397c 100644 --- a/sys/dev/disk/isp/isp_pci.c +++ b/sys/dev/disk/isp/isp_pci.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.78.2.4 2002/10/11 18:50:53 mjacob Exp $ */ -/* $DragonFly: src/sys/dev/disk/isp/isp_pci.c,v 1.5 2005/05/24 20:58:59 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/isp/isp_pci.c,v 1.6 2005/05/26 23:22:13 swildner Exp $ */ /* * PCI specific probe and attach routines for Qlogic ISP SCSI adapters. * FreeBSD Version. @@ -371,13 +371,8 @@ isp_pci_attach(device_t dev) /* * Figure out which we should try first - memory mapping or i/o mapping? */ -#ifdef __alpha__ - m1 = PCIM_CMD_MEMEN; - m2 = PCIM_CMD_PORTEN; -#else m1 = PCIM_CMD_PORTEN; m2 = PCIM_CMD_MEMEN; -#endif bitmap = 0; if (getenv_int("isp_mem_map", &bitmap)) { if (bitmap & (1 << unit)) { diff --git a/sys/dev/disk/isp/isp_tpublic.h b/sys/dev/disk/isp/isp_tpublic.h index 56e065d545..f9935d8723 100644 --- a/sys/dev/disk/isp/isp_tpublic.h +++ b/sys/dev/disk/isp/isp_tpublic.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/isp/isp_tpublic.h,v 1.2.4.3 2001/10/08 05:57:06 mjacob Exp $ */ -/* $DragonFly: src/sys/dev/disk/isp/isp_tpublic.h,v 1.2 2003/06/17 04:28:27 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/isp/isp_tpublic.h,v 1.3 2005/05/26 23:22:13 swildner Exp $ */ /* * Qlogic ISP Host Adapter Public Target Interface Structures && Routines *--------------------------------------- @@ -184,8 +184,7 @@ typedef struct { */ #ifndef _LP64 -#if defined(__alpha__) || defined(__sparcv9cpu) || defined(__sparc_v9__) ||\ - defined(__ia64__) +#if defined(__sparcv9cpu) || defined(__sparc_v9__) || defined(__ia64__) #define _LP64 #endif #endif diff --git a/sys/dev/disk/ncr/ncr.c b/sys/dev/disk/ncr/ncr.c index 2107db841f..f8557414f6 100644 --- a/sys/dev/disk/ncr/ncr.c +++ b/sys/dev/disk/ncr/ncr.c @@ -1,7 +1,7 @@ /************************************************************************** ** ** $FreeBSD: src/sys/pci/ncr.c,v 1.155.2.3 2001/03/05 13:09:10 obrien Exp $ -** $DragonFly: src/sys/dev/disk/ncr/ncr.c,v 1.9 2005/05/24 20:58:59 dillon Exp $ +** $DragonFly: src/sys/dev/disk/ncr/ncr.c,v 1.10 2005/05/26 23:22:13 swildner Exp $ ** ** Device driver for the NCR 53C8XX PCI-SCSI-Controller Family. ** @@ -275,12 +275,6 @@ **========================================================== */ -#ifdef __alpha__ -/* XXX */ -#undef vtophys -#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)va) -#endif - #define INB(r) bus_space_read_1(np->bst, np->bsh, offsetof(struct ncr_reg, r)) #define INW(r) bus_space_read_2(np->bst, np->bsh, offsetof(struct ncr_reg, r)) #define INL(r) bus_space_read_4(np->bst, np->bsh, offsetof(struct ncr_reg, r)) diff --git a/sys/dev/disk/sym/sym_hipd.c b/sys/dev/disk/sym/sym_hipd.c index 1519275320..7492ed6b13 100644 --- a/sys/dev/disk/sym/sym_hipd.c +++ b/sys/dev/disk/sym/sym_hipd.c @@ -56,7 +56,7 @@ */ /* $FreeBSD: src/sys/dev/sym/sym_hipd.c,v 1.6.2.12 2001/12/02 19:01:10 groudier Exp $ */ -/* $DragonFly: src/sys/dev/disk/sym/sym_hipd.c,v 1.12 2005/05/24 20:59:00 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/sym/sym_hipd.c,v 1.13 2005/05/26 23:22:13 swildner Exp $ */ #define SYM_DRIVER_NAME "sym-1.6.5-20000902" @@ -166,8 +166,6 @@ typedef u_int32_t u32; #if defined __i386__ #define MEMORY_BARRIER() do { ; } while(0) -#elif defined __alpha__ -#define MEMORY_BARRIER() alpha_mb() #elif defined __powerpc__ #define MEMORY_BARRIER() __asm__ volatile("eieio; sync" : : : "memory") #elif defined __ia64__ @@ -691,11 +689,7 @@ static void sym_mfree(void *ptr, int size, char *name) */ #define __sym_calloc_dma(b, s, n) sym_calloc(s, n) #define __sym_mfree_dma(b, p, s, n) sym_mfree(p, s, n) -#ifdef __alpha__ -#define __vtobus(b, p) alpha_XXX_dmamap((vm_offset_t)(p)) -#else /*__i386__, __sparc64__*/ #define __vtobus(b, p) vtophys(p) -#endif #else /* @@ -1033,18 +1027,6 @@ struct sym_nvram { #define io_write16(p, v) outw((p), cpu_to_scr(v)) #define io_write32(p, v) outl((p), cpu_to_scr(v)) -#ifdef __alpha__ - -#define mmio_read8(a) readb(a) -#define mmio_read16(a) readw(a) -#define mmio_read32(a) readl(a) -#define mmio_write8(a, b) writeb(a, b) -#define mmio_write16(a, b) writew(a, b) -#define mmio_write32(a, b) writel(a, b) -#define memcpy_to_pci(d, s, n) memcpy_toio((u32)(d), (void *)(s), (n)) - -#else /*__i386__, __sparc64__*/ - #define mmio_read8(a) scr_to_cpu((*(volatile unsigned char *) (a))) #define mmio_read16(a) scr_to_cpu((*(volatile unsigned short *) (a))) #define mmio_read32(a) scr_to_cpu((*(volatile unsigned int *) (a))) @@ -1053,8 +1035,6 @@ struct sym_nvram { #define mmio_write32(a, b) (*(volatile unsigned int *) (a)) = cpu_to_scr(b) #define memcpy_to_pci(d, s, n) bcopy((s), (void *)(d), (n)) -#endif - /* * Normal IO */ @@ -9673,21 +9653,6 @@ int sym_cam_attach(hcb_p np) } np->path = path; - /* - * Hmmm... This should be useful, but I donnot want to - * know about. - */ -#if defined(__FreeBSD__) && __FreeBSD_version < 400000 -#ifdef __alpha__ -#ifdef FreeBSD_Bus_Io_Abstraction - alpha_register_pci_scsi(pci_get_bus(np->device), - pci_get_slot(np->device), np->sim); -#else - alpha_register_pci_scsi(pci_tag->bus, pci_tag->slot, np->sim); -#endif -#endif -#endif - /* * Establish our async notification handler. */ -- 2.41.0