Merge "Remove nvram trusty implementation." into oc-mr1-dev (46691ee8) · Commits · e / os / android_system_core

trusty/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -2,6 +2,5 @@ subdirs = [
		"gatekeeper",
		"keymaster",
		"libtrusty",
		"nvram",
		"storage/*",
		]

trusty/nvram/Android.bp

deleted100644 → 0

+0 −61

Original line number	Diff line number	Diff line
		//
		// Copyright (C) 2016 The Android Open-Source Project
		//
		// 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
		//
		// http://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.
		//

		// nvram.trusty is the Trusty NVRAM HAL module.
		cc_library_shared {
		name: "nvram.trusty",
		relative_install_path: "hw",
		srcs: [
		"module.c",
		"trusty_nvram_device.cpp",
		"trusty_nvram_implementation.cpp",
		],

		cflags: [
		"-Wall",
		"-Werror",
		"-Wextra",
		"-fvisibility=hidden",
		],
		static_libs: ["libnvram-hal"],
		shared_libs: [
		"libtrusty",
		"libnvram-messages",
		"liblog",
		],
		}

		// nvram-wipe is a helper tool for clearing NVRAM state.
		cc_binary {
		name: "nvram-wipe",
		srcs: [
		"nvram_wipe.cpp",
		"trusty_nvram_implementation.cpp",
		],

		cflags: [
		"-Wall",
		"-Werror",
		"-Wextra",
		"-fvisibility=hidden",
		],
		static_libs: ["libnvram-hal"],
		shared_libs: [
		"libtrusty",
		"libnvram-messages",
		"liblog",
		],
		}

trusty/nvram/module.c

deleted100644 → 0

+0 −39

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		* 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
		*
		* http://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 <hardware/nvram.h>

		// This function is defined in trusty_nvram_device.cpp.
		int trusty_nvram_open(const hw_module_t* module,
		const char* device_id,
		hw_device_t** device_ptr);

		static struct hw_module_methods_t nvram_module_methods = {
		.open = trusty_nvram_open,
		};

		struct nvram_module HAL_MODULE_INFO_SYM
		__attribute__((visibility("default"))) = {
		.common = {.tag = HARDWARE_MODULE_TAG,
		.module_api_version = NVRAM_MODULE_API_VERSION_0_1,
		.hal_api_version = HARDWARE_HAL_API_VERSION,
		.id = NVRAM_HARDWARE_MODULE_ID,
		.name = "Trusty NVRAM HAL",
		.author = "The Android Open Source Project",
		.methods = &nvram_module_methods,
		.dso = 0,
		.reserved = {}},
		};

trusty/nvram/nvram_wipe.cpp

deleted100644 → 0

+0 −66

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		* 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
		*
		* http://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 <stdio.h>
		#include <stdlib.h>
		#include <string.h>

		#include <nvram/messages/nvram_messages.h>

		#include "trusty_nvram_implementation.h"

		void usage(const char* program_name) {
		fprintf(stderr, "Usage: %s [status\|disable\|wipe]\n", program_name);
		exit(-1);
		}

		int main(int argc, char* argv[]) {
		if (argc < 2) {
		usage(argv[0]);
		}

		nvram::TrustyNvramImplementation nvram_proxy;
		nvram::Request request;
		nvram::Response response;

		if (!strcmp(argv[1], "status")) {
		request.payload.Activate<nvram::COMMAND_GET_INFO>();
		nvram_proxy.Execute(request, &response);
		const nvram::GetInfoResponse* get_info_response =
		response.payload.get<nvram::COMMAND_GET_INFO>();
		if (response.result == NV_RESULT_SUCCESS) {
		int status = get_info_response && get_info_response->wipe_disabled;
		printf("Wiping disabled: %d\n", status);
		return status;
		}
		} else if (!strcmp(argv[1], "disable")) {
		request.payload.Activate<nvram::COMMAND_DISABLE_WIPE>();
		nvram_proxy.Execute(request, &response);
		} else if (!strcmp(argv[1], "wipe")) {
		request.payload.Activate<nvram::COMMAND_WIPE_STORAGE>();
		nvram_proxy.Execute(request, &response);
		} else {
		usage(argv[0]);
		}

		if (response.result != NV_RESULT_SUCCESS) {
		fprintf(stderr, "Command execution failure: %u\n", response.result);
		return -1;
		}

		return 0;
		}

trusty/nvram/trusty_nvram_device.cpp

deleted100644 → 0

+0 −32

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		* 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
		*
		* http://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 <nvram/hal/nvram_device_adapter.h>

		#include "trusty_nvram_implementation.h"

		extern "C" int trusty_nvram_open(const hw_module_t* module,
		const char* device_id,
		hw_device_t** device_ptr) {
		if (strcmp(NVRAM_HARDWARE_DEVICE_ID, device_id) != 0) {
		return -EINVAL;
		}

		nvram::NvramDeviceAdapter* adapter = new nvram::NvramDeviceAdapter(
		module, new nvram::TrustyNvramImplementation);
		*device_ptr = adapter->as_device();
		return 0;
		}