diff --git a/garnet/public/rust/fuchsia-ddk/fuchsia-ddk-sys/src/lib.rs b/garnet/public/rust/fuchsia-ddk/fuchsia-ddk-sys/src/lib.rs index a8f21bdee7354c09dcd62e676feebb8caec4e979..820e2d94209b2c6d20d86d638452e88c2829e5ba 100644 --- a/garnet/public/rust/fuchsia-ddk/fuchsia-ddk-sys/src/lib.rs +++ b/garnet/public/rust/fuchsia-ddk/fuchsia-ddk-sys/src/lib.rs @@ -401,6 +401,5 @@ extern "C" { pub fn device_read(dev: *mut zx_device_t, buf: *mut u8, count: usize, off: sys::zx_off_t, actual: *mut usize) -> sys::zx_status_t; pub fn device_write(dev: *mut zx_device_t, buf: *const u8, count: usize, off: sys::zx_off_t, actual: *mut usize) -> sys::zx_status_t; pub fn device_get_size(dev: *mut zx_device_t) -> sys::zx_off_t; - pub fn device_ioctl(dev: *mut zx_device_t, op: u32, in_buf: *const u8, in_len: usize, out_buf: *mut u8, out_len: usize, out_actual: *mut usize) -> sys::zx_status_t; pub fn device_state_clr_set(dev: *mut zx_device_t, clearflag: sys::zx_signals_t, setflag: sys::zx_signals_t); } diff --git a/garnet/public/rust/fuchsia-ddk/src/lib.rs b/garnet/public/rust/fuchsia-ddk/src/lib.rs index 4d34c7dc3d2c015bb890ed330e54fb67634510a0..591f8ff48f4545f34581de4b48c95cceb8a42cef 100644 --- a/garnet/public/rust/fuchsia-ddk/src/lib.rs +++ b/garnet/public/rust/fuchsia-ddk/src/lib.rs @@ -154,16 +154,6 @@ impl Device { unsafe { sys::device_get_size(self.device) } } - pub fn ioctl(&mut self, op: u32, in_buf: &[u8], out_buf: &mut [u8]) -> Result<usize, Status> { - let mut out_actual = 0; - let status = unsafe { - sys::device_ioctl(self.device, op, in_buf.as_ptr(), in_buf.len(), - out_buf.as_mut_ptr(), out_buf.len(), &mut out_actual) - }; - ok(status)?; - Ok(out_actual) - } - pub fn load_firmware(&mut self, path: &str) -> Result<(Vmo, usize), Status> { let mut size = 0; let mut fw = 0; diff --git a/zircon/system/core/devmgr/devhost/api.cpp b/zircon/system/core/devmgr/devhost/api.cpp index d6b5f2ed3a67f3a35ea1019b8c95ceaaec588390..843abd84b37e1c1ca3c68efe8581aa510d1cb67b 100644 --- a/zircon/system/core/devmgr/devhost/api.cpp +++ b/zircon/system/core/devmgr/devhost/api.cpp @@ -191,11 +191,6 @@ __EXPORT zx_status_t device_write(zx_device_t* dev, const void* buf, size_t coun return dev->ops->write(dev->ctx, buf, count, off, actual); } -__EXPORT zx_status_t device_ioctl(zx_device_t* dev, uint32_t op, const void* in_buf, size_t in_len, - void* out_buf, size_t out_len, size_t* out_actual) { - return dev->ops->ioctl(dev->ctx, op, in_buf, in_len, out_buf, out_len, out_actual); -} - // LibDriver Misc Interfaces namespace devmgr { diff --git a/zircon/system/ulib/ddk/include/ddk/device.h b/zircon/system/ulib/ddk/include/ddk/device.h index 79a174f567912fff5ce67372c8f83af79e709e37..ddee6cdee31ff6975a057fc34146ffec51372e4d 100644 --- a/zircon/system/ulib/ddk/include/ddk/device.h +++ b/zircon/system/ulib/ddk/include/ddk/device.h @@ -253,10 +253,6 @@ zx_status_t device_write(zx_device_t* dev, const void* buf, size_t count, zx_off_t device_get_size(zx_device_t* dev); -zx_status_t device_ioctl(zx_device_t* dev, uint32_t op, - const void* in_buf, size_t in_len, - void* out_buf, size_t out_len, size_t* out_actual); - // Device Metadata Support // retrieves metadata for a specific device