Download raw body.
remove arm bus_space_asm_generic.S
remove unused bus_space_asm_generic.S
diff --git sys/arch/arm/arm/bus_space_asm_generic.S sys/arch/arm/arm/bus_space_asm_generic.S
deleted file mode 100644
index 29c1fd3298f..00000000000
--- sys/arch/arm/arm/bus_space_asm_generic.S
+++ /dev/null
@@ -1,335 +0,0 @@
-/* $OpenBSD: bus_space_asm_generic.S,v 1.6 2026/05/25 01:56:50 jsg Exp $ */
-/* $NetBSD: bus_space_asm_generic.S,v 1.3 2003/03/27 19:46:14 mycroft Exp $ */
-
-/*
- * Copyright (c) 1997 Causality Limited.
- * Copyright (c) 1997 Mark Brinicombe.
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Mark Brinicombe
- * for the NetBSD Project.
- * 4. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * 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 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 <arm/asm.h>
-
-/*
- * Generic bus_space functions.
- */
-
-/*
- * read single
- */
-
-ENTRY(generic_bs_r_1)
- ldrb r0, [r1, r2]
- mov pc, lr
-
-ENTRY(generic_armv4_bs_r_2)
- ldrh r0, [r1, r2]
- mov pc, lr
-
-ENTRY(generic_bs_r_4)
- ldr r0, [r1, r2]
- mov pc, lr
-
-/*
- * write single
- */
-
-ENTRY(generic_bs_w_1)
- strb r3, [r1, r2]
- mov pc, lr
-
-ENTRY(generic_armv4_bs_w_2)
- strh r3, [r1, r2]
- mov pc, lr
-
-ENTRY(generic_bs_w_4)
- str r3, [r1, r2]
- mov pc, lr
-
-/*
- * read multiple
- */
-
-ENTRY(generic_bs_rm_1)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: ldrb r3, [r0]
- strb r3, [r1], #1
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-ENTRY(generic_armv4_bs_rm_2)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: ldrh r3, [r0]
- strh r3, [r1], #2
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-ENTRY(generic_bs_rm_4)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: ldr r3, [r0]
- str r3, [r1], #4
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-/*
- * write multiple
- */
-
-ENTRY(generic_bs_wm_1)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: ldrb r3, [r1], #1
- strb r3, [r0]
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-ENTRY(generic_armv4_bs_wm_2)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: ldrh r3, [r1], #2
- strh r3, [r0]
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-ENTRY(generic_bs_wm_4)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: ldr r3, [r1], #4
- str r3, [r0]
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-/*
- * read region
- */
-
-ENTRY(generic_bs_rr_1)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: ldrb r3, [r0], #1
- strb r3, [r1], #1
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-ENTRY(generic_armv4_bs_rr_2)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: ldrh r3, [r0], #2
- strh r3, [r1], #2
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-ENTRY(generic_bs_rr_4)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: ldr r3, [r0], #4
- str r3, [r1], #4
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-/*
- * write region.
- */
-
-ENTRY(generic_bs_wr_1)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: ldrb r3, [r1], #1
- strb r3, [r0], #1
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-ENTRY(generic_armv4_bs_wr_2)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: ldrh r3, [r1], #2
- strh r3, [r0], #2
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-ENTRY(generic_bs_wr_4)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: ldr r3, [r1], #4
- str r3, [r0], #4
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-/*
- * set region
- */
-
-ENTRY(generic_bs_sr_1)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: strb r1, [r0], #1
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-ENTRY(generic_armv4_bs_sr_2)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: strh r1, [r0], #2
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-ENTRY(generic_bs_sr_4)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-1: str r1, [r0], #4
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-/*
- * copy region
- */
-
-ENTRY(generic_armv4_bs_c_2)
- add r0, r1, r2
- ldr r2, [sp, #0]
- add r1, r2, r3
- ldr r2, [sp, #4]
- teq r2, #0
- moveq pc, lr
-
- cmp r0, r1
- blt 2f
-
-1: ldrh r3, [r0], #2
- strh r3, [r1], #2
- subs r2, r2, #1
- bne 1b
-
- mov pc, lr
-
-2: add r0, r0, r2, lsl #1
- add r1, r1, r2, lsl #1
- sub r0, r0, #2
- sub r1, r1, #2
-
-3: ldrh r3, [r0], #-2
- strh r3, [r1], #-2
- subs r2, r2, #1
- bne 3b
-
- mov pc, lr
diff --git sys/arch/arm/armv7/armv7_space.c sys/arch/arm/armv7/armv7_space.c
index 9d52adbea7c..99fe1d36e31 100644
--- sys/arch/arm/armv7/armv7_space.c
+++ sys/arch/arm/armv7/armv7_space.c
@@ -84,7 +84,6 @@
/* Prototypes for all the bus_space structure functions */
bs_protos(armv7);
-bs_protos(generic);
bs_protos(bs_notimpl);
struct bus_space armv7_bs_tag = {
diff --git sys/arch/arm/conf/files.arm sys/arch/arm/conf/files.arm
index 501ea00a3c0..f254fd498d8 100644
--- sys/arch/arm/conf/files.arm
+++ sys/arch/arm/conf/files.arm
@@ -30,8 +30,6 @@ device cpu {}
attach cpu at mainbus
# bus_space(9)
-define bus_space_generic
-file arch/arm/arm/bus_space_asm_generic.S
file arch/arm/arm/bus_space_notimpl.S
file arch/arm/arm/arm_machdep.c
remove arm bus_space_asm_generic.S