Browse Source

zephyr: Replace zephyr.h with kernel.h.

Zephyr v3.2.0 deprecated include/zephyr/zephyr.h in favor of
include/zephyr/kernel.h since it only included that header.

Signed-off-by: Maureen Helm <maureen.helm@intel.com>
pull/9335/head
Maureen Helm 2 years ago
committed by Damien George
parent
commit
4e59a51902
  1. 2
      ports/zephyr/machine_i2c.c
  2. 2
      ports/zephyr/machine_pin.c
  3. 2
      ports/zephyr/machine_spi.c
  4. 2
      ports/zephyr/machine_uart.c
  5. 2
      ports/zephyr/main.c
  6. 2
      ports/zephyr/modsocket.c
  7. 2
      ports/zephyr/modtime.c
  8. 2
      ports/zephyr/modzephyr.c
  9. 2
      ports/zephyr/modzsensor.c
  10. 2
      ports/zephyr/mpconfigport.h
  11. 2
      ports/zephyr/mpconfigport_minimal.h
  12. 2
      ports/zephyr/mphalport.h
  13. 2
      ports/zephyr/mpthreadport.h
  14. 2
      ports/zephyr/src/zephyr_getchar.c
  15. 2
      ports/zephyr/src/zephyr_start.c
  16. 2
      ports/zephyr/uart_core.c

2
ports/zephyr/machine_i2c.c

@ -29,7 +29,7 @@
#include <stdint.h>
#include <string.h>
#include <zephyr/zephyr.h>
#include <zephyr/kernel.h>
#include <zephyr/drivers/i2c.h>
#include "py/runtime.h"

2
ports/zephyr/machine_pin.c

@ -29,7 +29,7 @@
#include <stdint.h>
#include <string.h>
#include <zephyr/zephyr.h>
#include <zephyr/kernel.h>
#include <zephyr/drivers/gpio.h>
#include "py/runtime.h"

2
ports/zephyr/machine_spi.c

@ -28,7 +28,7 @@
#include <stdint.h>
#include <string.h>
#include <zephyr/zephyr.h>
#include <zephyr/kernel.h>
#include <zephyr/drivers/spi.h>
#include "py/runtime.h"

2
ports/zephyr/machine_uart.c

@ -28,7 +28,7 @@
// This file is never compiled standalone, it's included directly from
// extmod/machine_uart.c via MICROPY_PY_MACHINE_UART_INCLUDEFILE.
#include <zephyr/zephyr.h>
#include <zephyr/kernel.h>
#include <zephyr/drivers/uart.h>
#include "py/mperrno.h"

2
ports/zephyr/main.c

@ -29,7 +29,7 @@
#include <stdio.h>
#include <string.h>
#include <zephyr/zephyr.h>
#include <zephyr/kernel.h>
#ifdef CONFIG_NETWORKING
#include <zephyr/net/net_context.h>
#endif

2
ports/zephyr/modsocket.c

@ -31,7 +31,7 @@
#include "py/stream.h"
#include <stdio.h>
#include <zephyr/zephyr.h>
#include <zephyr/kernel.h>
// Zephyr's generated version header
#include <version.h>
#include <zephyr/net/net_context.h>

2
ports/zephyr/modtime.c

@ -25,7 +25,7 @@
* THE SOFTWARE.
*/
#include <zephyr/zephyr.h>
#include <zephyr/kernel.h>
#include "py/obj.h"

2
ports/zephyr/modzephyr.c

@ -29,7 +29,7 @@
#if MICROPY_PY_ZEPHYR
#include <stdio.h>
#include <zephyr/zephyr.h>
#include <zephyr/kernel.h>
#include <zephyr/debug/thread_analyzer.h>
#include <zephyr/shell/shell.h>
#include <zephyr/shell/shell_uart.h>

2
ports/zephyr/modzsensor.c

@ -28,7 +28,7 @@
#include "py/runtime.h"
#include <zephyr/zephyr.h>
#include <zephyr/kernel.h>
#include <zephyr/drivers/sensor.h>
#if MICROPY_PY_ZSENSOR

2
ports/zephyr/mpconfigport.h

@ -28,7 +28,7 @@
// Include Zephyr's autoconf.h, which should be made first by Zephyr makefiles
#include "autoconf.h"
// Included here to get basic Zephyr environment (macros, etc.)
#include <zephyr/zephyr.h>
#include <zephyr/kernel.h>
#include <zephyr/drivers/spi.h>
// Usually passed from Makefile

2
ports/zephyr/mpconfigport_minimal.h

@ -28,7 +28,7 @@
// Include Zephyr's autoconf.h, which should be made first by Zephyr makefiles
#include "autoconf.h"
// Included here to get basic Zephyr environment (macros, etc.)
#include <zephyr/zephyr.h>
#include <zephyr/kernel.h>
// Usually passed from Makefile
#ifndef MICROPY_HEAP_SIZE

2
ports/zephyr/mphalport.h

@ -1,4 +1,4 @@
#include <zephyr/zephyr.h>
#include <zephyr/kernel.h>
#include "shared/runtime/interrupt_char.h"
#define MICROPY_BEGIN_ATOMIC_SECTION irq_lock

2
ports/zephyr/mpthreadport.h

@ -29,7 +29,7 @@
#ifndef MICROPY_INCLUDED_ZEPHYR_MPTHREADPORT_H
#define MICROPY_INCLUDED_ZEPHYR_MPTHREADPORT_H
#include <zephyr/zephyr.h>
#include <zephyr/kernel.h>
typedef struct _mp_thread_mutex_t {
struct k_sem handle;

2
ports/zephyr/src/zephyr_getchar.c

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include <zephyr/zephyr.h>
#include <zephyr/kernel.h>
#include <zephyr/drivers/uart.h>
#include <zephyr/drivers/console/uart_console.h>
#include <zephyr/sys/printk.h>

2
ports/zephyr/src/zephyr_start.c

@ -23,7 +23,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include <zephyr/zephyr.h>
#include <zephyr/kernel.h>
#include "zephyr_getchar.h"
int real_main(void);

2
ports/zephyr/uart_core.c

@ -28,7 +28,7 @@
#include "py/runtime.h"
#include "src/zephyr_getchar.h"
// Zephyr headers
#include <zephyr/zephyr.h>
#include <zephyr/kernel.h>
#include <zephyr/device.h>
#include <zephyr/console/console.h>
#include <zephyr/console/tty.h>

Loading…
Cancel
Save