From: Alan Cox <alan@linux.intel.com>
Date: Tue, 30 Aug 2016 20:20:24 +0000 (+0100)
Subject: v68: fix udata naming
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=19f1aa1b6eb6c9bce562d8df8cb20e1417b1ace8;p=FUZIX.git

v68: fix udata naming
---

diff --git a/Kernel/platform-v68/crt0.S b/Kernel/platform-v68/crt0.S
index 959abcd4..2c415e80 100644
--- a/Kernel/platform-v68/crt0.S
+++ b/Kernel/platform-v68/crt0.S
@@ -24,9 +24,9 @@ wipebss:
 		dbra d0,wipebss
 
 		/* FIXME: hard coded ugly */
-		move.l #uarea_block+508,a7
-		/* uarea global */
-		move.l #uarea_block,a5
+		move.l #udata_block+508,a7
+		/* udata global */
+		move.l #udata_block,a5
 		bsr init_early
 		bsr init_hardware
 		bsr fuzix_main
diff --git a/Kernel/platform-v68/main.c b/Kernel/platform-v68/main.c
index 97b47d3c..fa168320 100644
--- a/Kernel/platform-v68/main.c
+++ b/Kernel/platform-v68/main.c
@@ -28,7 +28,7 @@ void map_init(void)
 {
 }
 
-u_block uarea_block[PTABSIZE];
+u_block udata_block[PTABSIZE];
 uaddr_t ramtop;
 uint8_t *membase[PTABSIZE];
 uint8_t need_resched;
@@ -53,7 +53,7 @@ const uint16_t buddy_level[BUDDY_NUMLEVEL] = {
 int16_t dofork(ptptr p)
 {
 	/* Child and parent udata pointers */
-	struct u_data *uc = &uarea_block[p - ptab].u_d;
+	struct u_data *uc = &udata_block[p - ptab].u_d;
 	struct u_data *up = udata_ptr;
 	uint32_t *csp = (uint32_t *)(uc + 1);
 	uint32_t *psp = up->u_sp;
diff --git a/Kernel/platform-v68/p68000.S b/Kernel/platform-v68/p68000.S
index 88a06cd3..773df5ff 100644
--- a/Kernel/platform-v68/p68000.S
+++ b/Kernel/platform-v68/p68000.S
@@ -8,7 +8,7 @@
 		.globl program_vectors
 		.globl outchar
 		.globl trap_monitor
-		.globl uarea_block
+		.globl udata_block
 
 .mri 1
 trap_reboot:
@@ -17,8 +17,8 @@ trap_monitor:
 	    bra trap_monitor
 
 init_early:
-	    lea.l uarea_block,a5	; udata ptr
-	    move.l a5,uarea_shadow	; shadow copy for entry/exit
+	    lea.l udata_block,a5	; udata ptr
+	    move.l a5,udata_shadow	; shadow copy for entry/exit
             rts
 
 ;
@@ -72,8 +72,8 @@ timer_irq:
 	    movem.l a0-a6/d0-d7,-(a7)
 	    move.l #intmsg,a0
 	    bsr outstring
-	    move.l uarea_shadow,a5	; set up the register global
-	    bsr platform_interrupt
+	    move.l udata_shadow,a5	; set up the register global
+	    jsr platform_interrupt
 	    move.b $00F04000,d0		; Re-enable
 	    movem.l (a7)+,a0-a6/d0-d7
 	    rte