Michel2/tapuino
1
0
Fork 0
mirror of https://github.com/sweetlilmre/tapuino.git synced 2026-07-28 04:05:49 +00:00
Code Issues Releases Wiki Activity

Merge pull request #44 from sweetlilmre/memoptimize

Browse Source 
Fixed uninitialized variable check (br) in play_file()
This commit is contained in:
sweetlilmre
2022-02-01 08:57:49 +02:00
committed by GitHub
parent 3af222cdf1 ad5f8927cd
commit 2494de8e21
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -24,3 +24,4 @@
# Target directory
target/
config-user.h
ff.c
+5 -5
View File
@@ -117,7 +117,7 @@
#include "ff.h" /* Declarations of FatFs API */
#include "diskio.h" /* Declarations of disk I/O functions */
#include <avr/pgmspace.h>
@@ -538,7 +538,7 @@ WCHAR LfnBuf[_MAX_LFN+1];
#ifdef _EXCVT
static
const BYTE ExCvt[] = _EXCVT; /* Upper conversion table for extended characters */
const BYTE ExCvt[] PROGMEM = _EXCVT; /* Upper conversion table for extended characters */
#endif
@@ -1885,7 +1885,7 @@ FRESULT create_name (
if (w >= 0x80) { /* Non ASCII character */
#ifdef _EXCVT
w = ff_convert(w, 0); /* Unicode -> OEM code */
if (w) w = ExCvt[w - 0x80]; /* Convert extended character to upper (SBCS) */
if (w) w = pgm_read_byte(&ExCvt[w - 0x80]); /* Convert extended character to upper (SBCS) */
#else
w = ff_convert(ff_wtoupper(w), 0); /* Upper converted Unicode -> OEM code */
#endif
@@ -1962,7 +1962,7 @@ FRESULT create_name (
if (c >= 0x80) { /* Extended character? */
b |= 3; /* Eliminate NT flag */
#ifdef _EXCVT
c = ExCvt[c - 0x80]; /* To upper extended characters (SBCS cfg) */
c = pgm_read_byte(&ExCvt[c - 0x80]); /* To upper extended characters (SBCS cfg) */
#else
#if !_DF1S
return FR_INVALID_NAME; /* Reject extended characters (ASCII cfg) */
@@ -3849,7 +3849,7 @@ FRESULT f_setlabel (
#else
if (IsLower(w)) w -= 0x20; /* To upper ASCII characters */
#ifdef _EXCVT
if (w >= 0x80) w = ExCvt[w - 0x80]; /* To upper extended characters (SBCS cfg) */
if (w >= 0x80) w = pgm_read_byte(&ExCvt[w - 0x80]); /* To upper extended characters (SBCS cfg) */
#else
if (!_DF1S && w >= 0x80) w = 0; /* Reject extended characters (ASCII cfg) */
#endif
tapuino.c
+10 -8
View File
@@ -94,7 +94,7 @@ volatile uint8_t g_invert_signal = 0; // invert the signal for transmi
volatile uint16_t g_ticker_rate = TICKER_RATE / 10;
volatile uint16_t g_ticker_hold_rate = TICKER_HOLD / 10;
volatile uint16_t g_key_repeat_start = KEY_REPEAT_START / 10;
// volatile uint16_t g_key_repeat_start = KEY_REPEAT_START / 10;
volatile uint16_t g_key_repeat_next = KEY_REPEAT_NEXT / 10;
volatile uint16_t g_rec_finalize_time = REC_FINALIZE_TIME / 10;
@@ -370,17 +370,16 @@ int verify_tap(FILINFO* pfile_info) {
// get the first buffer ready
res = f_read(&g_fil, (void*) g_fat_buffer, FAT_BUF_SIZE, &br);
if (res != FR_OK) {
if ((res != FR_OK) || (br < FAT_BUF_SIZE)) {
lcd_title_P(S_READ_FAILED);
return 0;
}
}
return 1;
}
int play_file(FILINFO* pfile_info)
{
UINT br;
int perc = 0;
g_tap_file_complete = 0;
@@ -391,6 +390,9 @@ int play_file(FILINFO* pfile_info)
return 0;
}
// br is tested by verify_tap() to be at least FAT_BUF_SIZE (we've read at least FAT_BUF_SIZE from the TAP file)
UINT br = FAT_BUF_SIZE;
// setup all start conditions
g_write_index = 0;
g_read_index = 0;
@@ -637,7 +639,7 @@ void load_eeprom_data() {
g_ticker_rate = eeprom_read_byte((uint8_t *) 3);
g_ticker_hold_rate = eeprom_read_byte((uint8_t *) 4);
g_key_repeat_start = eeprom_read_byte((uint8_t *) 5);
// g_key_repeat_start = eeprom_read_byte((uint8_t *) 5);
g_key_repeat_next = eeprom_read_byte((uint8_t *) 6);
g_rec_finalize_time = eeprom_read_byte((uint8_t *) 7);
g_rec_auto_finalize = eeprom_read_byte((uint8_t *) 8);
@@ -651,7 +653,7 @@ void save_eeprom_data() {
eeprom_update_byte((uint8_t *) 2, g_video_mode);
eeprom_update_byte((uint8_t *) 3, g_ticker_rate);
eeprom_update_byte((uint8_t *) 4, g_ticker_hold_rate);
eeprom_update_byte((uint8_t *) 5, g_key_repeat_start);
// eeprom_update_byte((uint8_t *) 5, g_key_repeat_start);
eeprom_update_byte((uint8_t *) 6, g_key_repeat_next);
eeprom_update_byte((uint8_t *) 7, g_rec_finalize_time);
eeprom_update_byte((uint8_t *) 8, g_rec_auto_finalize);
@@ -717,8 +719,8 @@ int tapuino_hardware_setup(void)
lcd_setup();
// serial_println_P(S_INITI2COK);
lcd_title_P(S_INIT);
sprintf_P((char*)g_fat_buffer, S_VERSION_PATTERN, TAPUINO_MAJOR_VERSION, TAPUINO_MINOR_VERSION, TAPUINO_BUILD_VERSION);
lcd_status(g_fat_buffer);
sprintf_P((char*) g_fat_buffer, S_VERSION_PATTERN, TAPUINO_MAJOR_VERSION, TAPUINO_MINOR_VERSION, TAPUINO_BUILD_VERSION);
lcd_status((char*) g_fat_buffer);
_delay_ms(2000);