From 19e5a9c0616df6e89280e42b20a0ebf03dec9200 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Tue, 2 Mar 2021 20:12:51 -0600 Subject: [PATCH] zephyr: Remove support for deprecated int types Its been 2 releases since we deprecated the old zephyr integer types. We can now remove support for the Kconfig option, code, and, test to allow the old int types to be supported. Signed-off-by: Kumar Gala --- Kconfig.zephyr | 7 ------- doc/releases/release-notes-2.6.rst | 3 +++ include/zephyr/types.h | 14 -------------- tests/deprecated/inttype/CMakeLists.txt | 8 -------- tests/deprecated/inttype/prj.conf | 1 - tests/deprecated/inttype/src/main.c | 20 -------------------- tests/deprecated/inttype/testcase.yaml | 4 ---- 7 files changed, 3 insertions(+), 54 deletions(-) delete mode 100644 tests/deprecated/inttype/CMakeLists.txt delete mode 100644 tests/deprecated/inttype/prj.conf delete mode 100644 tests/deprecated/inttype/src/main.c delete mode 100644 tests/deprecated/inttype/testcase.yaml diff --git a/Kconfig.zephyr b/Kconfig.zephyr index 1a4182d2d89..97d24c82958 100644 --- a/Kconfig.zephyr +++ b/Kconfig.zephyr @@ -436,13 +436,6 @@ config MAKEFILE_EXPORTS Generates a file with build information that can be read by third party Makefile-based build systems. -config DEPRECATED_ZEPHYR_INT_TYPES - bool "Allow the use of the deprecated zephyr integer types" - help - Allows the use of the deprecated Zephyr integer typedefs defined in - Zephyr 2.3 and previous versions. These types are: - u8_t, u16_t, u32_t, u64_t, s8_t, s16_t, s32_t, and s64_t. - endmenu endmenu diff --git a/doc/releases/release-notes-2.6.rst b/doc/releases/release-notes-2.6.rst index f7e1fbc56d5..1885fe4280c 100644 --- a/doc/releases/release-notes-2.6.rst +++ b/doc/releases/release-notes-2.6.rst @@ -57,6 +57,9 @@ Deprecated in this release ========================== Removed APIs in this release + +* Removed support for the old zephyr integer typedefs (u8_t, u16_t, etc...). + ============================ Stable API changes in this release diff --git a/include/zephyr/types.h b/include/zephyr/types.h index ada0cb84da0..c90eedd8136 100644 --- a/include/zephyr/types.h +++ b/include/zephyr/types.h @@ -14,20 +14,6 @@ extern "C" { #endif -#ifdef CONFIG_DEPRECATED_ZEPHYR_INT_TYPES - -typedef signed char s8_t; -typedef signed short s16_t; -typedef signed int s32_t; -typedef signed long long s64_t; - -typedef unsigned char u8_t; -typedef unsigned short u16_t; -typedef unsigned int u32_t; -typedef unsigned long long u64_t; - -#endif - /* 32 bits on ILP32 builds, 64 bits on LP64 builts */ typedef unsigned long ulong_t; diff --git a/tests/deprecated/inttype/CMakeLists.txt b/tests/deprecated/inttype/CMakeLists.txt deleted file mode 100644 index 30b8735806e..00000000000 --- a/tests/deprecated/inttype/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -cmake_minimum_required(VERSION 3.13.1) - -find_package(Zephyr HINTS $ENV{ZEPHYR_BASE}) -project(test_inttypes) - -target_sources(app PRIVATE src/main.c) diff --git a/tests/deprecated/inttype/prj.conf b/tests/deprecated/inttype/prj.conf deleted file mode 100644 index a7bfcafe58d..00000000000 --- a/tests/deprecated/inttype/prj.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_DEPRECATED_ZEPHYR_INT_TYPES=y diff --git a/tests/deprecated/inttype/src/main.c b/tests/deprecated/inttype/src/main.c deleted file mode 100644 index 74bc769ede6..00000000000 --- a/tests/deprecated/inttype/src/main.c +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2020 Linaro - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include - -void main(void) -{ - BUILD_ASSERT(sizeof(u8_t) == 1, "sizeof u8_t mismatch"); - BUILD_ASSERT(sizeof(u16_t) == 2, "sizeof u16_t mismatch"); - BUILD_ASSERT(sizeof(u32_t) == 4, "sizeof u32_t mismatch"); - BUILD_ASSERT(sizeof(u64_t) == 8, "sizeof u64_t mismatch"); - - BUILD_ASSERT(sizeof(s8_t) == 1, "sizeof s8_t mismatch"); - BUILD_ASSERT(sizeof(s16_t) == 2, "sizeof s16_t mismatch"); - BUILD_ASSERT(sizeof(s32_t) == 4, "sizeof s32_t mismatch"); - BUILD_ASSERT(sizeof(s64_t) == 8, "sizeof s64_t mismatch"); -} diff --git a/tests/deprecated/inttype/testcase.yaml b/tests/deprecated/inttype/testcase.yaml deleted file mode 100644 index 707f79127b3..00000000000 --- a/tests/deprecated/inttype/testcase.yaml +++ /dev/null @@ -1,4 +0,0 @@ -tests: - deprecated.inttypes: - build_only: true - tags: deprecated