Skip to content

Commit 5b54cfb

Browse files
author
Sebastian Stockhammer
committed
Rename rx-/tx-irq-enable methods to be more expressive
- Indicate that UARTSerial::update_rx_irq/update_tx_irq is not symmetric to UARTSerial::disable_rx_irq/disable_tx_irq
1 parent 717e851 commit 5b54cfb

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

drivers/UARTSerial.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,9 @@ class UARTSerial : private SerialBase, public FileHandle, private NonCopyable<UA
278278
/** Unbuffered write - invoked when write called from critical section */
279279
ssize_t write_unbuffered(const char *buf_ptr, size_t length);
280280

281-
void enable_rx_irq();
281+
void update_rx_irq();
282282
void disable_rx_irq();
283-
void enable_tx_irq();
283+
void update_tx_irq();
284284
void disable_tx_irq();
285285

286286
/** Software serial buffers

drivers/source/UARTSerial.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ UARTSerial::UARTSerial(PinName tx, PinName rx, int baud) :
3131
_dcd_irq(NULL)
3232
{
3333
/* Attatch IRQ routines to the serial device. */
34-
enable_rx_irq();
34+
update_rx_irq();
3535
}
3636

3737
UARTSerial::UARTSerial(const serial_pinmap_t &static_pinmap, int baud) :
@@ -42,7 +42,7 @@ UARTSerial::UARTSerial(const serial_pinmap_t &static_pinmap, int baud) :
4242
_dcd_irq(NULL)
4343
{
4444
/* Attatch IRQ routines to the serial device. */
45-
enable_rx_irq();
45+
update_rx_irq();
4646
}
4747

4848
UARTSerial::~UARTSerial()
@@ -192,7 +192,7 @@ ssize_t UARTSerial::write(const void *buffer, size_t length)
192192
data_written++;
193193
}
194194

195-
enable_tx_irq();
195+
update_tx_irq();
196196
}
197197

198198
api_unlock();
@@ -227,7 +227,7 @@ ssize_t UARTSerial::read(void *buffer, size_t length)
227227
data_read++;
228228
}
229229

230-
enable_rx_irq();
230+
update_rx_irq();
231231

232232
api_unlock();
233233

@@ -335,7 +335,7 @@ void UARTSerial::tx_irq(void)
335335
}
336336

337337
/* These are all called from critical section */
338-
void UARTSerial::enable_rx_irq()
338+
void UARTSerial::update_rx_irq()
339339
{
340340
core_util_critical_section_enter();
341341
if (_rx_enabled && !_rx_irq_enabled) {
@@ -354,7 +354,7 @@ void UARTSerial::disable_rx_irq()
354354
_rx_irq_enabled = false;
355355
}
356356

357-
void UARTSerial::enable_tx_irq()
357+
void UARTSerial::update_tx_irq()
358358
{
359359
core_util_critical_section_enter();
360360
if (_tx_enabled && !_tx_irq_enabled) {
@@ -377,7 +377,7 @@ int UARTSerial::enable_input(bool enabled)
377377
{
378378
api_lock();
379379
SerialBase::enable_input(enabled);
380-
enable_rx_irq(); // Enable interrupt to handle incoming data
380+
update_rx_irq(); // Eventually enable rx-interrupt to handle incoming data
381381
api_unlock();
382382

383383
return 0;
@@ -387,7 +387,7 @@ int UARTSerial::enable_output(bool enabled)
387387
{
388388
api_lock();
389389
SerialBase::enable_output(enabled);
390-
enable_tx_irq(); // Enable interrupt to flush buffered data
390+
update_tx_irq(); // Eventually enable tx-interrupt to flush buffered data
391391
api_unlock();
392392

393393
return 0;

0 commit comments

Comments
 (0)