mirror/gc_n64_usb-v3
1
0
Fork 0
mirror of https://github.com/raphnet/gc_n64_usb-v3 synced 2024-12-21 23:08:53 -05:00
Code Issues Releases Wiki Activity

Update gcn64 receiver for large packets (33 bytes)

Browse Source
This commit is contained in:
Raphael Assenat 2015-08-23 02:50:16 -04:00
parent 8b9789c055
commit 332e302b6f
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gcn64_protocol.c
View File

@ -22,7 +22,7 @@
#undef FORCE_KEYBOARD #undef FORCE_KEYBOARD
#define GCN64_BUF_SIZE 300 #define GCN64_BUF_SIZE 600
static volatile unsigned char gcn64_workbuf[GCN64_BUF_SIZE]; static volatile unsigned char gcn64_workbuf[GCN64_BUF_SIZE];
/******** IO port definitions and options **************/ /******** IO port definitions and options **************/
@ -109,9 +109,9 @@ void gcn64_protocol_getBytes(int offset, int n_bytes, unsigned char *dstbuf)
#define TIMING_OFFSET 100 // gives about 12uS. Twice the expected maximum bit period. #define TIMING_OFFSET 100 // gives about 12uS. Twice the expected maximum bit period.
#endif #endif
static unsigned char gcn64_receive() static unsigned int gcn64_receive()
{ {
register unsigned char count=0; register unsigned int count=0;
#define SET_DBG " nop\n" #define SET_DBG " nop\n"
#define CLR_DBG " nop\n" #define CLR_DBG " nop\n"
@ -125,8 +125,9 @@ static unsigned char gcn64_receive()
asm volatile( asm volatile(
" push r30 \n" // save Z " push r30 \n" // save Z
" push r31 \n" // save Z " push r31 \n" // save Z
" clr r27 \n" // clear X (%0)
" clr %0 \n" " clr r26 \n"
" clr r16 \n" " clr r16 \n"
"initial_wait_low:\n" "initial_wait_low:\n"
" inc r16 \n" " inc r16 \n"
@ -144,8 +145,8 @@ static unsigned char gcn64_receive()
" brmi timeout \n" // > 127 (approx 50uS timeout) " brmi timeout \n" // > 127 (approx 50uS timeout)
" sbic %2, "GCN64_BIT_NUM_S" \n" " sbic %2, "GCN64_BIT_NUM_S" \n"
" rjmp waitlow_lp \n" " rjmp waitlow_lp \n"
" inc %0 \n" // count this timed low level " adiw %0, 1 \n" // count this timed low level
" breq overflow \n" // > 255 " breq overflow \n" // > 255
" st z+,r16 \n" " st z+,r16 \n"
@ -156,8 +157,8 @@ static unsigned char gcn64_receive()
" brmi timeout \n" // > 127 " brmi timeout \n" // > 127
" sbis %2, "GCN64_BIT_NUM_S" \n" " sbis %2, "GCN64_BIT_NUM_S" \n"
" rjmp waithigh_lp \n" " rjmp waithigh_lp \n"
" adiw %0, 1 \n" // count this timed high level
" inc %0 \n" // count this timed high level
" breq overflow \n" // > 255 " breq overflow \n" // > 255
" st z+,r16 \n" " st z+,r16 \n"
@ -168,12 +169,12 @@ static unsigned char gcn64_receive()
" pop r31 \n" // restore z " pop r31 \n" // restore z
" pop r30 \n" // restore z " pop r30 \n" // restore z
: "=&r" (count) // %0 : "=&x" (count) // %0
: "z" ((unsigned char volatile *)gcn64_workbuf), // %1 : "z" ((unsigned char volatile *)gcn64_workbuf), // %1
"I" (_SFR_IO_ADDR(GCN64_DATA_PIN)), // %2 "I" (_SFR_IO_ADDR(GCN64_DATA_PIN)), // %2
"I" (_SFR_IO_ADDR(PORTB)), // %3 "I" (_SFR_IO_ADDR(PORTB)), // %3
"M" (TIMING_OFFSET) // %4 "M" (TIMING_OFFSET) // %4
: "r16" : "r16","memory"
); );
return count; return count;
@ -295,9 +296,9 @@ static void gcn64_sendBytes(unsigned char *data, unsigned char n_bytes)
* The result is in workbuf. * The result is in workbuf.
* *
**/ **/
static void gcn64_decodeWorkbuf(unsigned char count) static void gcn64_decodeWorkbuf(unsigned int count)
{ {
unsigned char i; unsigned int i;
volatile unsigned char *output = gcn64_workbuf; volatile unsigned char *output = gcn64_workbuf;
volatile unsigned char *input = gcn64_workbuf; volatile unsigned char *input = gcn64_workbuf;
unsigned char t; unsigned char t;