X-Git-Url: http://cloudbase.mooo.com/gitweb/avrcpm.git/blobdiff_plain/a7b795ca288038b9b99c6afe5d15cf2ddd4dac3f..d8fa6a36ffba80be398c90641b3e7e7a79d56d43:/avr/mmc.asm

diff --git a/avr/mmc.asm b/avr/mmc.asm
index f43af1c..38fdfe0 100644
--- a/avr/mmc.asm
+++ b/avr/mmc.asm
@@ -57,13 +57,20 @@
 #define	RES_NOTRDY	3	/* 3: Not Ready */
 #define	RES_PARERR	4	/* 4: Invalid Parameter */
 
+
+#define SPI_MODE_0	(0<<CPOL)|(0<<CPHA)
+#define SPI_MODE_1	(0<<CPOL)|(1<<CPHA)
+#define SPI_MODE_2	(1<<CPOL)|(0<<CPHA)
+#define SPI_MODE_3	(1<<CPOL)|(1<<CPHA)
+#define SPI_MODE	SPI_MODE_0
+
 ;------------------------------------------------
 ; 
 .macro	spi_clkslow
 .if MMC_DEBUG > 1
 	printstring	"SPI_CLK_SLOW "
 .endif
-	ldi	temp,(1<<SPE)|(1<<MSTR)|(1<<SPR1)|(1<<SPR0)	;clk/128
+	ldi	temp,SPI_MODE|(1<<SPE)|(1<<MSTR)|(1<<SPR1)|(1<<SPR0)	;clk/128
 	out	SPCR,temp
 	out	SPSR,_0
 .endm
@@ -74,7 +81,7 @@
 .if MMC_DEBUG > 1
 	printstring	"SPI_CLK_FAST "
 .endif
-	ldi	temp,(1<<SPE)|(1<<MSTR)			;clk/4
+	ldi	temp,SPI_MODE|(1<<SPE)|(1<<MSTR)			;clk/4
 	out	SPCR,temp
 #if MMC_SPI2X
 	ldi	temp,(1<<SPI2X)
@@ -564,6 +571,11 @@ mmc_rcv_dbg1:
 	brne	mmc_rdex
 	
 	rcall	spi_rcvr		;Shift in first byte.
+.if MMC_DEBUG > 3
+	printnewline
+	rcall	printhex
+	printstring	" "
+.endif
 	out	SPDR,_255		;Start shift in next byte.
 mmc_rcv_rl:
 	sbiw	yl,1
@@ -571,11 +583,18 @@ mmc_rcv_rl:
 	st	z+,temp
 	spi_waitm
 	in	temp,SPDR
+.if MMC_DEBUG > 3
+	rcall	printhex
+	printstring	" "
+.endif
 	out	SPDR,_255
 	rjmp	mmc_rcv_rl
 
 mmc_rcv_rle:
 	st	z+,temp			;Store last byte in buffer 
+.if MMC_DEBUG > 3
+	printnewline
+.endif
 	rcall	spi_wait		;      while SPI module shifts in crc part1.
 	rcall	spi_rcvr		;Read second crc.