From 6482626f89155ce3f2ca4281485e653f34d42eb1 Mon Sep 17 00:00:00 2001
From: "Ronald G. Minnich" <rminnich@gmail.com>
Date: Tue, 21 Nov 2000 18:20:57 +0000
Subject: [PATCH] fixes to acer stuff

---
 src/northbridge/acer/m1631/chipset_init.inc |  4 +-
 src/northbridge/acer/m1631/raminit.inc      | 44 ++++++++++-----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/northbridge/acer/m1631/chipset_init.inc b/src/northbridge/acer/m1631/chipset_init.inc
index 1708b878cf..de339ff9fc 100644
--- a/src/northbridge/acer/m1631/chipset_init.inc
+++ b/src/northbridge/acer/m1631/chipset_init.inc
@@ -62,9 +62,9 @@ register_table:
 	.byte 0xfe, 0xff, 0x08
 	.byte 0xff, 0x00, 0x03
 	.byte 0x60,~0x20, 0x20
-	.byte 0x02,~0xff, 0x21
+	.byte 0x02, 0x00, 0x21
 	.byte 0x60,~0x20, 0x00
-	.byte 0xfb,~0xff, 0x31
+	.byte 0xfb, 0x00, 0x31
 	.byte 0x0 /* end of table */
 chipsetinit_start:
 
diff --git a/src/northbridge/acer/m1631/raminit.inc b/src/northbridge/acer/m1631/raminit.inc
index d1b7d6befa..85e7c9fb90 100644
--- a/src/northbridge/acer/m1631/raminit.inc
+++ b/src/northbridge/acer/m1631/raminit.inc
@@ -4,7 +4,7 @@
  ***/
 
 /***
-/*** BEGIN TABLES
+ *** BEGIN TABLES
  ***/
 dram_temp :
 	.byte 0x6c
@@ -136,11 +136,11 @@ internal_bank_tbl:
 
 #define save_dram_type \
 	mov	%sp,%di		; \
-	mov	%si,%ax		; \
-	subw	$dram_temp, %ax ; \
+	mov	%esi,%eax		; \
+	subl	$dram_temp, %eax ; \
 	mov	$2,%dl		; \
 	mul	%dl		; \
-	add	$0x94,%ax	; \
+	addl	$0x94,%eax	; \
 	test	$0x10,%ch	; \
 	jnz 9f ; \
 	add	%ch,%al		; \
@@ -318,10 +318,10 @@ dram_type_detect_end:		; \
 	;; \
 	test	$0x40000,%ebx	; \
 	jnz	vc_sdram_table	; \
-	movw	$ma_table, %si
+	movl	$ma_table, %esi ; \
 	jmp	detect_ma	; \
 vc_sdram_table:			; \
-	movw	$vc_ma_table,%si
+	movl	$vc_ma_table,%esi ; \
 detect_ma:			; \
 	add	%ax,%si		; \
 	mov	(%esi),%edx	; \
@@ -332,9 +332,9 @@ detect_ma:			; \
 	jz	1f	; \
 	jmp    ma_detect_end ; \
 1:		; \
-	movw	$ma_table,%si	; \
+	movl	$ma_table,%esi	; \
 	add	%ax,%si	; \
-	mov	$ma_table+4,%dl ; \
+	mov	4(%esi),%dl ; \
 	test	$0x10000,%ebx	; \
 	jz	1f	; \
 	xor	%ecx,%ecx	; \
@@ -466,7 +466,7 @@ what_memory_ma:			; \
 	mov	$4,%dl		; \
 	mul	%dl		; \
 	mov	%si,%di		; \
-	movw	$internal_bank_tbl, %si ; \
+	movl	$internal_bank_tbl, %esi ; \
 	add	%ax,%si		; \
 	movl	(%esi),%edx	; \
 	mov	%edx,%esi	; \
@@ -494,27 +494,27 @@ configure_internal_bank_end:
 	mov	%cl,%dl		; \
 	and	$0x0f,%dl	; \
 	mul	%dl		; \
-		movw $sizing_table,%si ; \
+	movl $sizing_table,%esi ; \
 	addw	%ax,%si		; \
-	mov	$sizing_table+8,%dl	; \
-	mov	$sizing_table+8,%dh	; \
+	mov	8(%esi),%dl	; \
+	mov	8(%esi),%dh	; \
 	ror	$16,%edx	; \
-	mov	$sizing_table+9,%dl	; \
+	mov	9(%esi),%dl	; \
 	rol	$16,%edx	; \
 	mov	%esi,%eax	; \
 	mov	%eax,%esi	; \
 memory_sizing_loop:		; \
 	cmp	%dl,%dh		; \
 	jz	1f ; \
-	cmpl	$0x0aaaaaaaa,%es:(0) ; \
+	cmpl	$0x0aaaaaaaa,0(%esi) ; \
 	jz	1f		; \
 	memory_error		; \
 	mov	%di,%si		; \
 	jmp	 prepare_next_detect ; \
 1:		; \
-	movl	$0x55555555,%es:(0) ; \
-	movl	$0x0aaaaaaaa,%es:(%esi)	; \
-	cmpl	$0x55555555,%es:(0) ; \
+	movl	$0x55555555,0(%esi) ; \
+	movl	$0x0aaaaaaaa,0(%esi)	; \
+	cmpl	$0x55555555,0(%esi) ; \
 	jz	determine_size	; \
 	cmp	$0,%dl		; \
 	jnz	1f ; \
@@ -546,10 +546,10 @@ find_memory_size_offset:	; \
 	inc	%dx		; \
 	jmp	find_memory_size_offset	; \
 1:		; \
-	movw $memory_size,%si	; \
+	movl    $memory_size,%esi	; \
 	addw	%dx,%si		; \
 	mov	$0,%dx		; \
-	orb	$memory_size,%dl	; \
+	orb	0(%esi),%dl	; \
 	or	%dx,%bx		; \
 	mov	%di,%si		; \
 	test	$0x10000,%ebx	; \
@@ -586,7 +586,7 @@ EDO_T:				; \
 
 
 #define CONFIGURE_MEMORY \
-	movw	$dram_temp,%si ; \
+	movl	$dram_temp,%esi ; \
 	mov     (%esi),%dl	; \
 	mov	$0x094,%bl	; \
 configure_next:			; \
@@ -624,7 +624,7 @@ configure_next:			; \
 
 
 /***
-/*** START REAL STUFF
+ *** START REAL STUFF
  ***/
 	mov	$0x81,%ax
 	mov	(0b01111111 << 8)+0b00000000,%cx
@@ -636,7 +636,7 @@ configure_next:			; \
 	mov	(0b11111110 << 8)+0b00000000,%cx
 	pci_read_write_byte
 
-	movw	$dram_temp,%si
+	movl	$dram_temp,%esi
 	xor	%ecx,%ecx
 	xor	%ebx,%ebx
 detect_block_again: