Module Name: src
Committed By: rkujawa
Date: Mon Nov 19 22:32:48 UTC 2012
Modified Files:
src/sys/arch/amiga/amiga: amiga_bus_simple_1word.c
Log Message:
Add support for byteswapping of bsr2/bsw2. Needed for X-Surf IDE (incoming).
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amiga/amiga/amiga_bus_simple_1word.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/amiga/amiga/amiga_bus_simple_1word.c
diff -u src/sys/arch/amiga/amiga/amiga_bus_simple_1word.c:1.7 src/sys/arch/amiga/amiga/amiga_bus_simple_1word.c:1.8
--- src/sys/arch/amiga/amiga/amiga_bus_simple_1word.c:1.7 Sun Feb 12 16:34:06 2012
+++ src/sys/arch/amiga/amiga/amiga_bus_simple_1word.c Mon Nov 19 22:32:48 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: amiga_bus_simple_1word.c,v 1.7 2012/02/12 16:34:06 matt Exp $ */
+/* $NetBSD: amiga_bus_simple_1word.c,v 1.8 2012/11/19 22:32:48 rkujawa Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include <machine/pte.h>
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: amiga_bus_simple_1word.c,v 1.7 2012/02/12 16:34:06 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: amiga_bus_simple_1word.c,v 1.8 2012/11/19 22:32:48 rkujawa Exp $");
#define AMIGA_SIMPLE_BUS_STRIDE 1 /* 1 byte per byte */
#define AMIGA_SIMPLE_BUS_WORD_METHODS
@@ -44,6 +44,8 @@ __KERNEL_RCSID(1, "$NetBSD: amiga_bus_si
#include "simple_busfuncs.c"
+bsr(oabs(bsr2_swap_), u_int16_t);
+bsw(oabs(bsw2_swap_), u_int16_t);
bsr(oabs(bsr4_swap_), u_int32_t);
bsw(oabs(bsw4_swap_), u_int32_t);
@@ -64,6 +66,30 @@ oabs(bsm_absolute_)(bus_space_tag_t tag,
}
/* ARGSUSED */
+u_int16_t
+oabs(bsr2_swap_)(bus_space_handle_t handle, bus_size_t offset)
+{
+ volatile u_int16_t *p;
+ u_int16_t x;
+
+ p = (volatile u_int16_t *)(handle + offset * AMIGA_SIMPLE_BUS_STRIDE);
+ x = *p;
+ amiga_bus_reorder_protect();
+ return bswap16(x);
+}
+
+/* ARGSUSED */
+void
+oabs(bsw2_swap_)(bus_space_handle_t handle, bus_size_t offset, unsigned value)
+{
+ volatile u_int16_t *p;
+
+ p = (volatile u_int16_t *)(handle + offset * AMIGA_SIMPLE_BUS_STRIDE);
+ *p = bswap16( (u_int16_t)value );
+ amiga_bus_reorder_protect();
+}
+
+/* ARGSUSED */
u_int32_t
oabs(bsr4_swap_)(bus_space_handle_t handle, bus_size_t offset)
{
@@ -185,8 +211,8 @@ const struct amiga_bus_space_methods ami
.bssr1 = oabs(bssr1_),
.bscr1 = oabs(bscr1_),
- .bsr2 = oabs(bsr2_), /* XXX swap? */
- .bsw2 = oabs(bsw2_), /* XXX swap? */
+ .bsr2 = oabs(bsr2_swap_),
+ .bsw2 = oabs(bsw2_swap_),
.bsrs2 = oabs(bsr2_),
.bsws2 = oabs(bsw2_),
.bsrm2 = oabs(bsrm2_swap_),
@@ -215,4 +241,3 @@ const struct amiga_bus_space_methods ami
.bssr4 = oabs(bssr4_), /* XXX swap? */
.bscr4 = oabs(bscr4_) /* XXX swap? */
};
-
