1.1 --- a/examples/demo/main.c Tue Oct 23 21:34:54 2018 +0200
1.2 +++ b/examples/demo/main.c Tue Oct 23 22:11:05 2018 +0200
1.3 @@ -21,7 +21,11 @@
1.4 #include "pic32_c.h"
1.5 #include "init.h"
1.6 #include "debug.h"
1.7 +
1.8 +/* Specific functionality. */
1.9 +
1.10 #include "main.h"
1.11 +#include "devconfig.h"
1.12
1.13 static const char message1[] = "Hello!\r\n";
1.14
1.15 @@ -148,7 +152,7 @@
1.16 /* Set UART interrupt priority above CPU priority to process events and to
1.17 enable the first DMA channel. */
1.18
1.19 - uart_init(1, 115200);
1.20 + uart_init(1, FPB, 115200);
1.21 uart_init_interrupt(1, UxRIF, 7, 3);
1.22 uart_on(1);
1.23
2.1 --- a/examples/vga-dual/main.c Tue Oct 23 21:34:54 2018 +0200
2.2 +++ b/examples/vga-dual/main.c Tue Oct 23 22:11:05 2018 +0200
2.3 @@ -25,6 +25,7 @@
2.4 /* Specific functionality. */
2.5
2.6 #include "main.h"
2.7 +#include "devconfig.h"
2.8 #include "vga.h"
2.9 #include "display.h"
2.10
2.11 @@ -153,7 +154,7 @@
2.12 oc_init(2, 0b010, 2);
2.13 oc_set_pulse(2, 0);
2.14
2.15 - uart_init(1, 115200);
2.16 + uart_init(1, FPB, 115200);
2.17 uart_on(1);
2.18
2.19 interrupts_on();
3.1 --- a/examples/vga-pmp/main.c Tue Oct 23 21:34:54 2018 +0200
3.2 +++ b/examples/vga-pmp/main.c Tue Oct 23 22:11:05 2018 +0200
3.3 @@ -21,7 +21,11 @@
3.4 #include "pic32_c.h"
3.5 #include "init.h"
3.6 #include "debug.h"
3.7 +
3.8 +/* Specific functionality. */
3.9 +
3.10 #include "main.h"
3.11 +#include "devconfig.h"
3.12 #include "vga.h"
3.13
3.14
3.15 @@ -150,7 +154,7 @@
3.16 oc_init(2, 0b010, 2);
3.17 oc_set_pulse(2, 0);
3.18
3.19 - uart_init(1, 115200);
3.20 + uart_init(1, FPB, 115200);
3.21 uart_on(1);
3.22
3.23 interrupts_on();
4.1 --- a/examples/vga-timer/main.c Tue Oct 23 21:34:54 2018 +0200
4.2 +++ b/examples/vga-timer/main.c Tue Oct 23 22:11:05 2018 +0200
4.3 @@ -25,6 +25,7 @@
4.4 /* Specific functionality. */
4.5
4.6 #include "main.h"
4.7 +#include "devconfig.h"
4.8 #include "vga.h"
4.9 #include "display.h"
4.10
4.11 @@ -180,7 +181,7 @@
4.12 oc_init(2, 0b010, 2);
4.13 oc_set_pulse(2, 0);
4.14
4.15 - uart_init(1, 115200);
4.16 + uart_init(1, FPB, 115200);
4.17 uart_on(1);
4.18
4.19 interrupts_on();
5.1 --- a/examples/vga/main.c Tue Oct 23 21:34:54 2018 +0200
5.2 +++ b/examples/vga/main.c Tue Oct 23 22:11:05 2018 +0200
5.3 @@ -25,6 +25,7 @@
5.4 /* Specific functionality. */
5.5
5.6 #include "main.h"
5.7 +#include "devconfig.h"
5.8 #include "vga.h"
5.9 #include "display.h"
5.10
5.11 @@ -143,7 +144,7 @@
5.12 oc_init(2, 0b010, 2);
5.13 oc_set_pulse(2, 0);
5.14
5.15 - uart_init(1, 115200);
5.16 + uart_init(1, FPB, 115200);
5.17 uart_on(1);
5.18
5.19 interrupts_on();
6.1 --- a/include/init.h Tue Oct 23 21:34:54 2018 +0200
6.2 +++ b/include/init.h Tue Oct 23 22:11:05 2018 +0200
6.3 @@ -152,7 +152,7 @@
6.4
6.5 /* UART configuration. */
6.6
6.7 -void uart_init(int uart, uint32_t baudrate);
6.8 +void uart_init(int uart, int fpb, uint32_t baudrate);
6.9
6.10 void uart_init_interrupt(int uart, uint8_t conditions,
6.11 uint8_t pri, uint8_t sub);
7.1 --- a/lib/init.c Tue Oct 23 21:34:54 2018 +0200
7.2 +++ b/lib/init.c Tue Oct 23 22:11:05 2018 +0200
7.3 @@ -21,10 +21,6 @@
7.4 #include "pic32_c.h"
7.5 #include "init.h"
7.6
7.7 -/* Application-specific configuration. */
7.8 -
7.9 -#include "devconfig.h"
7.10 -
7.11
7.12
7.13 /* Basic memory and pin initialisation. */
7.14 @@ -505,7 +501,7 @@
7.15
7.16 /* UART configuration. */
7.17
7.18 -void uart_init(int uart, uint32_t baudrate)
7.19 +void uart_init(int uart, int fpb, uint32_t baudrate)
7.20 {
7.21 /* FPB is configured in the devconfig.h file and set in the start.S file. */
7.22
7.23 @@ -524,7 +520,7 @@
7.24 = 12
7.25 */
7.26
7.27 - REG(UART_REG(uart, UxBRG)) = (FPB / (16 * baudrate)) - 1;
7.28 + REG(UART_REG(uart, UxBRG)) = (fpb / (16 * baudrate)) - 1;
7.29 }
7.30
7.31 /* Configure interrupts caused by the UART. */