[dev][test] Remove dead code from test protocol/interface
Test: Ran /boot/test/ddk/driver-tests
Change-Id: I68ca04414be939a997134c7492cd7ac828202eb1
diff --git a/system/banjo/ddk-protocol-test/test.banjo b/system/banjo/ddk-protocol-test/test.banjo
index 7b8060c..127138c 100644
--- a/system/banjo/ddk-protocol-test/test.banjo
+++ b/system/banjo/ddk-protocol-test/test.banjo
@@ -14,7 +14,7 @@
[Layout="ddk-callback"]
interface TestFunc {
- 1: Callback(vector<voidptr> arg) -> (zx.status s, TestReport report);
+ 1: Callback() -> (zx.status s, TestReport report);
};
[Layout="ddk-protocol", DefaultProtocol]
@@ -25,18 +25,12 @@
/// Gets test output socket.
2: GetOutputSocket() -> (handle<socket> h);
- /// Sets control channel.
- 3: SetControlChannel(handle<channel> @handle) -> ();
-
- /// Gets control channel.
- 4: GetControlChannel() -> (handle<channel> @handle);
-
/// Sets test function.
- 5: SetTestFunc(TestFunc func) -> ();
+ 3: SetTestFunc(TestFunc func) -> ();
/// Run tests, calls the function set in |SetTestFunc|.
- 6: RunTests(vector<voidptr> arg) -> (zx.status s, TestReport report);
+ 4: RunTests() -> (zx.status s, TestReport report);
/// Calls `device_remove()`.
- 7: Destroy() -> ();
+ 5: Destroy() -> ();
};
diff --git a/system/dev/misc/test/test.cpp b/system/dev/misc/test/test.cpp
index 2bd4ad0..b40a763 100644
--- a/system/dev/misc/test/test.cpp
+++ b/system/dev/misc/test/test.cpp
@@ -32,14 +32,11 @@
// Methods required by the TestProtocol mixin
void TestSetOutputSocket(zx_handle_t handle);
zx_handle_t TestGetOutputSocket();
- void TestSetControlChannel(zx_handle_t handle);
- zx_handle_t TestGetControlChannel();
void TestSetTestFunc(const test_func_t* func);
- zx_status_t TestRunTests(const void* arg_buffer, size_t arg_size, test_report_t* out_report);
+ zx_status_t TestRunTests(test_report_t* out_report);
void TestDestroy();
private:
zx::socket output_;
- zx::channel control_;
test_func_t test_func_;
};
@@ -68,23 +65,15 @@
return output_.get();
}
-void TestDevice::TestSetControlChannel(zx_handle_t handle) {
- control_.reset(handle);
-}
-
-zx_handle_t TestDevice::TestGetControlChannel() {
- return control_.get();
-}
-
void TestDevice::TestSetTestFunc(const test_func_t* func) {
test_func_ = *func;
}
-zx_status_t TestDevice::TestRunTests(const void* arg, size_t arglen, test_report_t* report) {
+zx_status_t TestDevice::TestRunTests(test_report_t* report) {
if (test_func_.callback == NULL) {
return ZX_ERR_NOT_SUPPORTED;
}
- return test_func_.callback(test_func_.ctx, arg, arglen, report);
+ return test_func_.callback(test_func_.ctx, report);
}
void TestDevice::TestDestroy() {
@@ -101,19 +90,12 @@
TestSetOutputSocket(*(zx_handle_t*)in);
return ZX_OK;
- case IOCTL_TEST_SET_CONTROL_CHANNEL:
- if (inlen != sizeof(zx_handle_t)) {
- return ZX_ERR_INVALID_ARGS;
- }
- TestSetControlChannel(*(zx_handle_t*)in);
- return ZX_OK;
-
case IOCTL_TEST_RUN_TESTS: {
if (outlen != sizeof(test_report_t)) {
return ZX_ERR_BUFFER_TOO_SMALL;
}
*out_actual = sizeof(test_report_t);
- return TestRunTests(in, inlen, (test_report_t*)out);
+ return TestRunTests(static_cast<test_report_t*>(out));
}
case IOCTL_TEST_DESTROY_DEVICE:
diff --git a/system/dev/test/ddk-test/ddk-test.c b/system/dev/test/ddk-test/ddk-test.c
index c35b0b6..6e608cd 100644
--- a/system/dev/test/ddk-test/ddk-test.c
+++ b/system/dev/test/ddk-test/ddk-test.c
@@ -34,7 +34,7 @@
}
}
-static zx_status_t ddk_test_func(void* cookie, const void* arg, size_t arglen, test_report_t* report) {
+static zx_status_t ddk_test_func(void* cookie, test_report_t* report) {
zx_device_t* dev = (zx_device_t*)cookie;
test_protocol_t proto;
diff --git a/system/public/zircon/device/test.h b/system/public/zircon/device/test.h
index 02123f2..4cd03c2 100644
--- a/system/public/zircon/device/test.h
+++ b/system/public/zircon/device/test.h
@@ -35,12 +35,6 @@
#define IOCTL_TEST_SET_OUTPUT_SOCKET \
IOCTL(IOCTL_KIND_SET_HANDLE, IOCTL_FAMILY_TEST, 3)
-// Set a control channel
-// in: zx_handle_t*
-// out: none
-#define IOCTL_TEST_SET_CONTROL_CHANNEL \
- IOCTL(IOCTL_KIND_SET_HANDLE, IOCTL_FAMILY_TEST, 4)
-
typedef struct test_ioctl_test_report {
unsigned int n_tests;
unsigned int n_success;
@@ -53,11 +47,8 @@
// ssize_t ioctl_test_destroy_device(int fd)
IOCTL_WRAPPER(ioctl_test_destroy_device, IOCTL_TEST_DESTROY_DEVICE);
-// ssize_t ioctl_test_run_tests(int fd, void* in, size_t in_len, test_ioctl_test_report_t* out);
-IOCTL_WRAPPER_VARIN_OUT(ioctl_test_run_tests, IOCTL_TEST_RUN_TESTS, void*, test_ioctl_test_report_t);
+// ssize_t ioctl_test_run_tests(int fd, test_ioctl_test_report_t* out);
+IOCTL_WRAPPER_OUT(ioctl_test_run_tests, IOCTL_TEST_RUN_TESTS, test_ioctl_test_report_t);
// ssize_t ioctl_test_set_output_socket(int fd, zx_handle_t in)
IOCTL_WRAPPER_IN(ioctl_test_set_output_socket, IOCTL_TEST_SET_OUTPUT_SOCKET, zx_handle_t)
-
-// ssize_t ioctl_test_set_control_channel(int fd, zx_handle_t in)
-IOCTL_WRAPPER_IN(ioctl_test_set_control_channel, IOCTL_TEST_SET_CONTROL_CHANNEL, zx_handle_t)
diff --git a/system/ulib/ddktl/test/ddktl-test.cpp b/system/ulib/ddktl/test/ddktl-test.cpp
index f2de174..6f8430c 100644
--- a/system/ulib/ddktl/test/ddktl-test.cpp
+++ b/system/ulib/ddktl/test/ddktl-test.cpp
@@ -38,7 +38,7 @@
}
}
-zx_status_t ddktl_test_func(void* cookie, const void* arg, size_t arglen, test_report_t* report) {
+zx_status_t ddktl_test_func(void* cookie, test_report_t* report) {
auto dev = static_cast<zx_device_t*>(cookie);
test_protocol_t proto;
diff --git a/system/utest/driver-tests/main.cpp b/system/utest/driver-tests/main.cpp
index 5498fee..b9a146a 100644
--- a/system/utest/driver-tests/main.cpp
+++ b/system/utest/driver-tests/main.cpp
@@ -95,7 +95,7 @@
ioctl_test_set_output_socket(fd.get(), &h);
- rc = ioctl_test_run_tests(fd.get(), NULL, 0, report);
+ rc = ioctl_test_run_tests(fd.get(), report);
if (rc < 0) {
printf("driver-tests: error %zd running tests\n", rc);
report->n_tests = 1;
