Skip to content

Commit 34a4b2b

Browse files
michalsieroncarlescufi
michalsieron
authored and
carlescufi
committed
serial: uart_liteuart: Use LiteX HAL
Use LiteX HAL functions instead of `sys_read*` or `sys_write*` functions. They use them inside, but choose which one to use according to configured CSR data width. Signed-off-by: Michal Sieron <[email protected]>
1 parent e3db9a4 commit 34a4b2b

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

‎drivers/serial/uart_liteuart.c

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ struct uart_liteuart_data {
5656
static void uart_liteuart_poll_out(const struct device *dev, unsigned char c)
5757
{
5858
/* wait for space */
59-
while (sys_read8(UART_TXFULL)) {
59+
while (litex_read8(UART_TXFULL)) {
6060
}
6161

62-
sys_write8(c, UART_RXTX);
62+
litex_write8(c, UART_RXTX);
6363
}
6464

6565
/**
@@ -72,13 +72,13 @@ static void uart_liteuart_poll_out(const struct device *dev, unsigned char c)
7272
*/
7373
static int uart_liteuart_poll_in(const struct device *dev, unsigned char *c)
7474
{
75-
if (!sys_read8(UART_RXEMPTY)) {
76-
*c = sys_read8(UART_RXTX);
75+
if (!litex_read8(UART_RXEMPTY)) {
76+
*c = litex_read8(UART_RXTX);
7777

7878
/* refresh UART_RXEMPTY by writing UART_EV_RX
7979
* to UART_EV_PENDING
8080
*/
81-
sys_write8(UART_EV_RX, UART_EV_PENDING);
81+
litex_write8(UART_EV_RX, UART_EV_PENDING);
8282
return 0;
8383
} else {
8484
return -1;
@@ -93,9 +93,9 @@ static int uart_liteuart_poll_in(const struct device *dev, unsigned char *c)
9393
*/
9494
static void uart_liteuart_irq_tx_enable(const struct device *dev)
9595
{
96-
uint8_t enable = sys_read8(UART_EV_ENABLE);
96+
uint8_t enable = litex_read8(UART_EV_ENABLE);
9797

98-
sys_write8(enable | UART_EV_TX, UART_EV_ENABLE);
98+
litex_write8(enable | UART_EV_TX, UART_EV_ENABLE);
9999
}
100100

101101
/**
@@ -105,9 +105,9 @@ static void uart_liteuart_irq_tx_enable(const struct device *dev)
105105
*/
106106
static void uart_liteuart_irq_tx_disable(const struct device *dev)
107107
{
108-
uint8_t enable = sys_read8(UART_EV_ENABLE);
108+
uint8_t enable = litex_read8(UART_EV_ENABLE);
109109

110-
sys_write8(enable & ~(UART_EV_TX), UART_EV_ENABLE);
110+
litex_write8(enable & ~(UART_EV_TX), UART_EV_ENABLE);
111111
}
112112

113113
/**
@@ -117,9 +117,9 @@ static void uart_liteuart_irq_tx_disable(const struct device *dev)
117117
*/
118118
static void uart_liteuart_irq_rx_enable(const struct device *dev)
119119
{
120-
uint8_t enable = sys_read8(UART_EV_ENABLE);
120+
uint8_t enable = litex_read8(UART_EV_ENABLE);
121121

122-
sys_write8(enable | UART_EV_RX, UART_EV_ENABLE);
122+
litex_write8(enable | UART_EV_RX, UART_EV_ENABLE);
123123
}
124124

125125
/**
@@ -129,9 +129,9 @@ static void uart_liteuart_irq_rx_enable(const struct device *dev)
129129
*/
130130
static void uart_liteuart_irq_rx_disable(const struct device *dev)
131131
{
132-
uint8_t enable = sys_read8(UART_EV_ENABLE);
132+
uint8_t enable = litex_read8(UART_EV_ENABLE);
133133

134-
sys_write8(enable & ~(UART_EV_RX), UART_EV_ENABLE);
134+
litex_write8(enable & ~(UART_EV_RX), UART_EV_ENABLE);
135135
}
136136

137137
/**
@@ -143,7 +143,7 @@ static void uart_liteuart_irq_rx_disable(const struct device *dev)
143143
*/
144144
static int uart_liteuart_irq_tx_ready(const struct device *dev)
145145
{
146-
uint8_t val = sys_read8(UART_TXFULL);
146+
uint8_t val = litex_read8(UART_TXFULL);
147147

148148
return !val;
149149
}
@@ -159,7 +159,7 @@ static int uart_liteuart_irq_rx_ready(const struct device *dev)
159159
{
160160
uint8_t pending;
161161

162-
pending = sys_read8(UART_EV_PENDING);
162+
pending = litex_read8(UART_EV_PENDING);
163163

164164
if (pending & UART_EV_RX) {
165165
return 1;
@@ -182,8 +182,8 @@ static int uart_liteuart_fifo_fill(const struct device *dev,
182182
{
183183
int i;
184184

185-
for (i = 0; i < size && !sys_read8(UART_TXFULL); i++) {
186-
sys_write8(tx_data[i], UART_RXTX);
185+
for (i = 0; i < size && !litex_read8(UART_TXFULL); i++) {
186+
litex_write8(tx_data[i], UART_RXTX);
187187
}
188188

189189
return i;
@@ -203,13 +203,13 @@ static int uart_liteuart_fifo_read(const struct device *dev,
203203
{
204204
int i;
205205

206-
for (i = 0; i < size && !sys_read8(UART_RXEMPTY); i++) {
207-
rx_data[i] = sys_read8(UART_RXTX);
206+
for (i = 0; i < size && !litex_read8(UART_RXEMPTY); i++) {
207+
rx_data[i] = litex_read8(UART_RXTX);
208208

209209
/* refresh UART_RXEMPTY by writing UART_EV_RX
210210
* to UART_EV_PENDING
211211
*/
212-
sys_write8(UART_EV_RX, UART_EV_PENDING);
212+
litex_write8(UART_EV_RX, UART_EV_PENDING);
213213
}
214214

215215
return i;
@@ -231,7 +231,7 @@ static int uart_liteuart_irq_is_pending(const struct device *dev)
231231
{
232232
uint8_t pending;
233233

234-
pending = sys_read8(UART_EV_PENDING);
234+
pending = litex_read8(UART_EV_PENDING);
235235

236236
if (pending & (UART_EV_TX | UART_EV_RX)) {
237237
return 1;
@@ -272,7 +272,7 @@ static void liteuart_uart_irq_handler(const struct device *dev)
272272
}
273273

274274
/* clear events */
275-
sys_write8(UART_EV_TX | UART_EV_RX, UART_EV_PENDING);
275+
litex_write8(UART_EV_TX | UART_EV_RX, UART_EV_PENDING);
276276

277277
irq_unlock(key);
278278
}
@@ -316,7 +316,7 @@ DEVICE_DT_INST_DEFINE(0,
316316

317317
static int uart_liteuart_init(const struct device *dev)
318318
{
319-
sys_write8(UART_EV_TX | UART_EV_RX, UART_EV_PENDING);
319+
litex_write8(UART_EV_TX | UART_EV_RX, UART_EV_PENDING);
320320

321321
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
322322
IRQ_CONNECT(UART_IRQ, DT_INST_IRQ(0, priority),

0 commit comments

Comments
 (0)