pw_cpu_exception_armv7m: Deprecate old naming
Removes all old naming/references to pw_cpu_exception_armv7m. Please use
the ARMv7-M targets in pw_cpu_exception_cortex_m.
Change-Id: I4539dc0c03cfcfe330d9bc1e030c1fd75067bbb4
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/31060
Commit-Queue: Armando Montanez <amontanez@google.com>
Reviewed-by: Ewout van Bekkum <ewout@google.com>
diff --git a/modules.gni b/modules.gni
index 28940d7..188e7b1 100644
--- a/modules.gni
+++ b/modules.gni
@@ -36,8 +36,6 @@
dir_pw_cli = get_path_info("pw_cli", "abspath")
dir_pw_containers = get_path_info("pw_containers", "abspath")
dir_pw_cpu_exception = get_path_info("pw_cpu_exception", "abspath")
- dir_pw_cpu_exception_armv7m =
- get_path_info("pw_cpu_exception_armv7m", "abspath")
dir_pw_cpu_exception_cortex_m =
get_path_info("pw_cpu_exception_cortex_m", "abspath")
dir_pw_docgen = get_path_info("pw_docgen", "abspath")
diff --git a/pw_cpu_exception/public/pw_cpu_exception/entry.h b/pw_cpu_exception/public/pw_cpu_exception/entry.h
index 158c6e2..f663228 100644
--- a/pw_cpu_exception/public/pw_cpu_exception/entry.h
+++ b/pw_cpu_exception/public/pw_cpu_exception/entry.h
@@ -42,6 +42,3 @@
// Note: applications should almost never invoke this directly; if you do, make
// sure you know what you are doing.
PW_EXTERN_C PW_NO_PROLOGUE void pw_cpu_exception_Entry(void);
-
-// TODO(pwbug/311) Deprecated naming.
-PW_EXTERN_C PW_NO_PROLOGUE void pw_CpuExceptionEntry(void);
diff --git a/pw_cpu_exception/public/pw_cpu_exception/handler.h b/pw_cpu_exception/public/pw_cpu_exception/handler.h
index f552b17..7c255fa 100644
--- a/pw_cpu_exception/public/pw_cpu_exception/handler.h
+++ b/pw_cpu_exception/public/pw_cpu_exception/handler.h
@@ -52,13 +52,4 @@
// This calls the currently set handler.
void pw_cpu_exception_HandleException(void* cpu_state);
-// TODO(pwbug/311) Deprecated naming.
-typedef pw_cpu_exception_State pw_CpuExceptionState;
-#define pw_CpuExceptionSetHandler(...) pw_cpu_exception_SetHandler(__VA_ARGS__)
-#define pw_CpuExceptionRestoreDefaultHandler(...) \
- pw_cpu_exception_RestoreDefaultHandler(__VA_ARGS__)
-#define pw_CpuExceptionDefaultHandler(...) \
- pw_cpu_exception_DefaultHandler(__VA_ARGS__)
-#define pw_HandleCpuException(...) pw_cpu_exception_HandleException(__VA_ARGS__)
-
PW_EXTERN_C_END
diff --git a/pw_cpu_exception/public/pw_cpu_exception/support.h b/pw_cpu_exception/public/pw_cpu_exception/support.h
index 77baa18..d525039 100644
--- a/pw_cpu_exception/public/pw_cpu_exception/support.h
+++ b/pw_cpu_exception/public/pw_cpu_exception/support.h
@@ -26,9 +26,6 @@
// backend.
struct pw_cpu_exception_State;
-// TODO(pwbug/311) Deprecated naming.
-typedef pw_cpu_exception_State pw_CpuExceptionState;
-
namespace pw::cpu_exception {
// Gets raw CPU state as a single contiguous block of data. The particular
diff --git a/pw_cpu_exception_armv7m/BUILD b/pw_cpu_exception_armv7m/BUILD
deleted file mode 100644
index b98c438..0000000
--- a/pw_cpu_exception_armv7m/BUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019 The Pigweed Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy of
-# the License at
-#
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations under
-# the License.
-
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"]) # Apache License 2.0
-
-filegroup(
- name = "pw_cpu_exception_armv7m",
- srcs = [
- "public/pw_cpu_exception_armv7m/cpu_state.h",
- "public/pw_cpu_exception_armv7m/proto_dump.h",
- "pw_cpu_exception_armv7m_private/cortex_m_constants.h",
- ],
-)
diff --git a/pw_cpu_exception_armv7m/BUILD.gn b/pw_cpu_exception_armv7m/BUILD.gn
deleted file mode 100644
index ffa1899..0000000
--- a/pw_cpu_exception_armv7m/BUILD.gn
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2019 The Pigweed Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy of
-# the License at
-#
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations under
-# the License.
-
-import("//build_overrides/pigweed.gni")
-
-import("$dir_pw_build/target_types.gni")
-
-config("default_config") {
- include_dirs = [ "public" ]
- visibility = [ ":*" ]
-}
-
-pw_source_set("support") {
- public_configs = [ ":default_config" ]
- public_deps = [ "$dir_pw_cpu_exception_cortex_m:support_armv7m" ]
- public = [ "public/pw_cpu_exception_armv7m/cpu_state.h" ]
-}
-
-pw_source_set("proto_dump") {
- public_configs = [ ":default_config" ]
- public_deps = [ "$dir_pw_cpu_exception_cortex_m:proto_dump_armv7m" ]
- public = [ "public/pw_cpu_exception_armv7m/proto_dump.h" ]
-}
-
-pw_source_set("pw_cpu_exception_armv7m") {
- public_deps = [
- ":proto_dump",
- ":support",
- "$dir_pw_cpu_exception_cortex_m:cpu_exception_armv7m",
- ]
-}
diff --git a/pw_cpu_exception_armv7m/CMakeLists.txt b/pw_cpu_exception_armv7m/CMakeLists.txt
deleted file mode 100644
index ff92e06..0000000
--- a/pw_cpu_exception_armv7m/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2021 The Pigweed Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy of
-# the License at
-#
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations under
-# the License.
-
-include($ENV{PW_ROOT}/pw_build/pigweed.cmake)
-
-pw_auto_add_simple_module(pw_cpu_exception_armv7m
- PUBLIC_DEPS
- pw_cpu_exception_cortex_m
-)
diff --git a/pw_cpu_exception_armv7m/public/pw_cpu_exception_armv7m/cpu_state.h b/pw_cpu_exception_armv7m/public/pw_cpu_exception_armv7m/cpu_state.h
deleted file mode 100644
index 3c12945..0000000
--- a/pw_cpu_exception_armv7m/public/pw_cpu_exception_armv7m/cpu_state.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2019 The Pigweed Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not
-// use this file except in compliance with the License. You may obtain a copy of
-// the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations under
-// the License.
-#pragma once
-
-#include "pw_cpu_exception_cortex_m/cpu_state.h"
diff --git a/pw_cpu_exception_armv7m/public/pw_cpu_exception_armv7m/proto_dump.h b/pw_cpu_exception_armv7m/public/pw_cpu_exception_armv7m/proto_dump.h
deleted file mode 100644
index 3b873da..0000000
--- a/pw_cpu_exception_armv7m/public/pw_cpu_exception_armv7m/proto_dump.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2020 The Pigweed Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not
-// use this file except in compliance with the License. You may obtain a copy of
-// the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations under
-// the License.
-#pragma once
-
-#include "pw_cpu_exception_cortex_m/proto_dump.h"
diff --git a/pw_cpu_exception_cortex_m/public/pw_cpu_exception_cortex_m/cpu_state.h b/pw_cpu_exception_cortex_m/public/pw_cpu_exception_cortex_m/cpu_state.h
index 8d79633..440207d 100644
--- a/pw_cpu_exception_cortex_m/public/pw_cpu_exception_cortex_m/cpu_state.h
+++ b/pw_cpu_exception_cortex_m/public/pw_cpu_exception_cortex_m/cpu_state.h
@@ -95,6 +95,3 @@
// availability of the FPU registers a compile-time configuration when FPU
// register support is added.
};
-
-// TODO(pwbug/311): Deprecated naming.
-typedef pw_cpu_exception_State pw_CpuExceptionState;
