FreeCalypso > hg > freecalypso-tools
view target-utils/buzplayer/cmdtab.c @ 964:a96cb97b66a2
ringtools/imy: fix duplicate definition of tdma_durations[]
The bug was reported by Vadim Yanitskiy <fixeria@osmocom.org>,
although the present fix is slightly different from the contributed
patch: because main.c doesn't need this tdma_durations[] array
at all, let's simply remove the reference to this array from main.c
rather than turn it into an extern.
I no longer remember my original thought flow that resulted (by mistake)
in tdma_durations[] being multiply defined in main.c and durations.c.
My intent might have been to define all globals in main.c and have
the reference in durations.c be an extern - and I missed that extern -
but without clear memory, I have no certainty. In any case, having
this data array defined in the same module that fills it (durations.c)
is sensible, so let's make it the new way.
author | Mychaela Falconia <falcon@freecalypso.org> |
---|---|
date | Thu, 31 Aug 2023 19:38:18 +0000 |
parents | 9092ff68e37d |
children |
line wrap: on
line source
#include "cmdtab.h" extern void cmd_abbr(); extern void cmd_abbw(); extern void cmd_baud_switch(); extern void cmd_buz(); extern void cmd_buzlev(); extern void cmd_bzt(); extern void cmd_jump(); extern void cmd_pwt(); extern void cmd_r8(); extern void cmd_r16(); extern void cmd_r32(); extern void cmd_w8(); extern void cmd_w16(); extern void cmd_w32(); extern void abb_init(); extern void abb_power_off(); extern void abb_unlock_page2(); extern void melody_init(); extern void melody_init_pwt(); extern void melody_entry(); extern void melody_play(); extern void pwt_entry_note(); extern void pwt_entry_rest(); const struct cmdtab cmdtab[] = { {"E", melody_entry}, {"EP", pwt_entry_rest}, {"ET", pwt_entry_note}, {"I", melody_init}, {"IT", melody_init_pwt}, {"P", melody_play}, {"abbinit", abb_init}, {"abbpage2", abb_unlock_page2}, {"abbr", cmd_abbr}, {"abbw", cmd_abbw}, {"baud", cmd_baud_switch}, {"buz", cmd_buz}, {"buzlev", cmd_buzlev}, {"bzt", cmd_bzt}, {"jump", cmd_jump}, {"poweroff", abb_power_off}, {"pwt", cmd_pwt}, {"r8", cmd_r8}, {"r16", cmd_r16}, {"r32", cmd_r32}, {"w8", cmd_w8}, {"w16", cmd_w16}, {"w32", cmd_w32}, {0, 0} };