--- trunk/src/devices/dev_gc.c	2007/10/08 16:22:56	44
+++ trunk/src/devices/dev_openpic.c	2007/10/13 15:05:59	63
@@ -24,9 +24,10 @@
  *  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  *  SUCH DAMAGE.
  *   
- *  $Id: dev_gc.c,v 1.14 2007/09/11 21:42:52 debug Exp $
+ *  $Id: dev_openpic.c,v 1.14 2007/09/11 21:42:52 debug Exp $
  *  
- *  COMMENT: Grand Central Interrupt controller (used by MacPPC)
+ *  COMMENT: OpenPIC Interrupt controller (used by sandpoint ppc)
+ *  based on dev_openpic.c
  */
 
 #include <stdio.h>
@@ -40,9 +41,9 @@
 #include "misc.h"
 
 
-#define	DEV_GC_LENGTH		0x100
+#define	DEV_OPENPIC_LENGTH		0x40000
 
-struct gc_data {
+struct openpic_data {
 	struct interrupt cpu_irq;
 
 	uint32_t	status_hi;
@@ -52,39 +53,39 @@
 };
 
 
-void gc_hi_interrupt_assert(struct interrupt *interrupt)
+void openpic_hi_interrupt_assert(struct interrupt *interrupt)
 {
-	struct gc_data *d = interrupt->extra;
+	struct openpic_data *d = interrupt->extra;
 	d->status_hi |= interrupt->line;
 	if (d->status_lo & d->enable_lo || d->status_hi & d->enable_hi)
 		INTERRUPT_ASSERT(d->cpu_irq);
 }
-void gc_hi_interrupt_deassert(struct interrupt *interrupt)
+void openpic_hi_interrupt_deassert(struct interrupt *interrupt)
 {
-	struct gc_data *d = interrupt->extra;
+	struct openpic_data *d = interrupt->extra;
 	d->status_hi &= ~interrupt->line;
 	if (!(d->status_lo & d->enable_lo || d->status_hi & d->enable_hi))
 		INTERRUPT_DEASSERT(d->cpu_irq);
 }
-void gc_lo_interrupt_assert(struct interrupt *interrupt)
+void openpic_lo_interrupt_assert(struct interrupt *interrupt)
 {
-	struct gc_data *d = interrupt->extra;
+	struct openpic_data *d = interrupt->extra;
 	d->status_lo |= interrupt->line;
 	if (d->status_lo & d->enable_lo || d->status_hi & d->enable_hi)
 		INTERRUPT_ASSERT(d->cpu_irq);
 }
-void gc_lo_interrupt_deassert(struct interrupt *interrupt)
+void openpic_lo_interrupt_deassert(struct interrupt *interrupt)
 {
-	struct gc_data *d = interrupt->extra;
+	struct openpic_data *d = interrupt->extra;
 	d->status_lo &= ~interrupt->line;
 	if (!(d->status_lo & d->enable_lo || d->status_hi & d->enable_hi))
 		INTERRUPT_DEASSERT(d->cpu_irq);
 }
 
 
-DEVICE_ACCESS(gc)
+DEVICE_ACCESS(openpic)
 {
-	struct gc_data *d = extra;
+	struct openpic_data *d = extra;
 	uint64_t idata = 0, odata = 0;
 
 	if (writeflag == MEM_WRITE)
@@ -191,11 +192,11 @@
 		break;
 
 	default:if (writeflag == MEM_WRITE) {
-			fatal("[ gc: unimplemented write to "
+			fatal("[ openpic: unimplemented write to "
 			    "offset 0x%x: data=0x%x ]\n", (int)
 			    relative_addr, (int)idata);
 		} else {
-			fatal("[ gc: unimplemented read from "
+			fatal("[ openpic: unimplemented read from "
 			    "offset 0x%x ]\n", (int)relative_addr);
 		}
 	}
@@ -207,13 +208,13 @@
 }
 
 
-DEVINIT(gc)
+DEVINIT(openpic)
 {
-	struct gc_data *d;
+	struct openpic_data *d;
 	int i;
 
-	CHECK_ALLOCATION(d = malloc(sizeof(struct gc_data)));
-	memset(d, 0, sizeof(struct gc_data));
+	CHECK_ALLOCATION(d = malloc(sizeof(struct openpic_data)));
+	memset(d, 0, sizeof(struct openpic_data));
 
 	/*  Connect to the CPU interrupt pin:  */
 	INTERRUPT_CONNECT(devinit->interrupt_path, d->cpu_irq);
@@ -224,29 +225,29 @@
 	for (i=0; i<32; i++) {
 		struct interrupt template;
 		char n[300];
-		snprintf(n, sizeof(n), "%s.gc.lo.%i",
+		snprintf(n, sizeof(n), "%s.openpic.lo.%i",
 		    devinit->interrupt_path, i);
 		memset(&template, 0, sizeof(template));
 		template.line = 1 << i;
 		template.name = n;
 		template.extra = d;
-		template.interrupt_assert = gc_lo_interrupt_assert;
-		template.interrupt_deassert = gc_lo_interrupt_deassert;
+		template.interrupt_assert = openpic_lo_interrupt_assert;
+		template.interrupt_deassert = openpic_lo_interrupt_deassert;
 		interrupt_handler_register(&template);
 
-		snprintf(n, sizeof(n), "%s.gc.hi.%i",
+		snprintf(n, sizeof(n), "%s.openpic.hi.%i",
 		    devinit->interrupt_path, i);
 		memset(&template, 0, sizeof(template));
 		template.line = 1 << i;
 		template.name = n;
 		template.extra = d;
-		template.interrupt_assert = gc_hi_interrupt_assert;
-		template.interrupt_deassert = gc_hi_interrupt_deassert;
+		template.interrupt_assert = openpic_hi_interrupt_assert;
+		template.interrupt_deassert = openpic_hi_interrupt_deassert;
 		interrupt_handler_register(&template);
 	}
 
-	memory_device_register(devinit->machine->memory, "gc",
-	    devinit->addr, DEV_GC_LENGTH, dev_gc_access, d, DM_DEFAULT, NULL);
+	memory_device_register(devinit->machine->memory, "openpic",
+	    devinit->addr, DEV_OPENPIC_LENGTH, dev_openpic_access, d, DM_DEFAULT, NULL);
 
 	return 1;
 }