djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build by removing unused vars

Browse Source
This commit is contained in:
Scott Shawcroft 2019-10-22 17:24:04 -07:00
parent aeee15eae8
commit ece8352126
No known key found for this signature in database
GPG Key ID: 9349BC7E64B1921E
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
shared-module/_bleio/ScanResults.c
View File

@ -28,6 +28,7 @@
#include <string.h> #include <string.h>
#include "lib/utils/interrupt_char.h"
#include "py/objstr.h" #include "py/objstr.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "shared-bindings/_bleio/ScanEntry.h" #include "shared-bindings/_bleio/ScanEntry.h"
@ -44,10 +45,10 @@ bleio_scanresults_obj_t* shared_module_bleio_new_scanresults(size_t buffer_size,
} }
mp_obj_t common_hal_bleio_scanresults_next(bleio_scanresults_obj_t *self) { mp_obj_t common_hal_bleio_scanresults_next(bleio_scanresults_obj_t *self) {
while (ringbuf_count(&self->buf) == 0 && !self->done && !mp_exception_pending()) { while (ringbuf_count(&self->buf) == 0 && !self->done && !mp_hal_is_interrupted()) {
RUN_BACKGROUND_TASKS; RUN_BACKGROUND_TASKS;
} }
if (ringbuf_count(&self->buf) == 0 || mp_exception_pending()) { if (ringbuf_count(&self->buf) == 0 || mp_hal_is_interrupted()) {
return mp_const_none; return mp_const_none;
} }

19
supervisor/shared/bluetooth.c
View File

@ -87,7 +87,7 @@ void supervisor_start_bluetooth(void) {
characteristic_list.items = characteristic_list_items; characteristic_list.items = characteristic_list_items;
mp_seq_clear(characteristic_list.items, 0, characteristic_list.alloc, sizeof(*characteristic_list.items)); mp_seq_clear(characteristic_list.items, 0, characteristic_list.alloc, sizeof(*characteristic_list.items));
const uint32_t err_code = _common_hal_bleio_service_construct(&supervisor_ble_service, &supervisor_ble_service_uuid, false /* is secondary */, &characteristic_list); _common_hal_bleio_service_construct(&supervisor_ble_service, &supervisor_ble_service_uuid, false /* is secondary */, &characteristic_list);
// File length // File length
supervisor_ble_version_uuid.base.type = &bleio_uuid_type; supervisor_ble_version_uuid.base.type = &bleio_uuid_type;
@ -186,7 +186,7 @@ void open_current_file(void) {
path[length] = '\0'; path[length] = '\0';
FATFS *fs = &((fs_user_mount_t *) MP_STATE_VM(vfs_mount_table)->obj)->fatfs; FATFS *fs = &((fs_user_mount_t *) MP_STATE_VM(vfs_mount_table)->obj)->fatfs;
FRESULT result = f_open(fs, &active_file, (char*) path, FA_READ | FA_WRITE); f_open(fs, &active_file, (char*) path, FA_READ | FA_WRITE);
update_file_length(); update_file_length();
} }
@ -246,7 +246,6 @@ void supervisor_bluetooth_background(void) {
//uint32_t data_shift_length = fileLength - offset - remove_length; //uint32_t data_shift_length = fileLength - offset - remove_length;
int32_t data_shift = insert_length - remove_length; int32_t data_shift = insert_length - remove_length;
uint32_t new_length = file_length + data_shift; uint32_t new_length = file_length + data_shift;
FRESULT result;
// TODO: Make these loops smarter to read and write on sector boundaries. // TODO: Make these loops smarter to read and write on sector boundaries.
if (data_shift < 0) { if (data_shift < 0) {
@ -254,32 +253,32 @@ void supervisor_bluetooth_background(void) {
uint8_t data; uint8_t data;
UINT actual; UINT actual;
f_lseek(&active_file, shift_offset - data_shift); f_lseek(&active_file, shift_offset - data_shift);
result = f_read(&active_file, &data, 1, &actual); f_read(&active_file, &data, 1, &actual);
f_lseek(&active_file, shift_offset); f_lseek(&active_file, shift_offset);
result = f_write(&active_file, &data, 1, &actual); f_write(&active_file, &data, 1, &actual);
} }
f_truncate(&active_file); f_truncate(&active_file);
} else if (data_shift > 0) { } else if (data_shift > 0) {
result = f_lseek(&active_file, file_length); f_lseek(&active_file, file_length);
// Fill end with 0xff so we don't need to erase. // Fill end with 0xff so we don't need to erase.
uint8_t data = 0xff; uint8_t data = 0xff;
for (size_t i = 0; i < (size_t) data_shift; i++) { for (size_t i = 0; i < (size_t) data_shift; i++) {
UINT actual; UINT actual;
result = f_write(&active_file, &data, 1, &actual); f_write(&active_file, &data, 1, &actual);
} }
for (uint32_t shift_offset = new_length - 1; shift_offset >= offset + insert_length ; shift_offset--) { for (uint32_t shift_offset = new_length - 1; shift_offset >= offset + insert_length ; shift_offset--) {
UINT actual; UINT actual;
f_lseek(&active_file, shift_offset - data_shift); f_lseek(&active_file, shift_offset - data_shift);
result = f_read(&active_file, &data, 1, &actual); f_read(&active_file, &data, 1, &actual);
f_lseek(&active_file, shift_offset); f_lseek(&active_file, shift_offset);
result = f_write(&active_file, &data, 1, &actual); f_write(&active_file, &data, 1, &actual);
} }
} }
f_lseek(&active_file, offset); f_lseek(&active_file, offset);
uint8_t* data = (uint8_t *) (current_command + 4); uint8_t* data = (uint8_t *) (current_command + 4);
UINT written; UINT written;
result = f_write(&active_file, data, insert_length, &written); f_write(&active_file, data, insert_length, &written);
f_sync(&active_file); f_sync(&active_file);
// Notify the new file length. // Notify the new file length.
update_file_length(); update_file_length();