This is an automated email from the ASF dual-hosted git repository.

mlaz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git

commit d870b9d608109b6b8b0a7d320f42520b828a5a72
Merge: a82f5bf 3c2c8de
Author: Miguel Azevedo <miguella...@gmail.com>
AuthorDate: Wed Feb 14 13:48:11 2018 -0200

    Merge pull request #763 from mlaz/integrate_nrfx
    
    Integrate nrfx along with all drivers from mynewt_nordic.

 apps/pwm_test/pkg.yml                              |     2 +-
 apps/pwm_test/src/main.c                           |    39 +-
 apps/soft_pwm_test/src/main.c                      |    68 -
 hw/bsp/ada_feather_nrf52/pkg.yml                   |   136 +-
 hw/bsp/ada_feather_nrf52/src/hal_bsp.c             |    85 +
 hw/bsp/arduino_primo_nrf52/pkg.yml                 |   136 +-
 hw/bsp/arduino_primo_nrf52/src/hal_bsp.c           |    97 +
 hw/bsp/bbc_microbit/pkg.yml                        |    92 +-
 hw/bsp/bbc_microbit/src/hal_bsp.c                  |    23 +
 hw/bsp/bbc_microbit/syscfg.yml                     |    10 +
 hw/bsp/ble400/pkg.yml                              |    90 +-
 hw/bsp/ble400/src/hal_bsp.c                        |    23 +
 hw/bsp/ble400/syscfg.yml                           |    10 +
 hw/bsp/bmd200/pkg.yml                              |    90 +-
 hw/bsp/bmd200/src/hal_bsp.c                        |    23 +
 hw/bsp/bmd200/syscfg.yml                           |    10 +
 hw/bsp/bmd300eval/pkg.yml                          |   136 +-
 hw/bsp/bmd300eval/src/hal_bsp.c                    |    92 +
 hw/bsp/calliope_mini/pkg.yml                       |    91 +-
 hw/bsp/calliope_mini/src/hal_bsp.c                 |    22 +
 hw/bsp/calliope_mini/syscfg.yml                    |    10 +
 hw/bsp/nina-b1/pkg.yml                             |   145 +-
 hw/bsp/nina-b1/src/hal_bsp.c                       |    86 +
 hw/bsp/nina-b1/syscfg.yml                          |     5 +-
 hw/bsp/nrf51-arduino_101/pkg.yml                   |    94 +-
 hw/bsp/nrf51-arduino_101/src/hal_bsp.c             |    23 +
 hw/bsp/nrf51-arduino_101/syscfg.yml                |    10 +
 hw/bsp/nrf51-blenano/pkg.yml                       |    92 +-
 hw/bsp/nrf51-blenano/src/hal_bsp.c                 |    22 +
 hw/bsp/nrf51-blenano/syscfg.yml                    |    10 +
 hw/bsp/nrf51dk-16kbram/pkg.yml                     |    94 +-
 hw/bsp/nrf51dk-16kbram/src/hal_bsp.c               |    23 +
 hw/bsp/nrf51dk-16kbram/syscfg.yml                  |    10 +
 hw/bsp/nrf51dk/pkg.yml                             |    90 +-
 hw/bsp/nrf51dk/src/hal_bsp.c                       |    24 +
 hw/bsp/nrf51dk/syscfg.yml                          |    10 +
 hw/bsp/nrf52-thingy/pkg.yml                        |   137 +-
 hw/bsp/nrf52-thingy/src/hal_bsp.c                  |    77 +-
 hw/bsp/nrf52840pdk/pkg.yml                         |   153 +-
 hw/bsp/nrf52840pdk/src/hal_bsp.c                   |   102 +
 hw/bsp/nrf52840pdk/syscfg.yml                      |     3 +
 hw/bsp/nrf52dk/pkg.yml                             |   133 +-
 hw/bsp/nrf52dk/src/hal_bsp.c                       |    39 +-
 hw/bsp/nrf52dk/syscfg.yml                          |    20 -
 hw/bsp/rb-blend2/pkg.yml                           |   141 +-
 hw/bsp/rb-blend2/src/hal_bsp.c                     |    86 +
 hw/bsp/rb-blend2/syscfg.yml                        |     5 +-
 hw/bsp/rb-nano2/pkg.yml                            |   139 +-
 hw/bsp/rb-nano2/src/hal_bsp.c                      |   119 +-
 hw/bsp/rb-nano2/syscfg.yml                         |    10 +
 hw/bsp/ruuvi_tag_revb2/pkg.yml                     |   136 +-
 hw/bsp/ruuvi_tag_revb2/src/hal_bsp.c               |    85 +
 hw/bsp/telee02/pkg.yml                             |   136 +-
 hw/bsp/telee02/src/hal_bsp.c                       |    85 +
 hw/bsp/vbluno51/pkg.yml                            |    92 +-
 hw/bsp/vbluno51/src/hal_bsp.c                      |    23 +
 hw/bsp/vbluno51/syscfg.yml                         |    10 +
 hw/bsp/vbluno52/pkg.yml                            |   136 +-
 hw/bsp/vbluno52/src/hal_bsp.c                      |    85 +
 .../adc/adc_nrf51/include/adc_nrf51/adc_nrf51.h    |    44 +
 .../pwm_test => hw/drivers/adc/adc_nrf51}/pkg.yml  |    13 +-
 hw/drivers/adc/adc_nrf51/src/adc_nrf51.c           |   409 +
 .../adc/adc_nrf52/include/adc_nrf52/adc_nrf52.h    |    39 +
 .../pwm_test => hw/drivers/adc/adc_nrf52}/pkg.yml  |    13 +-
 hw/drivers/adc/adc_nrf52/src/adc_nrf52.c           |   397 +
 hw/drivers/nimble/nrf52/src/ble_phy.c              |    10 +-
 .../pwm/pwm_nrf52/include/pwm_nrf52/pwm_nrf52.h    |    37 +
 .../drivers/pwm/pwm_nrf52}/pkg.yml                 |    16 +-
 hw/drivers/pwm/pwm_nrf52/src/pwm_nrf52.c           |   498 +
 hw/mcu/nordic/include/nrfx_config.h                |     0
 hw/mcu/nordic/include/nrfx_glue.h                  |   143 +
 hw/mcu/nordic/nrf51xxx/pkg.yml                     |     1 +
 hw/mcu/nordic/nrf51xxx/syscfg.yml                  |     4 +
 hw/mcu/nordic/nrf52xxx/pkg.yml                     |     1 +
 hw/mcu/nordic/nrf52xxx/src/hal_gpio.c              |     7 +-
 hw/mcu/nordic/nrf52xxx/syscfg.yml                  |    32 +
 hw/mcu/nordic/pkg.yml                              |    27 +-
 .../components/device/compiler_abstraction.h       |   134 -
 .../components/device/nrf.h                        |    91 -
 .../components/toolchain/arm/uicr_config.h         |   112 -
 .../components/toolchain/iar/iar_startup_nrf52.s   |   578 -
 .../components/toolchain/system_nrf51.h            |    69 -
 .../components/toolchain/system_nrf51422.c         |   121 -
 .../components/toolchain/system_nrf52.h            |    69 -
 .../components/toolchain/system_nrf52840.h         |    69 -
 hw/mcu/nordic/src/ext/nrfx/.gitignore              |     2 +
 hw/mcu/nordic/src/ext/nrfx/CHANGELOG.md            |    35 +
 hw/mcu/nordic/src/ext/nrfx/LICENSE                 |    29 +
 hw/mcu/nordic/src/ext/nrfx/README.md               |    37 +
 .../src/ext/nrfx/drivers/include/nrf_bitmask.h     |   147 +
 .../nordic/src/ext/nrfx/drivers/include/nrfx_adc.h |   288 +
 .../src/ext/nrfx/drivers/include/nrfx_clock.h      |   211 +
 .../src/ext/nrfx/drivers/include/nrfx_comp.h       |   235 +
 .../src/ext/nrfx/drivers/include/nrfx_gpiote.h     |   376 +
 .../nordic/src/ext/nrfx/drivers/include/nrfx_i2s.h |   243 +
 .../src/ext/nrfx/drivers/include/nrfx_lpcomp.h     |   139 +
 .../nordic/src/ext/nrfx/drivers/include/nrfx_pdm.h |   205 +
 .../src/ext/nrfx/drivers/include/nrfx_power.h      |   373 +
 .../ext/nrfx/drivers/include/nrfx_power_clock.h    |    81 +
 .../nordic/src/ext/nrfx/drivers/include/nrfx_ppi.h |   318 +
 .../nordic/src/ext/nrfx/drivers/include/nrfx_pwm.h |   488 +
 .../src/ext/nrfx/drivers/include/nrfx_qdec.h       |   177 +
 .../src/ext/nrfx/drivers/include/nrfx_qspi.h       |   275 +
 .../nordic/src/ext/nrfx/drivers/include/nrfx_rng.h |   119 +
 .../nordic/src/ext/nrfx/drivers/include/nrfx_rtc.h |   363 +
 .../src/ext/nrfx/drivers/include/nrfx_saadc.h      |   317 +
 .../nordic/src/ext/nrfx/drivers/include/nrfx_spi.h |   298 +
 .../src/ext/nrfx/drivers/include/nrfx_spim.h       |   387 +
 .../src/ext/nrfx/drivers/include/nrfx_spis.h       |   245 +
 .../nordic/src/ext/nrfx/drivers/include/nrfx_swi.h |   213 +
 .../src/ext/nrfx/drivers/include/nrfx_systick.h    |   126 +
 .../src/ext/nrfx/drivers/include/nrfx_timer.h      |   405 +
 .../nordic/src/ext/nrfx/drivers/include/nrfx_twi.h |   359 +
 .../src/ext/nrfx/drivers/include/nrfx_twim.h       |   399 +
 .../src/ext/nrfx/drivers/include/nrfx_twis.h       |   396 +
 .../src/ext/nrfx/drivers/include/nrfx_uart.h       |   356 +
 .../src/ext/nrfx/drivers/include/nrfx_uarte.h      |   354 +
 .../nordic/src/ext/nrfx/drivers/include/nrfx_wdt.h |   148 +
 hw/mcu/nordic/src/ext/nrfx/drivers/nrfx_common.h   |   238 +
 hw/mcu/nordic/src/ext/nrfx/drivers/nrfx_errors.h   |    73 +
 hw/mcu/nordic/src/ext/nrfx/drivers/src/nrfx_adc.c  |   316 +
 .../nordic/src/ext/nrfx/drivers/src/nrfx_clock.c   |   335 +
 hw/mcu/nordic/src/ext/nrfx/drivers/src/nrfx_comp.c |   212 +
 .../nordic/src/ext/nrfx/drivers/src/nrfx_gpiote.c  |   787 +
 hw/mcu/nordic/src/ext/nrfx/drivers/src/nrfx_i2s.c  |   423 +
 .../nordic/src/ext/nrfx/drivers/src/nrfx_lpcomp.c  |   175 +
 hw/mcu/nordic/src/ext/nrfx/drivers/src/nrfx_pdm.c  |   368 +
 .../nordic/src/ext/nrfx/drivers/src/nrfx_power.c   |   297 +
 .../src/ext/nrfx/drivers/src/nrfx_power_clock.c    |    43 +
 hw/mcu/nordic/src/ext/nrfx/drivers/src/nrfx_ppi.c  |   525 +
 hw/mcu/nordic/src/ext/nrfx/drivers/src/nrfx_pwm.c  |   506 +
 hw/mcu/nordic/src/ext/nrfx/drivers/src/nrfx_qdec.c |   202 +
 hw/mcu/nordic/src/ext/nrfx/drivers/src/nrfx_qspi.c |   293 +
 hw/mcu/nordic/src/ext/nrfx/drivers/src/nrfx_rng.c  |   117 +
 hw/mcu/nordic/src/ext/nrfx/drivers/src/nrfx_rtc.c  |   350 +
 .../nordic/src/ext/nrfx/drivers/src/nrfx_saadc.c   |   643 +
 hw/mcu/nordic/src/ext/nrfx/drivers/src/nrfx_spi.c  |   428 +
 hw/mcu/nordic/src/ext/nrfx/drivers/src/nrfx_spim.c |   614 +
 hw/mcu/nordic/src/ext/nrfx/drivers/src/nrfx_spis.c |   502 +
 hw/mcu/nordic/src/ext/nrfx/drivers/src/nrfx_swi.c  |   403 +
 .../nordic/src/ext/nrfx/drivers/src/nrfx_systick.c |   161 +
 .../nordic/src/ext/nrfx/drivers/src/nrfx_timer.c   |   332 +
 hw/mcu/nordic/src/ext/nrfx/drivers/src/nrfx_twi.c  |   714 +
 hw/mcu/nordic/src/ext/nrfx/drivers/src/nrfx_twim.c |   655 +
 hw/mcu/nordic/src/ext/nrfx/drivers/src/nrfx_twis.c |   825 +
 hw/mcu/nordic/src/ext/nrfx/drivers/src/nrfx_uart.c |   640 +
 .../nordic/src/ext/nrfx/drivers/src/nrfx_uarte.c   |   574 +
 hw/mcu/nordic/src/ext/nrfx/drivers/src/nrfx_wdt.c  |   144 +
 .../nordic/src/ext/nrfx/drivers/src/prs/nrfx_prs.c |   157 +
 .../nordic/src/ext/nrfx/drivers/src/prs/nrfx_prs.h |   131 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_adc.c           |    93 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_adc.h           |   426 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_clock.h         |   391 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_comp.h          |   500 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_ecb.c           |    84 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_ecb.h           |    88 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_egu.h           |   352 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_gpio.h          |   776 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_gpiote.h        |   419 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_i2s.h           |   548 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_lpcomp.h        |   403 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_nvmc.c          |   124 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_nvmc.h          |   110 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_pdm.h           |   378 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_power.h         |  1048 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_ppi.h           |   425 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_pwm.h           |   685 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_qdec.h          |   486 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_qspi.h          |   768 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_rng.h           |   265 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_rtc.h           |   321 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_saadc.h         |   606 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_spi.h           |   360 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_spim.h          |   727 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_spis.h          |   562 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_systick.h       |   181 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_temp.h          |    79 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_timer.h         |   625 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_twi.h           |   442 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_twim.h          |   513 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_twis.h          |   693 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_uart.h          |   517 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_uarte.h         |   566 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_usbd.h          |  1421 +
 hw/mcu/nordic/src/ext/nrfx/hal/nrf_wdt.h           |   324 +
 .../toolchain/arm => nrfx/mdk}/arm_startup_nrf51.s |   510 +-
 .../toolchain/arm => nrfx/mdk}/arm_startup_nrf52.s |   858 +-
 .../nordic/src/ext/nrfx/mdk/arm_startup_nrf52810.s |   349 +
 .../mdk/arm_startup_nrf52840.s}                    |   870 +-
 .../nordic/src/ext/nrfx/mdk/compiler_abstraction.h |   146 +
 .../mdk/gcc_startup_nrf51.S}                       |   588 +-
 .../mdk/gcc_startup_nrf52.S}                       |   928 +-
 .../nordic/src/ext/nrfx/mdk/gcc_startup_nrf52810.S |   394 +
 .../mdk/gcc_startup_nrf52840.S}                    |   934 +-
 .../toolchain/iar => nrfx/mdk}/iar_startup_nrf51.s |   615 +-
 hw/mcu/nordic/src/ext/nrfx/mdk/iar_startup_nrf52.s |   457 +
 .../nordic/src/ext/nrfx/mdk/iar_startup_nrf52810.s |   407 +
 .../nordic/src/ext/nrfx/mdk/iar_startup_nrf52840.s |   487 +
 hw/mcu/nordic/src/ext/nrfx/mdk/nRFxxx.h            |    21 +
 hw/mcu/nordic/src/ext/nrfx/mdk/nrf.h               |    93 +
 .../components/device => nrfx/mdk}/nrf51.h         |  2478 +-
 hw/mcu/nordic/src/ext/nrfx/mdk/nrf51.svd           | 20969 ++++++++
 .../nordic/src/ext/nrfx/mdk/nrf51422_peripherals.h |   155 +
 .../nordic/src/ext/nrfx/mdk/nrf51801_peripherals.h |   155 +
 hw/mcu/nordic/src/ext/nrfx/mdk/nrf51801_xxab.ld    |    13 +
 .../nordic/src/ext/nrfx/mdk/nrf51802_peripherals.h |   155 +
 .../nordic/src/ext/nrfx/mdk/nrf51822_peripherals.h |   155 +
 .../nordic/src/ext/nrfx/mdk/nrf51824_peripherals.h |   155 +
 .../device => nrfx/mdk}/nrf51_bitfields.h          | 13027 +++--
 hw/mcu/nordic/src/ext/nrfx/mdk/nrf51_common.ld     |   168 +
 .../device => nrfx/mdk}/nrf51_deprecated.h         |   884 +-
 .../device => nrfx/mdk}/nrf51_to_nrf52.h           |  1897 +-
 .../mdk/nrf51_to_nrf52810.h}                       |  1090 +-
 .../device => nrfx/mdk}/nrf51_to_nrf52840.h        |  1136 +-
 hw/mcu/nordic/src/ext/nrfx/mdk/nrf51_xxaa.ld       |    13 +
 hw/mcu/nordic/src/ext/nrfx/mdk/nrf51_xxab.ld       |    13 +
 hw/mcu/nordic/src/ext/nrfx/mdk/nrf51_xxac.ld       |    13 +
 .../components/device => nrfx/mdk}/nrf52.h         |  4216 +-
 hw/mcu/nordic/src/ext/nrfx/mdk/nrf52.svd           | 42684 ++++++++++++++++
 .../device/nrf52.h => nrfx/mdk/nrf52810.h}         |  3705 +-
 hw/mcu/nordic/src/ext/nrfx/mdk/nrf52810.svd        | 31678 ++++++++++++
 .../mdk/nrf52810_bitfields.h}                      | 25103 ++++------
 .../nordic/src/ext/nrfx/mdk/nrf52810_peripherals.h |   203 +
 hw/mcu/nordic/src/ext/nrfx/mdk/nrf52810_xxaa.ld    |    13 +
 .../mdk/nrf52832_peripherals.h}                    |   506 +-
 hw/mcu/nordic/src/ext/nrfx/mdk/nrf52832_xxab.ld    |    13 +
 .../components/device => nrfx/mdk}/nrf52840.h      |  4850 +-
 hw/mcu/nordic/src/ext/nrfx/mdk/nrf52840.svd        | 49291 +++++++++++++++++++
 .../device => nrfx/mdk}/nrf52840_bitfields.h       | 29414 +++++------
 .../device => nrfx/mdk}/nrf52840_peripherals.h     |   529 +-
 hw/mcu/nordic/src/ext/nrfx/mdk/nrf52840_xxaa.ld    |    13 +
 .../device => nrfx/mdk}/nrf52_bitfields.h          | 27513 +++++------
 hw/mcu/nordic/src/ext/nrfx/mdk/nrf52_common.ld     |   168 +
 .../device => nrfx/mdk}/nrf52_name_change.h        |   146 +-
 hw/mcu/nordic/src/ext/nrfx/mdk/nrf52_to_nrf52810.h |    96 +
 .../device => nrfx/mdk}/nrf52_to_nrf52840.h        |   184 +-
 hw/mcu/nordic/src/ext/nrfx/mdk/nrf52_xxaa.ld       |    13 +
 hw/mcu/nordic/src/ext/nrfx/mdk/nrf5x_common.ld     |   168 +
 hw/mcu/nordic/src/ext/nrfx/mdk/nrf_peripherals.h   |    53 +
 hw/mcu/nordic/src/ext/nrfx/mdk/ses_nRF_Startup.s   |   148 +
 hw/mcu/nordic/src/ext/nrfx/mdk/ses_nrf51_Vectors.s |   329 +
 .../nordic/src/ext/nrfx/mdk/ses_nrf52810_Vectors.s |   369 +
 .../nordic/src/ext/nrfx/mdk/ses_nrf52840_Vectors.s |   515 +
 hw/mcu/nordic/src/ext/nrfx/mdk/ses_nrf52_Vectors.s |   458 +
 hw/mcu/nordic/src/ext/nrfx/mdk/startup_config.h    |    51 +
 .../toolchain => nrfx/mdk}/system_nrf51.c          |   294 +-
 hw/mcu/nordic/src/ext/nrfx/mdk/system_nrf51.h      |    61 +
 .../toolchain => nrfx/mdk}/system_nrf52.c          |   655 +-
 hw/mcu/nordic/src/ext/nrfx/mdk/system_nrf52.h      |    61 +
 .../system_nrf52.c => nrfx/mdk/system_nrf52810.c}  |   695 +-
 hw/mcu/nordic/src/ext/nrfx/mdk/system_nrf52810.h   |    61 +
 .../toolchain => nrfx/mdk}/system_nrf52840.c       |   465 +-
 hw/mcu/nordic/src/ext/nrfx/mdk/system_nrf52840.h   |    61 +
 hw/mcu/nordic/src/ext/nrfx/nrfx.h                  |    40 +
 hw/mcu/nordic/src/ext/nrfx/soc/nrfx_irqs.h         |    47 +
 hw/mcu/nordic/src/ext/nrfx/soc/nrfx_irqs_nrf51.h   |   127 +
 .../nordic/src/ext/nrfx/soc/nrfx_irqs_nrf52810.h   |   132 +
 .../nordic/src/ext/nrfx/soc/nrfx_irqs_nrf52832.h   |   183 +
 .../nordic/src/ext/nrfx/soc/nrfx_irqs_nrf52840.h   |   199 +
 .../src/ext/nrfx/templates/nRF51/nrfx_config.h     |  1583 +
 .../src/ext/nrfx/templates/nRF52810/nrfx_config.h  |  2090 +
 .../src/ext/nrfx/templates/nRF52832/nrfx_config.h  |  2889 ++
 .../src/ext/nrfx/templates/nRF52840/nrfx_config.h  |  2974 ++
 hw/mcu/nordic/src/ext/nrfx/templates/nrfx_glue.h   |   147 +
 hw/mcu/nordic/src/ext/nrfx/templates/nrfx_log.h    |   135 +
 265 files changed, 260374 insertions(+), 68629 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
m...@apache.org.

Reply via email to