commit 57937c06d0ce453c53bcb438bc5f6ef61a080d8b
author Todd Eisenberger <teisenbe@google.com> Fri Dec 07 14:45:35 2018 -0800
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Fri Dec 07 23:11:09 2018 +0000
tree 48b421fa2731dd3647c2542705afe751346b627e
parent 6b55bd45d76a08dd56f89eb0e822ae1e92383442

[dev][test] Switch to zx handles

Test: Ran /boot/test/ddk/driver_tests
Change-Id: I13d1799b513ffeedb0ffd24af5ee06c3c38d9fec

system/dev/misc/test/rules.mk

diff --git a/system/dev/misc/test/rules.mk b/system/dev/misc/test/rules.mk
index 39ae770..162d296 100644
--- a/system/dev/misc/test/rules.mk
+++ b/system/dev/misc/test/rules.mk
@@ -12,6 +12,7 @@
 
 MODULE_STATIC_LIBS := \
 	system/ulib/ddk \
+	system/ulib/zx \
 	system/ulib/zxcpp \
 
 MODULE_LIBS := \

system/dev/misc/test/test.cpp

diff --git a/system/dev/misc/test/test.cpp b/system/dev/misc/test/test.cpp
index 2c591aa..9ebd5e6 100644
--- a/system/dev/misc/test/test.cpp
+++ b/system/dev/misc/test/test.cpp
@@ -2,21 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <ddk/binding.h>
 #include <ddk/device.h>
 #include <ddk/driver.h>
-#include <ddk/binding.h>
 #include <ddk/protocol/test.h>
-
-#include <stdlib.h>
+#include <lib/zx/channel.h>
+#include <lib/zx/socket.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <zircon/device/test.h>
-#include <zircon/listnode.h>
 
 typedef struct test_device {
     zx_device_t* zxdev;
-    zx_handle_t output;
-    zx_handle_t control;
+    zx::socket output;
+    zx::channel control;
     test_func_t test_func;
 } test_device_t;
 
@@ -26,28 +26,22 @@
 
 static void test_device_set_output_socket(void* ctx, zx_handle_t handle) {
     auto device = static_cast<test_device_t*>(ctx);
-    if (device->output != ZX_HANDLE_INVALID) {
-        zx_handle_close(device->output);
-    }
-    device->output = handle;
+    device->output.reset(handle);
 }
 
 static zx_handle_t test_device_get_output_socket(void* ctx) {
     auto device = static_cast<test_device_t*>(ctx);
-    return device->output;
+    return device->output.get();
 }
 
 static void test_device_set_control_channel(void* ctx, zx_handle_t handle) {
     auto device = static_cast<test_device_t*>(ctx);
-    if (device->control != ZX_HANDLE_INVALID) {
-        zx_handle_close(device->control);
-    }
-    device->control = handle;
+    device->control.reset(handle);
 }
 
 static zx_handle_t test_device_get_control_channel(void* ctx) {
     auto device = static_cast<test_device_t*>(ctx);
-    return device->control;
+    return device->control.get();
 }
 
 static void test_device_set_test_func(void* ctx, const test_func_t* func) {
@@ -118,12 +112,6 @@
 
 static void test_device_release(void* ctx) {
     auto device = static_cast<test_device_t*>(ctx);
-    if (device->output != ZX_HANDLE_INVALID) {
-        zx_handle_close(device->output);
-    }
-    if (device->control != ZX_HANDLE_INVALID) {
-        zx_handle_close(device->control);
-    }
     delete device;
 }