Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Basic G2 locking implemented.

Browse Source
This commit is contained in:
marcus 2001-01-31 21:58:37 +00:00
parent 6cbf8eaac7
commit f2358f8d43
1 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: g2bus_bus_mem.c,v 1.1 2001/01/31 18:33:24 thorpej Exp $ */ /* $NetBSD: g2bus_bus_mem.c,v 1.2 2001/01/31 21:58:37 marcus Exp $ */
/*- /*-
* Copyright (c) 2001 The NetBSD Foundation, Inc. * Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -53,8 +53,7 @@
#include <machine/cpu.h> #include <machine/cpu.h>
#include <machine/bus.h> #include <machine/bus.h>
#include <machine/cpufunc.h>
#include <dev/pci/pcivar.h>
#include <dreamcast/dev/g2/g2busvar.h> #include <dreamcast/dev/g2/g2busvar.h>
@ -112,16 +111,35 @@ g2bus_bus_mem_unmap(void *v, bus_space_handle_t sh, bus_size_t size)
} }
/* /*
* XXX NEED TO ADD THE LOCKING STUFF THAT MARCUS MENTIONED! * G2 bus cycles must not be interrupted by IRQs or G2 DMA.
* The following paired macros will take the necessary precautions.
*/ */
#define G2_LOCK \
do { \
disable_intr(); \
/* suspend any G2 DMA here... */ \
while((*(volatile unsigned int *)0xa05f688c) & 32); \
} while(0)
#define G2_UNLOCK \
do { \
/* resume any G2 DMA here... */ \
enable_intr(); \
} while(0)
u_int8_t u_int8_t
g2bus_bus_mem_read_1(void *v, bus_space_handle_t sh, bus_size_t off) g2bus_bus_mem_read_1(void *v, bus_space_handle_t sh, bus_size_t off)
{ {
u_int8_t rv; u_int8_t rv;
G2_LOCK;
rv = *(u_int8_t *)(sh + off); rv = *(u_int8_t *)(sh + off);
G2_UNLOCK;
return (rv); return (rv);
} }
@ -130,8 +148,12 @@ g2bus_bus_mem_read_2(void *v, bus_space_handle_t sh, bus_size_t off)
{ {
u_int16_t rv; u_int16_t rv;
G2_LOCK;
rv = *(u_int16_t *)(sh + off); rv = *(u_int16_t *)(sh + off);
G2_UNLOCK;
return (rv); return (rv);
} }
@ -140,8 +162,12 @@ g2bus_bus_mem_read_4(void *v, bus_space_handle_t sh, bus_size_t off)
{ {
u_int32_t rv; u_int32_t rv;
G2_LOCK;
rv = *(u_int32_t *)(sh + off); rv = *(u_int32_t *)(sh + off);
G2_UNLOCK;
return (rv); return (rv);
} }
@ -150,7 +176,11 @@ g2bus_bus_mem_write_1(void *v, bus_space_handle_t sh, bus_size_t off,
u_int8_t val) u_int8_t val)
{ {
G2_LOCK;
*(u_int8_t *)(sh + off) = val; *(u_int8_t *)(sh + off) = val;
G2_UNLOCK;
} }
void void
@ -158,7 +188,11 @@ g2bus_bus_mem_write_2(void *v, bus_space_handle_t sh, bus_size_t off,
u_int16_t val) u_int16_t val)
{ {
G2_LOCK;
*(u_int16_t *)(sh + off) = val; *(u_int16_t *)(sh + off) = val;
G2_UNLOCK;
} }
void void
@ -166,5 +200,9 @@ g2bus_bus_mem_write_4(void *v, bus_space_handle_t sh, bus_size_t off,
u_int32_t val) u_int32_t val)
{ {
G2_LOCK;
*(u_int32_t *)(sh + off) = val; *(u_int32_t *)(sh + off) = val;
G2_UNLOCK;
} }