diff options
| author | H. Nikolaus Schaller <hns@goldelico.com> | 2012-10-03 21:17:47 +0200 |
|---|---|---|
| committer | H. Nikolaus Schaller <hns@goldelico.com> | 2012-10-03 21:17:47 +0200 |
| commit | 3fee3af1bc6a56c8e4df59fc7b5644c0ea957837 (patch) | |
| tree | 7ffdc08d6474ecb6597bfae7ca02d66c3ae0f1b1 /u-boot/board/goldelico/gta04b2/trf7960.c | |
| parent | abbbee6c9163ea177d4c3681c182293d66203329 (diff) | |
| download | bootable_bootloader_goldelico_gta04-3fee3af1bc6a56c8e4df59fc7b5644c0ea957837.zip bootable_bootloader_goldelico_gta04-3fee3af1bc6a56c8e4df59fc7b5644c0ea957837.tar.gz bootable_bootloader_goldelico_gta04-3fee3af1bc6a56c8e4df59fc7b5644c0ea957837.tar.bz2 | |
fixed pinmux and display initialization
Diffstat (limited to 'u-boot/board/goldelico/gta04b2/trf7960.c')
| -rw-r--r-- | u-boot/board/goldelico/gta04b2/trf7960.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/u-boot/board/goldelico/gta04b2/trf7960.c b/u-boot/board/goldelico/gta04b2/trf7960.c index fd90792..8744748 100644 --- a/u-boot/board/goldelico/gta04b2/trf7960.c +++ b/u-boot/board/goldelico/gta04b2/trf7960.c @@ -663,7 +663,7 @@ int scanInventory(struct trf7960 *device, uchar flags, uchar length, void (*foun int readBlocks(struct trf7960 *device, uchar flags, uint64_t uid, uchar firstBlock, uchar blocks, uchar *data) { /* read single/multiple blocks */ static uchar buffer[32]; /* shared rx/tx buffer */ - char *rxbuf; + uchar *rxbuf; int pdusize = 4 + (uid?sizeof(uid):0); /* flags byte + command byte + optional uid + firstblock + #blocks */ #if 1 printf("readBlocks\n"); @@ -675,7 +675,7 @@ int readBlocks(struct trf7960 *device, uchar flags, uint64_t uid, uchar firstBlo if(writeRegister(device, TRF7960_REG_IRQMASK, 0x3f)) /* enable no-response interrupt */ return -1; - rxbuf=malloc(2+32*blocks); // allocate enough memory for storing 32*blocks bytes + rxbuf=(uchar *) malloc(2+32*blocks); // allocate enough memory for storing 32*blocks bytes if(!rxbuf) return -1; // can't allocate @@ -728,7 +728,7 @@ int readBlocks(struct trf7960 *device, uchar flags, uint64_t uid, uchar firstBlo #if 1 printf("tx done %02x\n", device->done); #endif - if(!device->done & 0x80) { + if(!(device->done & 0x80)) { #if 1 printf(" unknown TX interrupt %02x\n", device->done); #endif |