Skip to content
Permalink
Browse files

ext: hal: nordic: Update nrfx to version 1.1.0

Updates nrfx to the recently released version.

This version introduces a new HAL for the RADIO peripheral (contained
in the "nrf_radio.h" file) and this HAL replaces the one temporarily
copied to the "nrfx/hal" folder in the Zephyr source tree (see commit
619790a). The nRF 802.15.4 radio
driver ("nrf_drv_radio802154.c") is updated accordingly to reflect
the changes between these two RADIO HAL implementations.

Origin: nrfx
License: BSD 3-Clause
URL: https://github.com/NordicSemiconductor/nrfx/tree/v1.1.0
commit: 293f553ed9551c1fdfd05eac48e75bbdeb4e7290
Purpose: Provide peripheral drivers for Nordic SoCs
Maintained-by: External

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
  • Loading branch information...
anangl authored and carlescufi committed Jun 15, 2018
1 parent aa190cd commit 354c8222f1ba70d8f209fe4239c34dbb438d8660
Showing with 12,112 additions and 9,256 deletions.
  1. +102 −91 ext/hal/nordic/drivers/nrf_drv_radio802154.c
  2. +4 −4 ext/hal/nordic/nrfx/README
  3. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrf_bitmask.h
  4. +20 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_adc.h
  5. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_clock.h
  6. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_comp.h
  7. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_gpiote.h
  8. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_i2s.h
  9. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_lpcomp.h
  10. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_pdm.h
  11. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_power.h
  12. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_power_clock.h
  13. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_ppi.h
  14. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_pwm.h
  15. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_qdec.h
  16. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_qspi.h
  17. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_rng.h
  18. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_rtc.h
  19. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_saadc.h
  20. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_spi.h
  21. +8 −8 ext/hal/nordic/nrfx/drivers/include/nrfx_spim.h
  22. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_spis.h
  23. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_swi.h
  24. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_systick.h
  25. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_timer.h
  26. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_twi.h
  27. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_twim.h
  28. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_twis.h
  29. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_uart.h
  30. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_uarte.h
  31. +6 −6 ext/hal/nordic/nrfx/drivers/include/nrfx_wdt.h
  32. +24 −8 ext/hal/nordic/nrfx/drivers/nrfx_common.h
  33. +6 −6 ext/hal/nordic/nrfx/drivers/nrfx_errors.h
  34. +23 −7 ext/hal/nordic/nrfx/drivers/src/nrfx_adc.c
  35. +6 −6 ext/hal/nordic/nrfx/drivers/src/nrfx_clock.c
  36. +6 −6 ext/hal/nordic/nrfx/drivers/src/nrfx_comp.c
  37. +6 −6 ext/hal/nordic/nrfx/drivers/src/nrfx_gpiote.c
  38. +19 −6 ext/hal/nordic/nrfx/drivers/src/nrfx_i2s.c
  39. +6 −6 ext/hal/nordic/nrfx/drivers/src/nrfx_lpcomp.c
  40. +6 −6 ext/hal/nordic/nrfx/drivers/src/nrfx_pdm.c
  41. +6 −6 ext/hal/nordic/nrfx/drivers/src/nrfx_power.c
  42. +6 −6 ext/hal/nordic/nrfx/drivers/src/nrfx_power_clock.c
  43. +7 −7 ext/hal/nordic/nrfx/drivers/src/nrfx_ppi.c
  44. +6 −6 ext/hal/nordic/nrfx/drivers/src/nrfx_pwm.c
  45. +6 −6 ext/hal/nordic/nrfx/drivers/src/nrfx_qdec.c
  46. +8 −8 ext/hal/nordic/nrfx/drivers/src/nrfx_qspi.c
  47. +6 −6 ext/hal/nordic/nrfx/drivers/src/nrfx_rng.c
  48. +6 −6 ext/hal/nordic/nrfx/drivers/src/nrfx_rtc.c
  49. +6 −7 ext/hal/nordic/nrfx/drivers/src/nrfx_saadc.c
  50. +6 −6 ext/hal/nordic/nrfx/drivers/src/nrfx_spi.c
  51. +31 −17 ext/hal/nordic/nrfx/drivers/src/nrfx_spim.c
  52. +6 −6 ext/hal/nordic/nrfx/drivers/src/nrfx_spis.c
  53. +6 −6 ext/hal/nordic/nrfx/drivers/src/nrfx_swi.c
  54. +6 −6 ext/hal/nordic/nrfx/drivers/src/nrfx_systick.c
  55. +6 −6 ext/hal/nordic/nrfx/drivers/src/nrfx_timer.c
  56. +17 −17 ext/hal/nordic/nrfx/drivers/src/nrfx_twi.c
  57. +6 −6 ext/hal/nordic/nrfx/drivers/src/nrfx_twim.c
  58. +6 −6 ext/hal/nordic/nrfx/drivers/src/nrfx_twis.c
  59. +6 −6 ext/hal/nordic/nrfx/drivers/src/nrfx_uart.c
  60. +6 −6 ext/hal/nordic/nrfx/drivers/src/nrfx_uarte.c
  61. +7 −7 ext/hal/nordic/nrfx/drivers/src/nrfx_wdt.c
  62. +6 −6 ext/hal/nordic/nrfx/drivers/src/prs/nrfx_prs.c
  63. +6 −6 ext/hal/nordic/nrfx/drivers/src/prs/nrfx_prs.h
  64. +6 −6 ext/hal/nordic/nrfx/hal/nrf_adc.h
  65. +497 −0 ext/hal/nordic/nrfx/hal/nrf_ccm.h
  66. +33 −13 ext/hal/nordic/nrfx/hal/nrf_clock.h
  67. +6 −6 ext/hal/nordic/nrfx/hal/nrf_comp.h
  68. +6 −6 ext/hal/nordic/nrfx/hal/nrf_ecb.c
  69. +206 −7 ext/hal/nordic/nrfx/hal/nrf_ecb.h
  70. +6 −6 ext/hal/nordic/nrfx/hal/nrf_egu.h
  71. +24 −6 ext/hal/nordic/nrfx/hal/nrf_gpio.h
  72. +6 −6 ext/hal/nordic/nrfx/hal/nrf_gpiote.h
  73. +6 −6 ext/hal/nordic/nrfx/hal/nrf_i2s.h
  74. +6 −6 ext/hal/nordic/nrfx/hal/nrf_lpcomp.h
  75. +6 −6 ext/hal/nordic/nrfx/hal/nrf_nvmc.c
  76. +6 −6 ext/hal/nordic/nrfx/hal/nrf_nvmc.h
  77. +6 −6 ext/hal/nordic/nrfx/hal/nrf_pdm.h
  78. +6 −18 ext/hal/nordic/nrfx/hal/nrf_power.h
  79. +18 −6 ext/hal/nordic/nrfx/hal/nrf_ppi.h
  80. +6 −6 ext/hal/nordic/nrfx/hal/nrf_pwm.h
  81. +6 −6 ext/hal/nordic/nrfx/hal/nrf_qdec.h
  82. +6 −6 ext/hal/nordic/nrfx/hal/nrf_qspi.h
  83. +1,162 −349 ext/hal/nordic/nrfx/hal/nrf_radio.h
  84. +6 −6 ext/hal/nordic/nrfx/hal/nrf_rng.h
  85. +6 −6 ext/hal/nordic/nrfx/hal/nrf_rtc.h
  86. +51 −13 ext/hal/nordic/nrfx/hal/nrf_saadc.h
  87. +6 −6 ext/hal/nordic/nrfx/hal/nrf_spi.h
  88. +6 −6 ext/hal/nordic/nrfx/hal/nrf_spim.h
  89. +6 −6 ext/hal/nordic/nrfx/hal/nrf_spis.h
  90. +6 −6 ext/hal/nordic/nrfx/hal/nrf_systick.h
  91. +6 −6 ext/hal/nordic/nrfx/hal/nrf_temp.h
  92. +6 −6 ext/hal/nordic/nrfx/hal/nrf_timer.h
  93. +6 −6 ext/hal/nordic/nrfx/hal/nrf_twi.h
  94. +6 −6 ext/hal/nordic/nrfx/hal/nrf_twim.h
  95. +6 −6 ext/hal/nordic/nrfx/hal/nrf_twis.h
  96. +6 −6 ext/hal/nordic/nrfx/hal/nrf_uart.h
  97. +7 −7 ext/hal/nordic/nrfx/hal/nrf_uarte.h
  98. +39 −8 ext/hal/nordic/nrfx/hal/nrf_usbd.h
  99. +6 −6 ext/hal/nordic/nrfx/hal/nrf_wdt.h
  100. +14 −12 ext/hal/nordic/nrfx/mdk/nrf.h
  101. +1,066 −958 ext/hal/nordic/nrfx/mdk/nrf51.h
  102. +0 −10 ext/hal/nordic/nrfx/mdk/nrf51.svd
  103. +2,124 −1,774 ext/hal/nordic/nrfx/mdk/nrf52.h
  104. +2 −56 ext/hal/nordic/nrfx/mdk/nrf52.svd
  105. +1,562 −1,295 ext/hal/nordic/nrfx/mdk/nrf52810.h
  106. +1,603 −1,591 ext/hal/nordic/nrfx/mdk/nrf52810.svd
  107. +379 −364 ext/hal/nordic/nrfx/mdk/nrf52810_bitfields.h
  108. +2,572 −2,114 ext/hal/nordic/nrfx/mdk/nrf52840.h
  109. +1 −1 ext/hal/nordic/nrfx/mdk/nrf52_bitfields.h
  110. +1 −1 ext/hal/nordic/nrfx/mdk/nrf52_to_nrf52810.h
  111. +9 −4 ext/hal/nordic/nrfx/mdk/system_nrf52810.c
  112. +2 −0 ext/hal/nordic/nrfx_config_nrf52832.h
  113. +2 −0 ext/hal/nordic/nrfx_config_nrf52840.h

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -2,10 +2,10 @@ nrfx
####

Origin:
https://github.com/NordicSemiconductor/nrfx/tree/v1.0.0
https://github.com/NordicSemiconductor/nrfx/tree/v1.1.0

Status:
v1.0.0
v1.1.0

Purpose:
With added proper shims adapting it to Zephyr's APIs, nrfx will provide
@@ -28,7 +28,7 @@ URL:
https://github.com/NordicSemiconductor/nrfx

commit:
cf78ebfea1719d85cf4018fe6c08cc73fe5ec719
293f553ed9551c1fdfd05eac48e75bbdeb4e7290

Maintained-by:
External
@@ -37,4 +37,4 @@ License:
BSD-3-Clause

License Link:
https://github.com/NordicSemiconductor/nrfx/blob/v1.0.0/LICENSE
https://github.com/NordicSemiconductor/nrfx/blob/v1.1.0/LICENSE
@@ -1,21 +1,21 @@
/**
/*
* Copyright (c) 2016 - 2018, Nordic Semiconductor ASA
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* 3. Neither the name of the copyright holder nor the names of its
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -1,21 +1,21 @@
/**
/*
* Copyright (c) 2015 - 2018, Nordic Semiconductor ASA
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* 3. Neither the name of the copyright holder nor the names of its
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -164,16 +164,30 @@ void nrfx_adc_uninit(void);
* This function configures and enables the channel. When @ref nrfx_adc_buffer_convert is
* called, all channels that have been enabled with this function are sampled.
*
* This function can be called only when there is no conversion in progress
* (the ADC is not busy).
*
* @note The channel instance variable @p p_channel is used by the driver as an item
* in a list. Therefore, it cannot be an automatic variable that is located on the stack.
*/
void nrfx_adc_channel_enable(nrfx_adc_channel_t * const p_channel);

/**
* @brief Function for disabling an ADC channel.
*
* This function can be called only when there is no conversion in progress
* (the ADC is not busy).
*/
void nrfx_adc_channel_disable(nrfx_adc_channel_t * const p_channel);

/**
* @brief Function for disabling all ADC channels.
*
* This function can be called only when there is no conversion in progress
* (the ADC is not busy).
*/
void nrfx_adc_all_channels_disable(void);

/**
* @brief Function for starting ADC sampling.
*
@@ -1,21 +1,21 @@
/**
/*
* Copyright (c) 2016 - 2018, Nordic Semiconductor ASA
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* 3. Neither the name of the copyright holder nor the names of its
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -1,21 +1,21 @@
/**
/*
* Copyright (c) 2015 - 2018, Nordic Semiconductor ASA
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* 3. Neither the name of the copyright holder nor the names of its
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -1,21 +1,21 @@
/**
/*
* Copyright (c) 2015 - 2018, Nordic Semiconductor ASA
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* 3. Neither the name of the copyright holder nor the names of its
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -1,21 +1,21 @@
/**
/*
* Copyright (c) 2015 - 2018, Nordic Semiconductor ASA
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* 3. Neither the name of the copyright holder nor the names of its
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -1,21 +1,21 @@
/**
/*
* Copyright (c) 2014 - 2018, Nordic Semiconductor ASA
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* 3. Neither the name of the copyright holder nor the names of its
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -1,21 +1,21 @@
/**
/*
* Copyright (c) 2015 - 2018, Nordic Semiconductor ASA
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* 3. Neither the name of the copyright holder nor the names of its
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -1,21 +1,21 @@
/**
/*
* Copyright (c) 2017 - 2018, Nordic Semiconductor ASA
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* 3. Neither the name of the copyright holder nor the names of its
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -1,21 +1,21 @@
/**
/*
* Copyright (c) 2015 - 2018, Nordic Semiconductor ASA
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* 3. Neither the name of the copyright holder nor the names of its
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -1,21 +1,21 @@
/**
/*
* Copyright (c) 2015 - 2018, Nordic Semiconductor ASA
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* 3. Neither the name of the copyright holder nor the names of its
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -1,21 +1,21 @@
/**
/*
* Copyright (c) 2015 - 2018, Nordic Semiconductor ASA
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* 3. Neither the name of the copyright holder nor the names of its
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
Oops, something went wrong.

0 comments on commit 354c822

Please sign in to comment.
You can’t perform that action at this time.