From ea90f92ebbf6ad5cf861b26195db506030e6385e Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Sun, 17 Jul 2011 22:08:27 +0200 Subject: [PATCH 1/3] add proper "const" qualifiers --- firmware/core/ssp/ssp.c | 2 +- firmware/core/ssp/ssp.h | 2 +- firmware/funk/nrf24l01p.c | 6 +++--- firmware/funk/nrf24l01p.h | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/firmware/core/ssp/ssp.c b/firmware/core/ssp/ssp.c index 0dd5ccc..6416134 100644 --- a/firmware/core/ssp/ssp.c +++ b/firmware/core/ssp/ssp.c @@ -238,7 +238,7 @@ void sspInit (uint8_t portNum, sspClockPolarity_t polarity, sspClockPhase_t phas Block length of the data buffer */ /**************************************************************************/ -void sspSend (uint8_t portNum, uint8_t *buf, uint32_t length) +void sspSend (uint8_t portNum, const uint8_t *buf, uint32_t length) { uint32_t i; uint8_t Dummy = Dummy; diff --git a/firmware/core/ssp/ssp.h b/firmware/core/ssp/ssp.h index 9ac80f6..b90976f 100644 --- a/firmware/core/ssp/ssp.h +++ b/firmware/core/ssp/ssp.h @@ -79,7 +79,7 @@ sspClockPhase_t; extern void SSP_IRQHandler (void); void sspInit (uint8_t portNum, sspClockPolarity_t polarity, sspClockPhase_t phase); -void sspSend (uint8_t portNum, uint8_t *buf, uint32_t length); +void sspSend (uint8_t portNum, const uint8_t *buf, uint32_t length); void sspReceive (uint8_t portNum, uint8_t *buf, uint32_t length); void sspSendReceive(uint8_t portNum, uint8_t *buf, uint32_t length); #endif diff --git a/firmware/funk/nrf24l01p.c b/firmware/funk/nrf24l01p.c index aa3e9ba..63ee4cf 100644 --- a/firmware/funk/nrf24l01p.c +++ b/firmware/funk/nrf24l01p.c @@ -81,7 +81,7 @@ void nrf_read_pkt_crc(int len, uint8_t* data, uint8_t* crc){ CS_HIGH(); }; -void nrf_write_long(const uint8_t cmd, int len, uint8_t* data){ +void nrf_write_long(const uint8_t cmd, int len, const uint8_t* data){ CS_LOW(); xmit_spi(cmd); sspSend(0,data,len); @@ -185,7 +185,7 @@ char nrf_snd_pkt_crc_encr(int size, uint8_t * pkt, uint32_t const key[4]){ return nrf_cmd_status(C_NOP); }; -void nrf_set_rx_mac(int pipe, int rxlen, int maclen, uint8_t * mac){ +void nrf_set_rx_mac(int pipe, int rxlen, int maclen, const uint8_t * mac){ #ifdef SAFE assert(maclen>=1 || maclen<=5); assert(rxlen>=1 || rxlen<=32); @@ -202,7 +202,7 @@ void nrf_set_rx_mac(int pipe, int rxlen, int maclen, uint8_t * mac){ ); }; -void nrf_set_tx_mac(int maclen, uint8_t * mac){ +void nrf_set_tx_mac(int maclen, const uint8_t * mac){ #ifdef SAFE assert(maclen>=1 || maclen<=5); assert(mac!=NULL); diff --git a/firmware/funk/nrf24l01p.h b/firmware/funk/nrf24l01p.h index a82197f..f9522b6 100644 --- a/firmware/funk/nrf24l01p.h +++ b/firmware/funk/nrf24l01p.h @@ -145,10 +145,10 @@ void nrf_cmd_rw_long(uint8_t* data, int len); void nrf_read_long(const uint8_t reg, int len, uint8_t* data); void nrf_write_reg(const uint8_t reg, const uint8_t val); uint8_t nrf_read_reg(const uint8_t reg); -void nrf_write_reg_long(const uint8_t reg, int len, uint8_t* data); +void nrf_write_long(const uint8_t cmd, int len, const uint8_t* data); -void nrf_set_rx_mac(int pipe, int rxlen, int maclen, uint8_t * mac); -void nrf_set_tx_mac(int maclen, uint8_t * mac); +void nrf_set_rx_mac(int pipe, int rxlen, int maclen, const uint8_t * mac); +void nrf_set_tx_mac(int maclen, const uint8_t * mac); void nrf_disable_pipe(int pipe); void nrf_set_channel(int channel); From 71bd7e97c6185ebd76d068621ce6b772710fd7f8 Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Sun, 17 Jul 2011 22:09:13 +0200 Subject: [PATCH 2/3] font_direction is no more --- firmware/applications/executor.c | 2 -- firmware/applications/sec.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/firmware/applications/executor.c b/firmware/applications/executor.c index c495ec2..5f66a58 100644 --- a/firmware/applications/executor.c +++ b/firmware/applications/executor.c @@ -90,8 +90,6 @@ void main_executor(void) { int yctr=8; int dx=0; - font_direction = FONT_DIR_LTR; // LeftToRight is the default - yctr=18; uint8_t trigger; diff --git a/firmware/applications/sec.c b/firmware/applications/sec.c index 478566e..b4dab2f 100644 --- a/firmware/applications/sec.c +++ b/firmware/applications/sec.c @@ -19,8 +19,6 @@ void main_sec(void) { int yctr=8; int dx=0; - font_direction = FONT_DIR_LTR; // LeftToRight is the default - yctr=18; uint8_t trigger; From 4d5a355e96129a6b25443a9015fd4274dcd2943c Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Sun, 17 Jul 2011 22:20:14 +0200 Subject: [PATCH 3/3] Fix warnings. Remove unnecesssary dup of get_rc --- firmware/funk/filetransfer.c | 23 +++-------------------- firmware/funk/rftransfer.c | 1 + 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/firmware/funk/filetransfer.c b/firmware/funk/filetransfer.c index 3345a84..b08cdfb 100644 --- a/firmware/funk/filetransfer.c +++ b/firmware/funk/filetransfer.c @@ -2,8 +2,10 @@ #include "nrf24l01p.h" #include "filetransfer.h" #include "rftransfer.h" +#include "basic/basic.h" #include "basic/xxtea.h" #include "filesystem/ff.h" +#include "lcd/print.h" //TODO: use a proper MAC to sign the message @@ -53,25 +55,6 @@ int filetransfer_send(uint8_t *filename, uint16_t size, return 0; } -void put_rc_y (FRESULT rc, int y) { - const TCHAR *p = - _T("OK\0DISK_ERR\0INT_ERR\0NOT_READY\0NO_FILE\0NO_PATH\0INVALID_NAME\0") - _T("DENIED\0EXIST\0INVALID_OBJECT\0WRITE_PROTECTED\0INVALID_DRIVE\0") - _T("NOT_ENABLED\0NO_FILE_SYSTEM\0MKFS_ABORTED\0TIMEOUT\0LOCKED\0") - _T("NOT_ENOUGH_CORE\0TOO_MANY_OPEN_FILES\0"); - FRESULT i; - - for (i = 0; i != rc && *p; i++) { - while(*p++) ; - } - DoString(0,y,p); -} - -void put_rc (FRESULT rc){ - put_rc_y(rc,0); -}; - - int filetransfer_receive(uint8_t *mac, uint32_t const k[4]) { uint8_t buf[MAXSIZE+1]; @@ -100,7 +83,7 @@ int filetransfer_receive(uint8_t *mac, uint32_t const k[4]) res = f_open(&file, (const char*)metadata, FA_OPEN_ALWAYS|FA_WRITE); //lcdPrintln("file opened"); lcdRefresh(); - if( res ) {lcdPrintln("res"); put_rc(res); lcdRefresh(); while(1);} + if( res ) {lcdPrintln("res"); lcdPrint(f_get_rc_string(res)); lcdRefresh(); while(1);} if( res ) return res; diff --git a/firmware/funk/rftransfer.c b/firmware/funk/rftransfer.c index 5b79315..335b13a 100644 --- a/firmware/funk/rftransfer.c +++ b/firmware/funk/rftransfer.c @@ -2,6 +2,7 @@ #include "nrf24l01p.h" #include #include +#include #define MAXPACKET 32 void rftransfer_send(uint16_t size, uint8_t *data)