From c75060eeac2810bd6ffe540e9949952eeb8e41f3 Mon Sep 17 00:00:00 2001 From: Josh Rahm Date: Thu, 19 Nov 2020 00:22:08 -0700 Subject: change rcc & usart to use the regtest() macros and. --- 02-usart/src/core/usart.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to '02-usart/src/core/usart.c') diff --git a/02-usart/src/core/usart.c b/02-usart/src/core/usart.c index 8f58d8b..dc15e57 100644 --- a/02-usart/src/core/usart.c +++ b/02-usart/src/core/usart.c @@ -44,12 +44,12 @@ void usart_set_enabled(__IO usart_t* usart, usart_enable_t enabled) uint32_t c_r1 = usart->c_r1; if (!enabled) { - usart->c1_bf.ue = 0; + regset(usart->c_r1, usart_ue, 0); } else { /* Set the rx enabled. */ - usart->c1_bf.re = !!(enabled & USART_ENABLE_RX); - usart->c1_bf.te = !!(enabled & USART_ENABLE_TX); - usart->c1_bf.ue = 1; + regset(usart->c_r1, usart_re, !!(enabled & USART_ENABLE_RX)); + regset(usart->c_r1, usart_te, !!(enabled & USART_ENABLE_TX)); + regset(usart->c_r1, usart_ue, 1); } } @@ -85,16 +85,16 @@ void usart_enable_dma(__IO usart_t* usart, usart_enable_t enabled) { switch(enabled) { case USART_ENABLE_DISABLED: - usart->c3_bf.dmar = 0; - usart->c3_bf.dmat = 0; + regset(usart->c_r3, usart_dmar, 0); + regset(usart->c_r3, usart_dmat, 0); break; case USART_ENABLE_TX: - usart->c3_bf.dmat = 1; + regset(usart->c_r3, usart_dmat, 1); break; case USART_ENABLE_RX: - usart->c3_bf.dmar = 1; + regset(usart->c_r3, usart_dmar, 1); break; }; } -- cgit