diff options
author | jhb <jhb@FreeBSD.org> | 2006-05-12 05:04:46 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2006-05-12 05:04:46 +0000 |
commit | 0f921e0992f543c4aafd5604a99a6edaa059ff36 (patch) | |
tree | 9e7fa374ce86cf10beca9d2dca94fc077a700745 /sys/pci | |
parent | 95826ec6b414b9b651fe4cf4b08cf9e0e16a11f2 (diff) | |
download | FreeBSD-src-0f921e0992f543c4aafd5604a99a6edaa059ff36.zip FreeBSD-src-0f921e0992f543c4aafd5604a99a6edaa059ff36.tar.gz |
Remove various bits of conditional Alpha code and fixup a few comments.
Diffstat (limited to 'sys/pci')
-rw-r--r-- | sys/pci/agp.c | 10 | ||||
-rw-r--r-- | sys/pci/if_pcnreg.h | 5 | ||||
-rw-r--r-- | sys/pci/if_sfreg.h | 5 | ||||
-rw-r--r-- | sys/pci/if_stereg.h | 5 | ||||
-rw-r--r-- | sys/pci/if_tl.c | 4 | ||||
-rw-r--r-- | sys/pci/if_tlreg.h | 5 | ||||
-rw-r--r-- | sys/pci/if_vrreg.h | 6 | ||||
-rw-r--r-- | sys/pci/if_wbreg.h | 5 | ||||
-rw-r--r-- | sys/pci/ncr.c | 6 |
9 files changed, 0 insertions, 51 deletions
diff --git a/sys/pci/agp.c b/sys/pci/agp.c index a0deb5f..b4ef386 100644 --- a/sys/pci/agp.c +++ b/sys/pci/agp.c @@ -90,12 +90,6 @@ agp_flush_cache() #if defined(__i386__) || defined(__amd64__) wbinvd(); #endif -#ifdef __alpha__ - /* FIXME: This is most likely not correct as it doesn't flush CPU - * write caches, but we don't have a facility to do that and - * this is all linux does, too */ - alpha_mb(); -#endif } u_int8_t @@ -507,10 +501,6 @@ agp_generic_bind_memory(device_t dev, struct agp_memory *mem, /* * Bind the individual pages and flush the chipset's * TLB. - * - * XXX Presumably, this needs to be the pci address on alpha - * (i.e. use alpha_XXX_dmamap()). I don't have access to any - * alpha AGP hardware to check. */ VM_OBJECT_LOCK(mem->am_obj); for (i = 0; i < mem->am_size; i += PAGE_SIZE) { diff --git a/sys/pci/if_pcnreg.h b/sys/pci/if_pcnreg.h index 84e4a3f..0b27b18 100644 --- a/sys/pci/if_pcnreg.h +++ b/sys/pci/if_pcnreg.h @@ -531,8 +531,3 @@ struct pcn_softc { #define PCN_PSTATE_D3 0x0003 #define PCN_PME_EN 0x0010 #define PCN_PME_STATUS 0x8000 - -#ifdef __alpha__ -#undef vtophys -#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)va) -#endif diff --git a/sys/pci/if_sfreg.h b/sys/pci/if_sfreg.h index 652f804..9b3826d 100644 --- a/sys/pci/if_sfreg.h +++ b/sys/pci/if_sfreg.h @@ -1056,8 +1056,3 @@ struct sf_softc { #define SF_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->sf_mtx, MA_OWNED) #define SF_TIMEOUT 1000 - -#ifdef __alpha__ -#undef vtophys -#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)va) -#endif diff --git a/sys/pci/if_stereg.h b/sys/pci/if_stereg.h index eab51640..e1e242a 100644 --- a/sys/pci/if_stereg.h +++ b/sys/pci/if_stereg.h @@ -547,8 +547,3 @@ struct ste_mii_frame { #define STE_MII_READOP 0x02 #define STE_MII_WRITEOP 0x01 #define STE_MII_TURNAROUND 0x02 - -#ifdef __alpha__ -#undef vtophys -#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)va) -#endif diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c index b06ae6a6..b5e18746 100644 --- a/sys/pci/if_tl.c +++ b/sys/pci/if_tl.c @@ -1441,10 +1441,6 @@ tl_newbuf(sc, c) if (m_new == NULL) return(ENOBUFS); -#ifdef __alpha__ - m_new->m_data += 2; -#endif - c->tl_mbuf = m_new; c->tl_next = NULL; c->tl_ptr->tlist_frsize = MCLBYTES; diff --git a/sys/pci/if_tlreg.h b/sys/pci/if_tlreg.h index 7f3dfb9..0aa50d3 100644 --- a/sys/pci/if_tlreg.h +++ b/sys/pci/if_tlreg.h @@ -589,8 +589,3 @@ struct tl_stats { */ #define EEPROM_CTL_READ 0xA1 /* 0101 0001 */ #define EEPROM_CTL_WRITE 0xA0 /* 0101 0000 */ - -#ifdef __alpha__ -#undef vtophys -#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)va) -#endif diff --git a/sys/pci/if_vrreg.h b/sys/pci/if_vrreg.h index 1ef3756..7caab56 100644 --- a/sys/pci/if_vrreg.h +++ b/sys/pci/if_vrreg.h @@ -589,9 +589,3 @@ struct vr_softc { #define VR_PSTATE_D3 0x0003 #define VR_PME_EN 0x0010 #define VR_PME_STATUS 0x8000 - - -#ifdef __alpha__ -#undef vtophys -#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)va) -#endif diff --git a/sys/pci/if_wbreg.h b/sys/pci/if_wbreg.h index 8a5b2cd..44a9d75 100644 --- a/sys/pci/if_wbreg.h +++ b/sys/pci/if_wbreg.h @@ -461,8 +461,3 @@ struct wb_softc { #define WB_PSTATE_D3 0x0003 #define WB_PME_EN 0x0010 #define WB_PME_STATUS 0x8000 - -#ifdef __alpha__ -#undef vtophys -#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)va) -#endif diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c index 1520c10..bdbc44f 100644 --- a/sys/pci/ncr.c +++ b/sys/pci/ncr.c @@ -278,12 +278,6 @@ __FBSDID("$FreeBSD$"); **========================================================== */ -#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)) |