Module Name: src
Committed By: macallan
Date: Wed Nov 16 19:39:38 UTC 2016
Modified Files:
src/sys/arch/sgimips/sgimips: bus.c
Log Message:
reenable mips1-specific dmamem_sync method
clean up a bit while there
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/sgimips/sgimips/bus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sgimips/sgimips/bus.c
diff -u src/sys/arch/sgimips/sgimips/bus.c:1.68 src/sys/arch/sgimips/sgimips/bus.c:1.69
--- src/sys/arch/sgimips/sgimips/bus.c:1.68 Thu Jul 14 19:08:12 2016
+++ src/sys/arch/sgimips/sgimips/bus.c Wed Nov 16 19:39:38 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.c,v 1.68 2016/07/14 19:08:12 skrll Exp $ */
+/* $NetBSD: bus.c,v 1.69 2016/11/16 19:39:38 macallan Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.68 2016/07/14 19:08:12 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.69 2016/11/16 19:39:38 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -80,22 +80,17 @@ bus_space_tag_t normal_memt = NULL;
void
sgimips_bus_dma_init(void)
{
- printf("%s\n", __func__);
normal_bus_mem_init(&normal_mbst, NULL);
normal_memt = &normal_mbst;
-#if 0
+#ifdef MIPS1
switch (mach_type) {
/* R2000/R3000 */
- case MACH_SGI_IP6 | MACH_SGI_IP10:
+ case MACH_SGI_IP6 | MACH_SGI_IP10: /* same number... */
case MACH_SGI_IP12:
sgimips_default_bus_dma_tag._dmamap_ops.dmamap_sync =
_bus_dmamap_sync_mips1;
break;
-
- default:
- panic("sgimips_bus_dma_init: unsupported mach type IP%d\n",
- mach_type);
}
#endif
}
@@ -129,6 +124,7 @@ bus_space_read_1(bus_space_tag_t t, bus_
}
#endif
+#ifdef MIPS1
/* Common function from DMA map synchronization. May be called
* by chipset-specific DMA map synchronization functions.
*
@@ -230,24 +226,6 @@ _bus_dmamap_sync_mips1(bus_dma_tag_t t,
len -= minlen;
}
}
-
-#if 0
-paddr_t
-bus_space_mmap(bus_space_tag_t space, bus_addr_t addr, off_t off,
- int prot, int flags)
-{
-
- if (flags & BUS_SPACE_MAP_CACHEABLE) {
-
- return mips_btop(MIPS_KSEG0_TO_PHYS(addr) + off);
- } else
-#if defined(_MIPS_PADDR_T_64BIT) || defined(_LP64)
- return mips_btop((MIPS_KSEG1_TO_PHYS(addr) + off)
- | PGC_NOCACHE);
-#else
- return mips_btop((MIPS_KSEG1_TO_PHYS(addr) + off));
-#endif
-}
#endif
#define CHIP normal
