From: Tormod Volden <debian.tormod@gmail.com>
Date: Tue, 3 Nov 2015 23:15:40 +0000 (+0100)
Subject: dragon-nx32: More SPI fixes
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=fa01f800033ce438a4332fb2aba71225af77defb;p=FUZIX.git

dragon-nx32: More SPI fixes

In particular, spaces in assembly operands are bad since the
assembler believes everything after a space is comments.

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
---

diff --git a/Kernel/platform-dragon-nx32/kernel.def b/Kernel/platform-dragon-nx32/kernel.def
index a10a5d91..09a171ba 100644
--- a/Kernel/platform-dragon-nx32/kernel.def
+++ b/Kernel/platform-dragon-nx32/kernel.def
@@ -12,10 +12,10 @@ IDEDATA			    equ 0xFF50
 IDEDATA_L		    equ 0xFF58
 
 SPIDATA			    equ 0xFF6C
-SPISTATUS		    equ SPIDATA + 1
+SPISTATUS		    equ SPIDATA+1
 SPICTRL			    equ SPISTATUS
-SPICLK			    equ SPICTRL + 1
-SPISIE			    equ SPICLK + 1
+SPICLK			    equ SPICTRL+1
+SPISIE			    equ SPICLK+1
 
 SPICS			    equ 0x01	     ; hardcode SEL0 for now
 
diff --git a/Kernel/platform-dragon-nx32/spi.s b/Kernel/platform-dragon-nx32/spi.s
index 3951f8ab..816f87e2 100644
--- a/Kernel/platform-dragon-nx32/spi.s
+++ b/Kernel/platform-dragon-nx32/spi.s
@@ -27,13 +27,13 @@ _spi_setup:
 	lda #0x0F
 	sta SPISIE		; selects off, IRQs off
 	cmpa SPISIE
-	beq nospi
+	bne nospi
 	lda SPIDATA		; clear TC
 	lda SPISTATUS
-	bpl nospi 		; TC not clear -> no spi present
+	bmi nospi 		; TC not clear -> no spi present
 	sta SPIDATA		; start a transmit, TC should now be clear
 	lda SPISTATUS
-	bmi spigood
+	bpl spigood
 nospi:	clrb
 	rts
 spigood:
@@ -56,13 +56,13 @@ clkset:	std SPICTRL
 ;
 ;	For multiple cards these need to look at the card #
 ;
-_sd_spi_lower_cs:
+_sd_spi_raise_cs:
 	lda SPISIE
 	ora #SPICS
 	sta SPISIE
 	rts
 
-_sd_spi_raise_cs:
+_sd_spi_lower_cs:
 	lda SPISIE
 	anda #0xFF-SPICS
 	sta SPISIE