This is an automated email from the ASF dual-hosted git repository. yuanz pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-trustzone-sdk.git
commit 8d9e4eb630848ceaa63e496d8b5f5d92a1b98cf4 Author: Yuan Zhuang <[email protected]> AuthorDate: Tue Jul 9 09:04:06 2024 +0000 optee-utee: remove redundant macros --- optee-utee/optee-utee-sys/src/tee_api.rs | 4 ---- optee-utee/optee-utee-sys/src/tee_api_types.rs | 3 --- optee-utee/optee-utee-sys/src/tee_internal_api_extensions.rs | 5 +---- optee-utee/optee-utee-sys/src/tee_isocket.rs | 5 +---- optee-utee/optee-utee-sys/src/tee_tcpsocket.rs | 5 +---- optee-utee/optee-utee-sys/src/tee_udpsocket.rs | 5 +---- optee-utee/optee-utee-sys/src/trace.rs | 3 --- optee-utee/optee-utee-sys/src/user_ta_header.rs | 3 --- optee-utee/optee-utee-sys/src/utee_syscalls.rs | 3 --- 9 files changed, 4 insertions(+), 32 deletions(-) diff --git a/optee-utee/optee-utee-sys/src/tee_api.rs b/optee-utee/optee-utee-sys/src/tee_api.rs index 0a40861..966cd30 100644 --- a/optee-utee/optee-utee-sys/src/tee_api.rs +++ b/optee-utee/optee-utee-sys/src/tee_api.rs @@ -16,10 +16,6 @@ // under the License. use super::*; - -//#[cfg(target_os = "optee")] -//use libc::*; -//#[cfg(not(target_os = "optee"))] use core::ffi::*; extern "C" { diff --git a/optee-utee/optee-utee-sys/src/tee_api_types.rs b/optee-utee/optee-utee-sys/src/tee_api_types.rs index 922d400..6d2da31 100644 --- a/optee-utee/optee-utee-sys/src/tee_api_types.rs +++ b/optee-utee/optee-utee-sys/src/tee_api_types.rs @@ -17,9 +17,6 @@ // Common Definitions -//#[cfg(target_os = "optee")] -//use libc::*; -//#[cfg(not(target_os = "optee"))] use core::ffi::*; pub type TEE_Result = u32; diff --git a/optee-utee/optee-utee-sys/src/tee_internal_api_extensions.rs b/optee-utee/optee-utee-sys/src/tee_internal_api_extensions.rs index de77cf8..41adc81 100644 --- a/optee-utee/optee-utee-sys/src/tee_internal_api_extensions.rs +++ b/optee-utee/optee-utee-sys/src/tee_internal_api_extensions.rs @@ -15,11 +15,8 @@ // specific language governing permissions and limitations // under the License. -//#[cfg(target_os = "optee")] -//use libc::*; -//#[cfg(not(target_os = "optee"))] -use core::ffi::*; use super::*; +use core::ffi::*; extern "C" { /// tee_invoke_supp_plugin() - invoke a tee-supplicant's plugin diff --git a/optee-utee/optee-utee-sys/src/tee_isocket.rs b/optee-utee/optee-utee-sys/src/tee_isocket.rs index 099df03..6e202b1 100644 --- a/optee-utee/optee-utee-sys/src/tee_isocket.rs +++ b/optee-utee/optee-utee-sys/src/tee_isocket.rs @@ -15,11 +15,8 @@ // specific language governing permissions and limitations // under the License. -//#[cfg(target_os = "optee")] -//use libc::*; -//#[cfg(not(target_os = "optee"))] -use core::ffi::*; use super::*; +use core::ffi::*; pub type TEE_iSocketHandle = *mut c_void; pub type TEE_iSocket = TEE_iSocket_s; diff --git a/optee-utee/optee-utee-sys/src/tee_tcpsocket.rs b/optee-utee/optee-utee-sys/src/tee_tcpsocket.rs index 80b6d64..41acfc0 100644 --- a/optee-utee/optee-utee-sys/src/tee_tcpsocket.rs +++ b/optee-utee/optee-utee-sys/src/tee_tcpsocket.rs @@ -15,11 +15,8 @@ // specific language governing permissions and limitations // under the License. -//#[cfg(target_os = "optee")] -//use libc::*; -//#[cfg(not(target_os = "optee"))] -use core::ffi::*; use super::*; +use core::ffi::*; pub type TEE_tcpSocket_Setup = TEE_tcpSocket_Setup_s; #[repr(C)] diff --git a/optee-utee/optee-utee-sys/src/tee_udpsocket.rs b/optee-utee/optee-utee-sys/src/tee_udpsocket.rs index 3be6add..c7675e2 100644 --- a/optee-utee/optee-utee-sys/src/tee_udpsocket.rs +++ b/optee-utee/optee-utee-sys/src/tee_udpsocket.rs @@ -15,11 +15,8 @@ // specific language governing permissions and limitations // under the License. -//#[cfg(target_os = "optee")] -//use libc::*; -//#[cfg(not(target_os = "optee"))] -use core::ffi::*; use super::*; +use core::ffi::*; pub type TEE_udpSocket_Setup = TEE_udpSocket_Setup_s; #[repr(C)] diff --git a/optee-utee/optee-utee-sys/src/trace.rs b/optee-utee/optee-utee-sys/src/trace.rs index 4562276..651de6b 100644 --- a/optee-utee/optee-utee-sys/src/trace.rs +++ b/optee-utee/optee-utee-sys/src/trace.rs @@ -15,9 +15,6 @@ // specific language governing permissions and limitations // under the License. -//#[cfg(target_os = "optee")] -//use libc::*; -//#[cfg(not(target_os = "optee"))] use core::ffi::*; extern "C" { diff --git a/optee-utee/optee-utee-sys/src/user_ta_header.rs b/optee-utee/optee-utee-sys/src/user_ta_header.rs index 57ec6e8..bc5f8de 100644 --- a/optee-utee/optee-utee-sys/src/user_ta_header.rs +++ b/optee-utee/optee-utee-sys/src/user_ta_header.rs @@ -15,9 +15,6 @@ // specific language governing permissions and limitations // under the License. -//#[cfg(target_os = "optee")] -//use libc::*; -//#[cfg(not(target_os = "optee"))] use core::ffi::*; use super::tee_api_types::*; use super::utee_syscalls::*; diff --git a/optee-utee/optee-utee-sys/src/utee_syscalls.rs b/optee-utee/optee-utee-sys/src/utee_syscalls.rs index f574a74..dfc5c4b 100644 --- a/optee-utee/optee-utee-sys/src/utee_syscalls.rs +++ b/optee-utee/optee-utee-sys/src/utee_syscalls.rs @@ -16,9 +16,6 @@ // under the License. use super::*; -//#[cfg(target_os = "optee")] -//use libc::*; -//#[cfg(not(target_os = "optee"))] use core::ffi::*; extern "C" { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
