Skip to content

Commit ed29881

Browse files
bill88tbill88t
authored
Merge pull request #7 from bill88t/main
Latest uncrustify
2 parents fe40035 + b2e3f91 commit ed29881

File tree

18 files changed

+179
-204
lines changed

18 files changed

+179
-204
lines changed

‎extmod/vfs_blockdev.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ int mp_vfs_blockdev_read(mp_vfs_blockdev_t *self, size_t block_num, size_t num_b
5151
mp_uint_t (*f)(uint8_t *, uint32_t, uint32_t) = (void *)(uintptr_t)self->readblocks[2];
5252
return f(buf, block_num, num_blocks);
5353
} else {
54-
mp_obj_array_t ar = {{&mp_type_bytearray}, BYTEARRAY_TYPECODE, 0, num_blocks *self->block_size, buf};
54+
mp_obj_array_t ar = {{&mp_type_bytearray}, BYTEARRAY_TYPECODE, 0, num_blocks * self->block_size, buf};
5555
self->readblocks[2] = MP_OBJ_NEW_SMALL_INT(block_num);
5656
self->readblocks[3] = MP_OBJ_FROM_PTR(&ar);
5757
mp_call_method_n_kw(2, 0, self->readblocks);
@@ -83,7 +83,7 @@ int mp_vfs_blockdev_write(mp_vfs_blockdev_t *self, size_t block_num, size_t num_
8383
mp_uint_t (*f)(const uint8_t *, uint32_t, uint32_t) = (void *)(uintptr_t)self->writeblocks[2];
8484
return f(buf, block_num, num_blocks);
8585
} else {
86-
mp_obj_array_t ar = {{&mp_type_bytearray}, BYTEARRAY_TYPECODE, 0, num_blocks *self->block_size, (void *)buf};
86+
mp_obj_array_t ar = {{&mp_type_bytearray}, BYTEARRAY_TYPECODE, 0, num_blocks * self->block_size, (void *)buf};
8787
self->writeblocks[2] = MP_OBJ_NEW_SMALL_INT(block_num);
8888
self->writeblocks[3] = MP_OBJ_FROM_PTR(&ar);
8989
mp_call_method_n_kw(2, 0, self->writeblocks);

‎extmod/vfs_lfsx.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include "extmod/vfs.h"
3737
#include "shared/timeutils/timeutils.h"
3838

39-
STATIC int MP_VFS_LFSx(dev_ioctl)(const struct LFSx_API (config) * c, int cmd, int arg, bool must_return_int) {
39+
STATIC int MP_VFS_LFSx(dev_ioctl)(const struct LFSx_API(config) * c, int cmd, int arg, bool must_return_int) {
4040
mp_obj_t ret = mp_vfs_blockdev_ioctl(c->context, cmd, arg);
4141
int ret_i = 0;
4242
if (must_return_int || ret != mp_const_none) {
@@ -45,27 +45,27 @@ STATIC int MP_VFS_LFSx(dev_ioctl)(const struct LFSx_API (config) * c, int cmd, i
4545
return ret_i;
4646
}
4747

48-
STATIC int MP_VFS_LFSx(dev_read)(const struct LFSx_API (config) * c, LFSx_API(block_t) block, LFSx_API(off_t) off, void *buffer, LFSx_API(size_t) size) {
48+
STATIC int MP_VFS_LFSx(dev_read)(const struct LFSx_API(config) * c, LFSx_API(block_t) block, LFSx_API(off_t) off, void *buffer, LFSx_API(size_t) size) {
4949
return mp_vfs_blockdev_read_ext(c->context, block, off, size, buffer);
5050
}
5151

52-
STATIC int MP_VFS_LFSx(dev_prog)(const struct LFSx_API (config) * c, LFSx_API(block_t) block, LFSx_API(off_t) off, const void *buffer, LFSx_API(size_t) size) {
52+
STATIC int MP_VFS_LFSx(dev_prog)(const struct LFSx_API(config) * c, LFSx_API(block_t) block, LFSx_API(off_t) off, const void *buffer, LFSx_API(size_t) size) {
5353
return mp_vfs_blockdev_write_ext(c->context, block, off, size, buffer);
5454
}
5555

56-
STATIC int MP_VFS_LFSx(dev_erase)(const struct LFSx_API (config) * c, LFSx_API(block_t) block) {
56+
STATIC int MP_VFS_LFSx(dev_erase)(const struct LFSx_API(config) * c, LFSx_API(block_t) block) {
5757
return MP_VFS_LFSx(dev_ioctl)(c, MP_BLOCKDEV_IOCTL_BLOCK_ERASE, block, true);
5858
}
5959

60-
STATIC int MP_VFS_LFSx(dev_sync)(const struct LFSx_API (config) * c) {
60+
STATIC int MP_VFS_LFSx(dev_sync)(const struct LFSx_API(config) * c) {
6161
return MP_VFS_LFSx(dev_ioctl)(c, MP_BLOCKDEV_IOCTL_SYNC, 0, false);
6262
}
6363

6464
STATIC void MP_VFS_LFSx(init_config)(MP_OBJ_VFS_LFSx * self, mp_obj_t bdev, size_t read_size, size_t prog_size, size_t lookahead) {
6565
self->blockdev.flags = MP_BLOCKDEV_FLAG_FREE_OBJ;
6666
mp_vfs_blockdev_init(&self->blockdev, bdev);
6767

68-
struct LFSx_API (config) * config = &self->config;
68+
struct LFSx_API(config) * config = &self->config;
6969
memset(config, 0, sizeof(*config));
7070

7171
config->context = &self->blockdev;
@@ -163,7 +163,7 @@ typedef struct MP_VFS_LFSx (_ilistdir_it_t) {
163163
STATIC mp_obj_t MP_VFS_LFSx(ilistdir_it_iternext)(mp_obj_t self_in) {
164164
MP_VFS_LFSx(ilistdir_it_t) * self = MP_OBJ_TO_PTR(self_in);
165165

166-
struct LFSx_API (info) info;
166+
struct LFSx_API(info) info;
167167
for (;;) {
168168
int ret = LFSx_API(dir_read)(&self->vfs->lfs, &self->dir, &info);
169169
if (ret == 0) {
@@ -275,7 +275,7 @@ STATIC mp_obj_t MP_VFS_LFSx(chdir)(mp_obj_t self_in, mp_obj_t path_in) {
275275
const char *path = MP_VFS_LFSx(make_path)(self, path_in);
276276
if (path[1] != '\0') {
277277
// Not at root, check it exists
278-
struct LFSx_API (info) info;
278+
struct LFSx_API(info) info;
279279
int ret = LFSx_API(stat)(&self->lfs, path, &info);
280280
if (ret < 0 || info.type != LFSx_MACRO(_TYPE_DIR)) {
281281
mp_raise_OSError(-MP_ENOENT);
@@ -350,7 +350,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(MP_VFS_LFSx(getcwd_obj), MP_VFS_LFSx(getcwd));
350350
STATIC mp_obj_t MP_VFS_LFSx(stat)(mp_obj_t self_in, mp_obj_t path_in) {
351351
MP_OBJ_VFS_LFSx *self = MP_OBJ_TO_PTR(self_in);
352352
const char *path = MP_VFS_LFSx(make_path)(self, path_in);
353-
struct LFSx_API (info) info;
353+
struct LFSx_API(info) info;
354354
int ret = LFSx_API(stat)(&self->lfs, path, &info);
355355
if (ret < 0) {
356356
mp_raise_OSError(-ret);
@@ -464,7 +464,7 @@ STATIC MP_DEFINE_CONST_DICT(MP_VFS_LFSx(locals_dict), MP_VFS_LFSx(locals_dict_ta
464464

465465
STATIC mp_import_stat_t MP_VFS_LFSx(import_stat)(void *self_in, const char *path) {
466466
MP_OBJ_VFS_LFSx *self = self_in;
467-
struct LFSx_API (info) info;
467+
struct LFSx_API(info) info;
468468
mp_obj_str_t path_obj = { { &mp_type_str }, 0, 0, (const byte *)path };
469469
path = MP_VFS_LFSx(make_path)(self, MP_OBJ_FROM_PTR(&path_obj));
470470
int ret = LFSx_API(stat)(&self->lfs, path, &info);

‎ports/atmel-samd/common-hal/analogio/AnalogOut.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,17 @@ void common_hal_analogio_analogout_construct(analogio_analogout_obj_t *self,
5757

5858
uint8_t channel;
5959
switch (pin->number) {
60-
#if defined(PIN_PA02) && !defined(IGNORE_PIN_PA02)
60+
#if defined(PIN_PA02) && !defined(IGNORE_PIN_PA02)
6161
case PIN_PA02:
6262
channel = 0;
6363
break;
64-
#endif
64+
#endif
6565

66-
#if defined(SAM_D5X_E5X) && defined(PIN_PA05) && !defined(IGNORE_PIN_PA05)
66+
#if defined(SAM_D5X_E5X) && defined(PIN_PA05) && !defined(IGNORE_PIN_PA05)
6767
case PIN_PA05:
6868
channel = 1;
6969
break;
70-
#endif
70+
#endif
7171

7272
default:
7373
raise_ValueError_invalid_pin();

‎ports/atmel-samd/eic_handler.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,35 +43,35 @@ void set_eic_handler(uint8_t channel, uint8_t eic_handler) {
4343
void shared_eic_handler(uint8_t channel) {
4444
uint8_t handler = eic_channel_handler[channel];
4545
switch (handler) {
46-
#if CIRCUITPY_PULSEIO
46+
#if CIRCUITPY_PULSEIO
4747
case EIC_HANDLER_PULSEIN:
4848
pulsein_interrupt_handler(channel);
4949
break;
50-
#endif
50+
#endif
5151

52-
#if CIRCUITPY_PS2IO
52+
#if CIRCUITPY_PS2IO
5353
case EIC_HANDLER_PS2:
5454
ps2_interrupt_handler(channel);
5555
break;
56-
#endif
56+
#endif
5757

58-
#if CIRCUITPY_ROTARYIO
58+
#if CIRCUITPY_ROTARYIO
5959
case EIC_HANDLER_INCREMENTAL_ENCODER:
6060
incrementalencoder_interrupt_handler(channel);
6161
break;
62-
#endif
62+
#endif
6363

64-
#if CIRCUITPY_COUNTIO
64+
#if CIRCUITPY_COUNTIO
6565
case EIC_HANDLER_COUNTER:
6666
counter_interrupt_handler(channel);
6767
break;
68-
#endif
68+
#endif
6969

70-
#if CIRCUITPY_ALARM
70+
#if CIRCUITPY_ALARM
7171
case EIC_HANDLER_ALARM:
7272
pin_alarm_callback(channel);
7373
break;
74-
#endif
74+
#endif
7575

7676
default:
7777
break;

‎ports/nrf/bluetooth/ble_drv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ void SD_EVT_IRQHandler(void) {
121121
uint32_t evt_id;
122122
while (sd_evt_get(&evt_id) != NRF_ERROR_NOT_FOUND) {
123123
switch (evt_id) {
124-
#if CIRCUITPY_USB
124+
#if CIRCUITPY_USB
125125
// usb power event
126126
case NRF_EVT_POWER_USB_DETECTED:
127127
case NRF_EVT_POWER_USB_POWER_READY:
@@ -133,7 +133,7 @@ void SD_EVT_IRQHandler(void) {
133133
tusb_hal_nrf_power_event(usbevt);
134134
}
135135
break;
136-
#endif
136+
#endif
137137

138138
// Set flag indicating that a flash operation has finished.
139139
case NRF_EVT_FLASH_OPERATION_SUCCESS:

‎ports/stm/common-hal/audiobusio/MEMS_Audio.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ typedef int32_t mems_audio_err_t;
6161
* @brief The datatype that holds an output PCM sample.
6262
*/
6363
typedef int16_t pcm_sample_t;
64-
_Static_assert(PCM_OUT_RESOLUTION==16, "Output PCM resolution must be 16-bits");
64+
_Static_assert(PCM_OUT_RESOLUTION == 16, "Output PCM resolution must be 16-bits");
6565

6666

6767
typedef enum {
@@ -79,7 +79,7 @@ typedef struct MemsAudio_t MemsAudio;
7979
/**
8080
* @brief Callback informing that PCM samples are available for processing.
8181
*/
82-
typedef void (*pcm_data_available_t)(MemsAudio* audio, pcm_sample_t* pcmSamples, size_t pcmLength);
82+
typedef void (*pcm_data_available_t)(MemsAudio *audio, pcm_sample_t *pcmSamples, size_t pcmLength);
8383

8484
/**
8585
* @brief MemsAudio manages the filter, buffers and callbacks used to capture PDM audio samples and convert to PCM.
@@ -90,7 +90,7 @@ typedef struct MemsAudio_t {
9090
/**
9191
* @brief The buffer to store PCM audio samples
9292
*/
93-
volatile pcm_sample_t* volatile pcmOutputBuffer;
93+
volatile pcm_sample_t *volatile pcmOutputBuffer;
9494

9595
/**
9696
* @brief The length of the PCM buffer. SHould be at least MEMS_AUDIO_PCM_BUFFER_LENGTH
@@ -102,20 +102,20 @@ typedef struct MemsAudio_t {
102102
*/
103103
pcm_data_available_t pcm_data_available;
104104

105-
void* audioImpl;
106-
void* userData;
105+
void *audioImpl;
106+
void *userData;
107107
} MemsAudio;
108108

109109

110-
mems_audio_err_t mems_audio_init(MemsAudio* audio);
110+
mems_audio_err_t mems_audio_init(MemsAudio *audio);
111111

112112
/**
113113
* @brief Uninitializes the MemsAudio instance.
114114
*
115115
* @param audio
116116
* @return mems_audio_err_t
117117
*/
118-
mems_audio_err_t mems_audio_uninit(MemsAudio* audio);
118+
mems_audio_err_t mems_audio_uninit(MemsAudio *audio);
119119

120120
/**
121121
* @brief Asynchronously records audio.
@@ -125,28 +125,28 @@ mems_audio_err_t mems_audio_uninit(MemsAudio* audio);
125125
* @param pdmBufferLength
126126
* @return mems_audio_err_t
127127
*/
128-
mems_audio_err_t mems_audio_record(MemsAudio* audio);
128+
mems_audio_err_t mems_audio_record(MemsAudio *audio);
129129

130130
/**
131131
* @brief Pause recording audio.
132132
*/
133-
mems_audio_err_t mems_audio_pause(MemsAudio* audio);
133+
mems_audio_err_t mems_audio_pause(MemsAudio *audio);
134134

135135
/**
136136
* @brief Resume recording audio.
137137
*
138138
* @param audio
139139
* @return mems_audio_err_t
140140
*/
141-
mems_audio_err_t mems_audio_resume(MemsAudio* audio);
141+
mems_audio_err_t mems_audio_resume(MemsAudio *audio);
142142

143143
/**
144144
* @brief Stop recording audio and
145145
*
146146
* @param audio
147147
* @return mems_audio_err_t
148148
*/
149-
mems_audio_err_t mems_audio_stop(MemsAudio* audio);
149+
mems_audio_err_t mems_audio_stop(MemsAudio *audio);
150150

151151
#ifdef __cplusplus
152152
}

0 commit comments

Comments
 (0)