ctdo
/
crashtest-r0ket
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanup

This commit is contained in:
Stefan `Sec` Zehl 2011-05-14 22:32:10 +02:00
parent 7e80ec2bb1
commit d2ba467294
2 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lcd/decoder.c
View File

@ -6,7 +6,6 @@
static uint8_t buf[MAXCHR]; static uint8_t buf[MAXCHR];
uint8_t * pk_decode(const uint8_t * data,int * len){ uint8_t * pk_decode(const uint8_t * data,int * len){
// int off=0; // Offset into au8FontTable for bytestream
int length=*len; // Length of character bytestream int length=*len; // Length of character bytestream
int height; // Height of character in bytes int height; // Height of character in bytes
int hoff; // bit position for non-integer heights int hoff; // bit position for non-integer heights
@ -40,26 +39,12 @@ uint8_t * pk_decode(const uint8_t * data,int*len){
off++; off++;
}; };
while(off-->0){ while(off-->0){
// printf("- rv: %x\n",retval);
retval=retval<<4; retval=retval<<4;
retval+=gnn(); retval+=gnn();
}; };
// printf("> rv: %x\n",retval);
return retval; return retval;
}; };
if(data[0]>>4 == 15){
// This is a raw character!
int preblank,postblank;
const uint8_t *rawptr;
preblank= data[1];
postblank= data[2];
rawptr=&data[3];
// printf("Raw character: pre=%d, post=%d\n",preblank,postblank);
return;
};
#define DNY (12) // Decoder parameter: Fixed value for now. #define DNY (12) // Decoder parameter: Fixed value for now.
int repeat=0; // Decoder internal: repeat colum? int repeat=0; // Decoder internal: repeat colum?
int curbit=0; // Decoder internal: current bit (1 or 0) int curbit=0; // Decoder internal: current bit (1 or 0)
@ -71,7 +56,6 @@ uint8_t * pk_decode(const uint8_t * data,int*len){
/* Get next encoded nibble and decode */ /* Get next encoded nibble and decode */
nyb=gnn(); nyb=gnn();
// printf("\nCtr: %d, byte: %x, Process: %d\n",ctr, data[ctr], nyb);
if(nyb==15){ if(nyb==15){
repeat++; repeat++;
@ -79,7 +63,6 @@ uint8_t * pk_decode(const uint8_t * data,int*len){
}else if(nyb==14){ }else if(nyb==14){
nyb=upl(0); nyb=upl(0);
nyb+=1; nyb+=1;
// printf("14-decode: %d\n",nyb);
repeat+=nyb; repeat+=nyb;
continue; continue;
}else if(nyb>DNY){ }else if(nyb>DNY){
@ -87,12 +70,10 @@ uint8_t * pk_decode(const uint8_t * data,int*len){
}else if(nyb==0){ }else if(nyb==0){
nyb=upl(1); nyb=upl(1);
nyb+=(16*(13-DNY)+DNY)-16; nyb+=(16*(13-DNY)+DNY)-16;
// printf("0-decode: %d\n",nyb);
}; };
/* Generate & output bits */ /* Generate & output bits */
// printf("have %d bits. Got %d (%d)-bits...(r=%d)",pos, nyb, curbit,repeat);
while(nyb-->0){ while(nyb-->0){
if(pos==0){ if(pos==0){
*bufptr=0; *bufptr=0;
@ -107,7 +88,6 @@ uint8_t * pk_decode(const uint8_t * data,int*len){
}; };
if(pos==8){ if(pos==8){
// printf("BYTE: 0x%02x\n",*bufptr);
bufptr++; bufptr++;
if((bufptr-buf)%height==0){ // End of column? if((bufptr-buf)%height==0){ // End of column?
while(repeat>0){ while(repeat>0){
@ -115,7 +95,6 @@ uint8_t * pk_decode(const uint8_t * data,int*len){
bufptr[0]=bufptr[-3]; bufptr[0]=bufptr[-3];
bufptr++; bufptr++;
}; };
// printf("repeated last line\n");
repeat--; repeat--;
}; };
}; };
@ -125,8 +104,6 @@ uint8_t * pk_decode(const uint8_t * data,int*len){
curbit=1-curbit; curbit=1-curbit;
}; };
// printf("\n");
*len=(bufptr-buf)/height; // return size of output buffer. *len=(bufptr-buf)/height; // return size of output buffer.
return buf; return buf;
}; };

2
lcd/decoder.h Normal file
View File

@ -0,0 +1,2 @@
uint8_t * pk_decode(const uint8_t * data,int * len);