diff options
| author | Bunnaroath Sou <35707615+bsousi5@users.noreply.github.com> | 2019-01-11 13:38:24 -0800 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-11 13:38:24 -0800 | 
| commit | ccecf94bf1419209458fdfb116944246ef2eeec7 (patch) | |
| tree | 9c32d842d44178f76c47ba51129582f196d9408c | |
| parent | 39c32deaad0418da56745e04e42c340264740054 (diff) | |
| parent | e0c003680eb9f73bed10eedb73c0542f53f7cc78 (diff) | |
Merge pull request #143 from sifive/mee-ex-locali
Update freedom-mee and mee.h files to pickup interrupt fixes
| -rw-r--r-- | bsp/coreip-e31-arty/mee.h | 13 | ||||
| -rw-r--r-- | bsp/coreip-e31/mee.h | 2 | ||||
| -rw-r--r-- | bsp/coreip-s51-arty/mee.h | 13 | ||||
| -rw-r--r-- | bsp/coreip-s51/mee.h | 2 | ||||
| -rw-r--r-- | bsp/freedom-e310-arty/mee.h | 1 | ||||
| -rw-r--r-- | bsp/sifive-hifive1/mee.h | 1 | ||||
| m--------- | freedom-mee | 0 | 
7 files changed, 32 insertions, 0 deletions
diff --git a/bsp/coreip-e31-arty/mee.h b/bsp/coreip-e31-arty/mee.h index 0c1a366..b482d73 100644 --- a/bsp/coreip-e31-arty/mee.h +++ b/bsp/coreip-e31-arty/mee.h @@ -172,6 +172,7 @@ struct __mee_driver_riscv_clint0 __mee_dt_clint_2000000 = {  struct __mee_driver_sifive_local_external_interrupts0 __mee_dt_local_external_interrupts_0 = {      .vtable = &__mee_driver_vtable_sifive_local_external_interrupts0,      .irc.vtable = &__mee_driver_vtable_sifive_local_external_interrupts0.local0_vtable, +    .init_done = 0,  /* From interrupt_controller */      .interrupt_parent = &__mee_dt_interrupt_controller.controller,      .num_interrupts = MEE_MAX_LOCAL_EXT_INTERRUPTS, @@ -222,6 +223,7 @@ struct __mee_driver_riscv_plic0 __mee_dt_interrupt_controller_c000000 = {  struct __mee_driver_sifive_global_external_interrupts0 __mee_dt_global_external_interrupts = {      .vtable = &__mee_driver_vtable_sifive_global_external_interrupts0,      .irc.vtable = &__mee_driver_vtable_sifive_global_external_interrupts0.global0_vtable, +    .init_done = 0,  /* From interrupt_controller@c000000 */      .interrupt_parent = &__mee_dt_interrupt_controller_c000000.plic0,      .num_interrupts = MEE_MAX_GLOBAL_EXT_INTERRUPTS, @@ -280,6 +282,7 @@ struct __mee_driver_sifive_uart0 __mee_dt_serial_20000000 = {  /* From led@0red */  struct __mee_driver_sifive_gpio_led __mee_dt_led_0red = {      .vtable = &__mee_driver_vtable_sifive_led, +    .led.vtable = &__mee_driver_vtable_sifive_led.led_vtable,  /* From gpio@20002000 */      .gpio = &__mee_dt_gpio_20002000,      .pin = 0UL, @@ -289,6 +292,7 @@ struct __mee_driver_sifive_gpio_led __mee_dt_led_0red = {  /* From led@0green */  struct __mee_driver_sifive_gpio_led __mee_dt_led_0green = {      .vtable = &__mee_driver_vtable_sifive_led, +    .led.vtable = &__mee_driver_vtable_sifive_led.led_vtable,  /* From gpio@20002000 */      .gpio = &__mee_dt_gpio_20002000,      .pin = 1UL, @@ -298,6 +302,7 @@ struct __mee_driver_sifive_gpio_led __mee_dt_led_0green = {  /* From led@0blue */  struct __mee_driver_sifive_gpio_led __mee_dt_led_0blue = {      .vtable = &__mee_driver_vtable_sifive_led, +    .led.vtable = &__mee_driver_vtable_sifive_led.led_vtable,  /* From gpio@20002000 */      .gpio = &__mee_dt_gpio_20002000,      .pin = 2UL, @@ -307,6 +312,7 @@ struct __mee_driver_sifive_gpio_led __mee_dt_led_0blue = {  /* From button@0 */  struct __mee_driver_sifive_gpio_button __mee_dt_button_0 = {      .vtable = &__mee_driver_vtable_sifive_button, +    .button.vtable = &__mee_driver_vtable_sifive_button.button_vtable,  /* From gpio@20002000 */      .gpio = &__mee_dt_gpio_20002000,      .pin = 4UL, @@ -319,6 +325,7 @@ struct __mee_driver_sifive_gpio_button __mee_dt_button_0 = {  /* From button@1 */  struct __mee_driver_sifive_gpio_button __mee_dt_button_1 = {      .vtable = &__mee_driver_vtable_sifive_button, +    .button.vtable = &__mee_driver_vtable_sifive_button.button_vtable,  /* From gpio@20002000 */      .gpio = &__mee_dt_gpio_20002000,      .pin = 5UL, @@ -331,6 +338,7 @@ struct __mee_driver_sifive_gpio_button __mee_dt_button_1 = {  /* From button@2 */  struct __mee_driver_sifive_gpio_button __mee_dt_button_2 = {      .vtable = &__mee_driver_vtable_sifive_button, +    .button.vtable = &__mee_driver_vtable_sifive_button.button_vtable,  /* From gpio@20002000 */      .gpio = &__mee_dt_gpio_20002000,      .pin = 6UL, @@ -343,6 +351,7 @@ struct __mee_driver_sifive_gpio_button __mee_dt_button_2 = {  /* From button@3 */  struct __mee_driver_sifive_gpio_button __mee_dt_button_3 = {      .vtable = &__mee_driver_vtable_sifive_button, +    .button.vtable = &__mee_driver_vtable_sifive_button.button_vtable,  /* From gpio@20002000 */      .gpio = &__mee_dt_gpio_20002000,      .pin = 7UL, @@ -355,6 +364,7 @@ struct __mee_driver_sifive_gpio_button __mee_dt_button_3 = {  /* From switch@0 */  struct __mee_driver_sifive_gpio_switch __mee_dt_switch_0 = {      .vtable = &__mee_driver_vtable_sifive_switch, +    .flip.vtable = &__mee_driver_vtable_sifive_switch.switch_vtable,  /* From global_external_interrupts */      .interrupt_parent = &__mee_dt_global_external_interrupts.irc,      .interrupt_line = 0UL, @@ -364,6 +374,7 @@ struct __mee_driver_sifive_gpio_switch __mee_dt_switch_0 = {  /* From switch@1 */  struct __mee_driver_sifive_gpio_switch __mee_dt_switch_1 = {      .vtable = &__mee_driver_vtable_sifive_switch, +    .flip.vtable = &__mee_driver_vtable_sifive_switch.switch_vtable,  /* From global_external_interrupts */      .interrupt_parent = &__mee_dt_global_external_interrupts.irc,      .interrupt_line = 1UL, @@ -373,6 +384,7 @@ struct __mee_driver_sifive_gpio_switch __mee_dt_switch_1 = {  /* From switch@2 */  struct __mee_driver_sifive_gpio_switch __mee_dt_switch_2 = {      .vtable = &__mee_driver_vtable_sifive_switch, +    .flip.vtable = &__mee_driver_vtable_sifive_switch.switch_vtable,  /* From global_external_interrupts */      .interrupt_parent = &__mee_dt_global_external_interrupts.irc,      .interrupt_line = 2UL, @@ -382,6 +394,7 @@ struct __mee_driver_sifive_gpio_switch __mee_dt_switch_2 = {  /* From switch@3 */  struct __mee_driver_sifive_gpio_switch __mee_dt_switch_3 = {      .vtable = &__mee_driver_vtable_sifive_switch, +    .flip.vtable = &__mee_driver_vtable_sifive_switch.switch_vtable,  /* From local_external_interrupts_0 */      .interrupt_parent = &__mee_dt_local_external_interrupts_0.irc,      .interrupt_line = 3UL, diff --git a/bsp/coreip-e31/mee.h b/bsp/coreip-e31/mee.h index b261a48..421f6c6 100644 --- a/bsp/coreip-e31/mee.h +++ b/bsp/coreip-e31/mee.h @@ -97,6 +97,7 @@ struct __mee_driver_riscv_clint0 __mee_dt_clint_2000000 = {  struct __mee_driver_sifive_local_external_interrupts0 __mee_dt_local_external_interrupts_0 = {      .vtable = &__mee_driver_vtable_sifive_local_external_interrupts0,      .irc.vtable = &__mee_driver_vtable_sifive_local_external_interrupts0.local0_vtable, +    .init_done = 0,  /* From interrupt_controller */      .interrupt_parent = &__mee_dt_interrupt_controller.controller,      .num_interrupts = MEE_MAX_LOCAL_EXT_INTERRUPTS, @@ -147,6 +148,7 @@ struct __mee_driver_riscv_plic0 __mee_dt_interrupt_controller_c000000 = {  struct __mee_driver_sifive_global_external_interrupts0 __mee_dt_global_external_interrupts = {      .vtable = &__mee_driver_vtable_sifive_global_external_interrupts0,      .irc.vtable = &__mee_driver_vtable_sifive_global_external_interrupts0.global0_vtable, +    .init_done = 0,  /* From interrupt_controller@c000000 */      .interrupt_parent = &__mee_dt_interrupt_controller_c000000.plic0,      .num_interrupts = MEE_MAX_GLOBAL_EXT_INTERRUPTS, diff --git a/bsp/coreip-s51-arty/mee.h b/bsp/coreip-s51-arty/mee.h index 1042cfe..c87f9a6 100644 --- a/bsp/coreip-s51-arty/mee.h +++ b/bsp/coreip-s51-arty/mee.h @@ -172,6 +172,7 @@ struct __mee_driver_riscv_clint0 __mee_dt_clint_2000000 = {  struct __mee_driver_sifive_local_external_interrupts0 __mee_dt_local_external_interrupts_0 = {      .vtable = &__mee_driver_vtable_sifive_local_external_interrupts0,      .irc.vtable = &__mee_driver_vtable_sifive_local_external_interrupts0.local0_vtable, +    .init_done = 0,  /* From interrupt_controller */      .interrupt_parent = &__mee_dt_interrupt_controller.controller,      .num_interrupts = MEE_MAX_LOCAL_EXT_INTERRUPTS, @@ -222,6 +223,7 @@ struct __mee_driver_riscv_plic0 __mee_dt_interrupt_controller_c000000 = {  struct __mee_driver_sifive_global_external_interrupts0 __mee_dt_global_external_interrupts = {      .vtable = &__mee_driver_vtable_sifive_global_external_interrupts0,      .irc.vtable = &__mee_driver_vtable_sifive_global_external_interrupts0.global0_vtable, +    .init_done = 0,  /* From interrupt_controller@c000000 */      .interrupt_parent = &__mee_dt_interrupt_controller_c000000.plic0,      .num_interrupts = MEE_MAX_GLOBAL_EXT_INTERRUPTS, @@ -280,6 +282,7 @@ struct __mee_driver_sifive_uart0 __mee_dt_serial_20000000 = {  /* From led@0red */  struct __mee_driver_sifive_gpio_led __mee_dt_led_0red = {      .vtable = &__mee_driver_vtable_sifive_led, +    .led.vtable = &__mee_driver_vtable_sifive_led.led_vtable,  /* From gpio@20002000 */      .gpio = &__mee_dt_gpio_20002000,      .pin = 0UL, @@ -289,6 +292,7 @@ struct __mee_driver_sifive_gpio_led __mee_dt_led_0red = {  /* From led@0green */  struct __mee_driver_sifive_gpio_led __mee_dt_led_0green = {      .vtable = &__mee_driver_vtable_sifive_led, +    .led.vtable = &__mee_driver_vtable_sifive_led.led_vtable,  /* From gpio@20002000 */      .gpio = &__mee_dt_gpio_20002000,      .pin = 1UL, @@ -298,6 +302,7 @@ struct __mee_driver_sifive_gpio_led __mee_dt_led_0green = {  /* From led@0blue */  struct __mee_driver_sifive_gpio_led __mee_dt_led_0blue = {      .vtable = &__mee_driver_vtable_sifive_led, +    .led.vtable = &__mee_driver_vtable_sifive_led.led_vtable,  /* From gpio@20002000 */      .gpio = &__mee_dt_gpio_20002000,      .pin = 2UL, @@ -307,6 +312,7 @@ struct __mee_driver_sifive_gpio_led __mee_dt_led_0blue = {  /* From button@0 */  struct __mee_driver_sifive_gpio_button __mee_dt_button_0 = {      .vtable = &__mee_driver_vtable_sifive_button, +    .button.vtable = &__mee_driver_vtable_sifive_button.button_vtable,  /* From gpio@20002000 */      .gpio = &__mee_dt_gpio_20002000,      .pin = 4UL, @@ -319,6 +325,7 @@ struct __mee_driver_sifive_gpio_button __mee_dt_button_0 = {  /* From button@1 */  struct __mee_driver_sifive_gpio_button __mee_dt_button_1 = {      .vtable = &__mee_driver_vtable_sifive_button, +    .button.vtable = &__mee_driver_vtable_sifive_button.button_vtable,  /* From gpio@20002000 */      .gpio = &__mee_dt_gpio_20002000,      .pin = 5UL, @@ -331,6 +338,7 @@ struct __mee_driver_sifive_gpio_button __mee_dt_button_1 = {  /* From button@2 */  struct __mee_driver_sifive_gpio_button __mee_dt_button_2 = {      .vtable = &__mee_driver_vtable_sifive_button, +    .button.vtable = &__mee_driver_vtable_sifive_button.button_vtable,  /* From gpio@20002000 */      .gpio = &__mee_dt_gpio_20002000,      .pin = 6UL, @@ -343,6 +351,7 @@ struct __mee_driver_sifive_gpio_button __mee_dt_button_2 = {  /* From button@3 */  struct __mee_driver_sifive_gpio_button __mee_dt_button_3 = {      .vtable = &__mee_driver_vtable_sifive_button, +    .button.vtable = &__mee_driver_vtable_sifive_button.button_vtable,  /* From gpio@20002000 */      .gpio = &__mee_dt_gpio_20002000,      .pin = 7UL, @@ -355,6 +364,7 @@ struct __mee_driver_sifive_gpio_button __mee_dt_button_3 = {  /* From switch@0 */  struct __mee_driver_sifive_gpio_switch __mee_dt_switch_0 = {      .vtable = &__mee_driver_vtable_sifive_switch, +    .flip.vtable = &__mee_driver_vtable_sifive_switch.switch_vtable,  /* From global_external_interrupts */      .interrupt_parent = &__mee_dt_global_external_interrupts.irc,      .interrupt_line = 0UL, @@ -364,6 +374,7 @@ struct __mee_driver_sifive_gpio_switch __mee_dt_switch_0 = {  /* From switch@1 */  struct __mee_driver_sifive_gpio_switch __mee_dt_switch_1 = {      .vtable = &__mee_driver_vtable_sifive_switch, +    .flip.vtable = &__mee_driver_vtable_sifive_switch.switch_vtable,  /* From global_external_interrupts */      .interrupt_parent = &__mee_dt_global_external_interrupts.irc,      .interrupt_line = 1UL, @@ -373,6 +384,7 @@ struct __mee_driver_sifive_gpio_switch __mee_dt_switch_1 = {  /* From switch@2 */  struct __mee_driver_sifive_gpio_switch __mee_dt_switch_2 = {      .vtable = &__mee_driver_vtable_sifive_switch, +    .flip.vtable = &__mee_driver_vtable_sifive_switch.switch_vtable,  /* From global_external_interrupts */      .interrupt_parent = &__mee_dt_global_external_interrupts.irc,      .interrupt_line = 2UL, @@ -382,6 +394,7 @@ struct __mee_driver_sifive_gpio_switch __mee_dt_switch_2 = {  /* From switch@3 */  struct __mee_driver_sifive_gpio_switch __mee_dt_switch_3 = {      .vtable = &__mee_driver_vtable_sifive_switch, +    .flip.vtable = &__mee_driver_vtable_sifive_switch.switch_vtable,  /* From local_external_interrupts_0 */      .interrupt_parent = &__mee_dt_local_external_interrupts_0.irc,      .interrupt_line = 3UL, diff --git a/bsp/coreip-s51/mee.h b/bsp/coreip-s51/mee.h index c650aad..3e0f535 100644 --- a/bsp/coreip-s51/mee.h +++ b/bsp/coreip-s51/mee.h @@ -97,6 +97,7 @@ struct __mee_driver_riscv_clint0 __mee_dt_clint_2000000 = {  struct __mee_driver_sifive_local_external_interrupts0 __mee_dt_local_external_interrupts_0 = {      .vtable = &__mee_driver_vtable_sifive_local_external_interrupts0,      .irc.vtable = &__mee_driver_vtable_sifive_local_external_interrupts0.local0_vtable, +    .init_done = 0,  /* From interrupt_controller */      .interrupt_parent = &__mee_dt_interrupt_controller.controller,      .num_interrupts = MEE_MAX_LOCAL_EXT_INTERRUPTS, @@ -147,6 +148,7 @@ struct __mee_driver_riscv_plic0 __mee_dt_interrupt_controller_c000000 = {  struct __mee_driver_sifive_global_external_interrupts0 __mee_dt_global_external_interrupts = {      .vtable = &__mee_driver_vtable_sifive_global_external_interrupts0,      .irc.vtable = &__mee_driver_vtable_sifive_global_external_interrupts0.global0_vtable, +    .init_done = 0,  /* From interrupt_controller@c000000 */      .interrupt_parent = &__mee_dt_interrupt_controller_c000000.plic0,      .num_interrupts = MEE_MAX_GLOBAL_EXT_INTERRUPTS, diff --git a/bsp/freedom-e310-arty/mee.h b/bsp/freedom-e310-arty/mee.h index b97bd23..45da0e8 100644 --- a/bsp/freedom-e310-arty/mee.h +++ b/bsp/freedom-e310-arty/mee.h @@ -112,6 +112,7 @@ struct __mee_driver_riscv_clint0 __mee_dt_clint_2000000 = {  struct __mee_driver_sifive_local_external_interrupts0 __mee_dt_local_external_interrupts_0 = {      .vtable = &__mee_driver_vtable_sifive_local_external_interrupts0,      .irc.vtable = &__mee_driver_vtable_sifive_local_external_interrupts0.local0_vtable, +    .init_done = 0,  /* From interrupt_controller */      .interrupt_parent = &__mee_dt_interrupt_controller.controller,      .num_interrupts = MEE_MAX_LOCAL_EXT_INTERRUPTS, diff --git a/bsp/sifive-hifive1/mee.h b/bsp/sifive-hifive1/mee.h index 87d90ad..28868b5 100644 --- a/bsp/sifive-hifive1/mee.h +++ b/bsp/sifive-hifive1/mee.h @@ -154,6 +154,7 @@ struct __mee_driver_riscv_clint0 __mee_dt_clint_2000000 = {  struct __mee_driver_sifive_local_external_interrupts0 __mee_dt_local_external_interrupts_0 = {      .vtable = &__mee_driver_vtable_sifive_local_external_interrupts0,      .irc.vtable = &__mee_driver_vtable_sifive_local_external_interrupts0.local0_vtable, +    .init_done = 0,  /* From interrupt_controller */      .interrupt_parent = &__mee_dt_interrupt_controller.controller,      .num_interrupts = MEE_MAX_LOCAL_EXT_INTERRUPTS, diff --git a/freedom-mee b/freedom-mee -Subproject 4cb6abd908c9b1a1466ce9f5288d96ac9189828 +Subproject fdb41ae7f9c2bbae0b912b31aec3f9626e6cd76  | 
