From 779be31c58fb8b97e58276a45a51a4fbe3ded3b4 Mon Sep 17 00:00:00 2001
From: Paul Osborne <osbpau@gmail.com>
Date: Tue, 1 Sep 2015 01:32:27 -0500
Subject: ioctl: make ioctl functions public

Consumers of the API may control visibility by means of a module.  The
following is a useful pattern that may be used by implementors (here for
a couple of i2cdev ioctl definitions):

    mod ioctl {
        ioctl!(bad set_i2c_slave_address with super::I2C_SLAVE);
        ioctl!(bad i2c_smbus with super::I2C_SMBUS);
    }

This resolves #184.
---
 src/sys/ioctl/platform/linux.rs | 50 ++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/sys/ioctl/platform/linux.rs b/src/sys/ioctl/platform/linux.rs
index 5987a65a..b0fa6bee 100644
--- a/src/sys/ioctl/platform/linux.rs
+++ b/src/sys/ioctl/platform/linux.rs
@@ -95,59 +95,59 @@ macro_rules! convert_ioctl_res {
 #[macro_export]
 macro_rules! ioctl {
     (bad $name:ident with $nr:expr) => (
-        unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
-                        data: *mut u8)
-                        -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
+        pub unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
+                            data: *mut u8)
+                            -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
             convert_ioctl_res!($crate::sys::ioctl::ioctl(fd, $nr as $crate::sys::ioctl::libc::c_ulong, data))
         }
         );
     (none $name:ident with $ioty:expr, $nr:expr) => (
-        unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int)
-                        -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
+        pub unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int)
+                            -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
             convert_ioctl_res!($crate::sys::ioctl::ioctl(fd, io!($ioty, $nr) as $crate::sys::ioctl::libc::c_ulong))
         }
         );
     (read $name:ident with $ioty:expr, $nr:expr; $ty:ty) => (
-        unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
-                        val: *mut $ty)
-                        -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
+        pub unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
+                            val: *mut $ty)
+                            -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
             convert_ioctl_res!($crate::sys::ioctl::ioctl(fd, ior!($ioty, $nr, ::std::mem::size_of::<$ty>()) as $crate::sys::ioctl::libc::c_ulong, val))
         }
         );
     (write $name:ident with $ioty:expr, $nr:expr; $ty:ty) => (
-        unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
-                        val: *const $ty)
-                         -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
+        pub unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
+                            val: *const $ty)
+                            -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
             convert_ioctl_res!($crate::sys::ioctl::ioctl(fd, iow!($ioty, $nr, ::std::mem::size_of::<$ty>()) as $crate::sys::ioctl::libc::c_ulong, val))
         }
         );
     (readwrite $name:ident with $ioty:expr, $nr:expr; $ty:ty) => (
-        unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
-                        val: *mut $ty)
-                        -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
+        pub unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
+                            val: *mut $ty)
+                            -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
             convert_ioctl_res!($crate::sys::ioctl::ioctl(fd, iorw!($ioty, $nr, ::std::mem::size_of::<$ty>()) as $crate::sys::ioctl::libc::c_ulong, val))
         }
         );
     (read buf $name:ident with $ioty:expr, $nr:expr; $ty:ty) => (
-        unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
-                        val: *mut $ty,
-                        len: usize)
-                        -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
+        pub unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
+                            val: *mut $ty,
+                            len: usize)
+                            -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
             convert_ioctl_res!($crate::sys::ioctl::ioctl(fd, ior!($ioty, $nr, len) as $crate::sys::ioctl::libc::c_ulong, val))
         }
         );
     (write buf $name:ident with $ioty:expr, $nr:expr; $ty:ty) => (
-        unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
-                        val: *const $ty,
-                        len: usize) -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
+        pub unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
+                            val: *const $ty,
+                            len: usize) -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
             convert_ioctl_res!($crate::sys::ioctl::ioctl(fd, iow!($ioty, $nr, len) as $crate::sys::ioctl::libc::c_ulong, val))
         }
         );
     (readwrite buf $name:ident with $ioty:expr, $nr:expr; $ty:ty) => (
-        unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
-                        val: *const $ty,
-                        len: usize)
-                        -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
+        pub unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
+                            val: *const $ty,
+                            len: usize)
+                            -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
             convert_ioctl_res!($crate::sys::ioctl::ioctl(fd, iorw!($ioty, $nr, len) as $crate::sys::ioctl::libc::c_ulong, val))
         }
         );
-- 
cgit v1.2.3