Skip to content

Commit af88efe

Browse files
committed
avoif duplicate function name
1 parent 56efce7 commit af88efe

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/logic_analyzer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ void analyze(){
769769
//The DMA controller must read across the common bus to read the PIO fifo so enabled both reads and write
770770
bus_ctrl_hw->priority = BUSCTRL_BUS_PRIORITY_DMA_W_BITS | BUSCTRL_BUS_PRIORITY_DMA_R_BITS;
771771

772-
init(&dev);
772+
sr_init(&dev);
773773
//Since RP2040 is 32 bit this should always be 4B aligned, and it must be because the PIO
774774
//does DMA on a per byte basis
775775
//If either malloc fails the code will just hang

src/sr_device.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void reset(sr_device_t *d)
5050
// d->chgmask=0;
5151
};
5252
// initial post reset state
53-
void init(sr_device_t *d)
53+
void sr_init(sr_device_t *d)
5454
{
5555
reset(d);
5656
d->a_mask = 0;

src/sr_device.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ int process_char(sr_device_t *d, char charin);
8888
void reset(sr_device_t *d);
8989

9090
// initial post reset state
91-
void init(sr_device_t *d);
91+
void sr_init(sr_device_t *d);
9292

9393
// Initialize the tx buffer
9494
void tx_init(sr_device_t *d);

0 commit comments

Comments
 (0)