From 95b138b9840b777c8600b18b831c49eb61aa799f Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Wed, 19 Jun 2019 14:41:54 -0700 Subject: [PATCH] riscv-blink: make ledd registers global Make these registers global so that we can access them from anywhere. Signed-off-by: Sean Cross --- litex/deps/litex_boards | 2 +- riscv-blink/include/rgb.h | 14 ++++++++++++++ riscv-blink/src/main.c | 2 +- riscv-blink/src/rgb.c | 14 +------------- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/litex/deps/litex_boards b/litex/deps/litex_boards index 482a00a..d01711f 160000 --- a/litex/deps/litex_boards +++ b/litex/deps/litex_boards @@ -1 +1 @@ -Subproject commit 482a00aa768159fe23622a08e67a503f39007967 +Subproject commit d01711fdf9866e6c2cf658b7412501fe63866cb2 diff --git a/riscv-blink/include/rgb.h b/riscv-blink/include/rgb.h index b442cbe..5455429 100644 --- a/riscv-blink/include/rgb.h +++ b/riscv-blink/include/rgb.h @@ -12,4 +12,18 @@ void rgb_off_time(uint8_t ms); void rgb_in_time(uint8_t ms); void rgb_out_time(uint8_t ms); +enum led_registers { + LEDDCR0 = 8, + LEDDBR = 9, + LEDDONR = 10, + LEDDOFR = 11, + LEDDBCRR = 5, + LEDDBCFR = 6, + LEDDPWRR = 1, + LEDDPWRG = 2, + LEDDPWRB = 3, +}; + +void rgb_write(uint8_t value, uint8_t addr); + #endif /* _RGB_H_ */ \ No newline at end of file diff --git a/riscv-blink/src/main.c b/riscv-blink/src/main.c index e40134a..05089f8 100644 --- a/riscv-blink/src/main.c +++ b/riscv-blink/src/main.c @@ -35,7 +35,7 @@ void isr(void) { } -void main(void) { +int main(void) { rgb_init(); irq_setie(0); int i = 0; diff --git a/riscv-blink/src/rgb.c b/riscv-blink/src/rgb.c index a6c30bf..7cc3d21 100644 --- a/riscv-blink/src/rgb.c +++ b/riscv-blink/src/rgb.c @@ -2,18 +2,6 @@ #include #include -enum led_registers { - LEDDCR0 = 8, - LEDDBR = 9, - LEDDONR = 10, - LEDDOFR = 11, - LEDDBCRR = 5, - LEDDBCFR = 6, - LEDDPWRR = 1, - LEDDPWRG = 2, - LEDDPWRB = 3, -}; - #define BREATHE_ENABLE (1 << 7) #define BREATHE_EDGE_ON (0 << 6) #define BREATHE_EDGE_BOTH (1 << 6) @@ -34,7 +22,7 @@ enum led_registers { #define PWM_MODE_LFSR (1 << 2) #define PWM_MODE_LINEAR (0 << 2) -static void rgb_write(uint8_t value, uint8_t addr) { +void rgb_write(uint8_t value, uint8_t addr) { rgb_addr_write(addr); rgb_dat_write(value); }