Skip to content

Commit 053b2f6

Browse files
committed
format: convert more static camelCase functions to snake_case
1 parent 9d5a26f commit 053b2f6

File tree

7 files changed

+292
-291
lines changed

7 files changed

+292
-291
lines changed

src/comm/comm_serial.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ u16 baud_rate(void)
2020
}
2121
}
2222

23-
static void updateBuffer(void)
23+
static void update_buffer(void)
2424
{
2525
while (serial_readyToReceive()) {
2626
recvData = true;
@@ -33,12 +33,12 @@ static void updateBuffer(void)
3333
}
3434
}
3535

36-
static void recvReadyCallback(void)
36+
static void recv_ready_callback(void)
3737
{
38-
updateBuffer();
38+
update_buffer();
3939
}
4040

41-
static void flushRRDY(void)
41+
static void flush_rrdy(void)
4242
{
4343
while (serial_readyToReceive()) {
4444
serial_receive();
@@ -49,8 +49,8 @@ void comm_serial_init(void)
4949
{
5050
ring_buf_init();
5151
serial_init(SCTRL_4800_BPS | SCTRL_SIN | SCTRL_SOUT | SCTRL_RINT);
52-
serial_setReadyToReceiveCallback(&recvReadyCallback);
53-
flushRRDY();
52+
serial_setReadyToReceiveCallback(&recv_ready_callback);
53+
flush_rrdy();
5454
if (settings_debug_serial()) {
5555
log_info("Serial: Baud = %i", baud_rate());
5656
}

src/comm/serial.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66

77
static VoidCallback* readReadyCallback;
88

9-
static void extIntCallback(void)
9+
static void ext_int_callback(void)
1010
{
1111
readReadyCallback();
1212
}
1313

14-
static void setSCtrl(u16 value)
14+
static void set_sctrl(u16 value)
1515
{
1616
vu8* pb;
1717
pb = (u8*)PORT2_SCTRL;
1818
*pb = value;
1919
}
2020

21-
static void setCtrl(u16 value)
21+
static void set_ctrl(u16 value)
2222
{
2323
vu8* pb;
2424
pb = (u8*)PORT2_CTRL;
@@ -51,12 +51,12 @@ void serial_setReadyToReceiveCallback(VoidCallback* cb)
5151

5252
void serial_init(u8 sctrlFlags)
5353
{
54-
setSCtrl(sctrlFlags);
55-
setCtrl(CTRL_PCS_OUT);
54+
set_sctrl(sctrlFlags);
55+
set_ctrl(CTRL_PCS_OUT);
5656
if (sctrlFlags & SCTRL_RINT) {
5757
SYS_setInterruptMaskLevel(INT_MASK_LEVEL_ENABLE_ALL);
5858
VDP_setReg(VDP_MODE_REG_3, VDP_getReg(VDP_MODE_REG_3) | VDP_IE2);
59-
SYS_setExtIntCallback(&extIntCallback);
59+
SYS_setExtIntCallback(&ext_int_callback);
6060
}
6161
}
6262

src/midi_fm.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ typedef struct MidiFmChannel {
2020

2121
static MidiFmChannel fmChannels[MAX_FM_CHANS];
2222

23-
static u8 pitchIsOutOfRange(u8 pitch);
24-
static u8 effectiveVolume(MidiFmChannel* channelState);
25-
static void updatePan(u8 chan);
26-
static u16 lookupFreqNum(u8 pitch, u8 offset);
23+
static u8 pitch_is_out_of_range(u8 pitch);
24+
static u8 effective_volume(MidiFmChannel* channelState);
25+
static void update_pan(u8 chan);
26+
static u16 lookup_freq_num(u8 pitch, u8 offset);
2727
void midi_fm_reset(void);
2828

2929
static const FmChannel** presets;
@@ -52,12 +52,12 @@ void midi_fm_reset(void)
5252

5353
u16 midi_fm_pitchCentsToFreqNum(u8 pitch, s8 cents)
5454
{
55-
u16 freq = lookupFreqNum(pitch, 0);
56-
u16 nextFreq = lookupFreqNum(pitch, 1);
55+
u16 freq = lookup_freq_num(pitch, 0);
56+
u16 nextFreq = lookup_freq_num(pitch, 1);
5757
return freq + (((nextFreq - freq) * cents) / 100);
5858
}
5959

60-
static void setSynthPitch(u8 chan)
60+
static void set_synth_pitch(u8 chan)
6161
{
6262
MidiFmChannel* fmChan = &fmChannels[chan];
6363
synth_pitch(chan, midi_fm_pitchToOctave(fmChan->pitch),
@@ -66,7 +66,7 @@ static void setSynthPitch(u8 chan)
6666

6767
void midi_fm_note_on(u8 chan, u8 pitch, s8 cents, u8 velocity)
6868
{
69-
if (pitchIsOutOfRange(pitch)) {
69+
if (pitch_is_out_of_range(pitch)) {
7070
return;
7171
}
7272
MidiFmChannel* fmChan = &fmChannels[chan];
@@ -76,11 +76,11 @@ void midi_fm_note_on(u8 chan, u8 pitch, s8 cents, u8 velocity)
7676
pitch = percussionPreset->key;
7777
}
7878
fmChan->velocity = velocity;
79-
synth_volume(chan, effectiveVolume(fmChan));
79+
synth_volume(chan, effective_volume(fmChan));
8080
fmChan->pitch = pitch;
8181
fmChan->cents = cents;
8282

83-
setSynthPitch(chan);
83+
set_synth_pitch(chan);
8484
synth_noteOn(chan);
8585
}
8686

@@ -94,7 +94,7 @@ void midi_fm_channel_volume(u8 chan, u8 volume)
9494
{
9595
MidiFmChannel* fmChan = &fmChannels[chan];
9696
fmChan->volume = volume;
97-
synth_volume(chan, effectiveVolume(fmChan));
97+
synth_volume(chan, effective_volume(fmChan));
9898
}
9999

100100
void midi_fm_program(u8 chan, u8 program)
@@ -118,10 +118,10 @@ void midi_fm_pan(u8 chan, u8 pan)
118118
{
119119
MidiFmChannel* fmChan = &fmChannels[chan];
120120
fmChan->pan = pan;
121-
updatePan(chan);
121+
update_pan(chan);
122122
}
123123

124-
static void updatePan(u8 chan)
124+
static void update_pan(u8 chan)
125125
{
126126
MidiFmChannel* fmChan = &fmChannels[chan];
127127
if (fmChan->pan > 95) {
@@ -138,17 +138,17 @@ u8 midi_fm_pitchToOctave(u8 pitch)
138138
return (pitch - MIN_MIDI_PITCH) / SEMITONES;
139139
}
140140

141-
static u16 lookupFreqNum(u8 pitch, u8 offset)
141+
static u16 lookup_freq_num(u8 pitch, u8 offset)
142142
{
143143
return FREQS[((u8)(pitch - MIN_MIDI_PITCH) % SEMITONES) + offset];
144144
}
145145

146-
static u8 pitchIsOutOfRange(u8 pitch)
146+
static u8 pitch_is_out_of_range(u8 pitch)
147147
{
148148
return pitch < MIN_MIDI_PITCH || pitch > MAX_MIDI_PITCH;
149149
}
150150

151-
static u8 effectiveVolume(MidiFmChannel* fmChan)
151+
static u8 effective_volume(MidiFmChannel* fmChan)
152152
{
153153
return (fmChan->volume * fmChan->velocity) / 0x7F;
154154
}
@@ -158,5 +158,5 @@ void midi_fm_pitch(u8 chan, u8 pitch, s8 cents)
158158
MidiFmChannel* fmChan = &fmChannels[chan];
159159
fmChan->pitch = pitch;
160160
fmChan->cents = cents;
161-
setSynthPitch(chan);
161+
set_synth_pitch(chan);
162162
}

0 commit comments

Comments
 (0)