From de3e35f00a6da427507c41061b8dfaf696b8db5a Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 16 Sep 2016 09:39:51 -0600
Subject: [PATCH] include/nuttx/modem:  Move all modem-related IOCTL commands
 to a common file to assure that they will be unique

---
 drivers/modem/u-blox.c       |  1 +
 include/nuttx/modem/ioctl.h  | 71 ++++++++++++++++++++++++++++++++++++
 include/nuttx/modem/u-blox.h |  8 ++--
 3 files changed, 76 insertions(+), 4 deletions(-)
 create mode 100644 include/nuttx/modem/ioctl.h

diff --git a/drivers/modem/u-blox.c b/drivers/modem/u-blox.c
index b44b4aea5b..95a7fc29d2 100644
--- a/drivers/modem/u-blox.c
+++ b/drivers/modem/u-blox.c
@@ -54,6 +54,7 @@
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
+
 /* Debug ********************************************************************/
 /* Non-standard debug that may be enabled just for testing the modem driver */
 
diff --git a/include/nuttx/modem/ioctl.h b/include/nuttx/modem/ioctl.h
new file mode 100644
index 0000000000..2cde4c4a75
--- /dev/null
+++ b/include/nuttx/modem/ioctl.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+ * include/nuttx/modem/ioctl.h
+ *
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#ifndef __INCLUDE_NUTTX_MODEM_IOCTL_H
+#define __INCLUDE_NUTTX_MODEM_IOCTL_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <nuttx/fs/ioctl.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* All modem-related IOCTL commands are defined here to assure that they are
+ * globally unique.
+ */
+
+/* U-Blox Modem IOCTL commands */
+
+#define MODEM_IOC_POWERON    _MODEMIOC(1)
+#define MODEM_IOC_POWEROFF   _MODEMIOC(2)
+#define MODEM_IOC_RESET      _MODEMIOC(3)
+#define MODEM_IOC_GETSTATUS  _MODEMIOC(4)
+
+/* Unrecognized IOCTL commands are forwarded to the lower half driver.  These
+ * may include the modem commands from include/nuttx/serial/ioctl.h such as
+ * the following:
+ *
+ *   TIOCMGET: Get modem status bits: FAR int
+ *   TIOCMSET: Set modem status bits: FAR const int
+ *   TIOCMBIC: Clear modem bits: FAR const int
+ *   TIOCMBIS: Set modem bits: FAR const int
+ */
+
+#endif /* __INCLUDE_NUTTX_MODEM_IOCTL_H */
diff --git a/include/nuttx/modem/u-blox.h b/include/nuttx/modem/u-blox.h
index 3b08ac422d..e81aeb1768 100644
--- a/include/nuttx/modem/u-blox.h
+++ b/include/nuttx/modem/u-blox.h
@@ -42,16 +42,16 @@
 
 #include <nuttx/config.h>
 #include <nuttx/compiler.h>
+
 #include <stdbool.h>
 
+#include <nuttx/modem/ioctl.h>
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
 
-#define MODEM_IOC_POWERON    _MODEMIOC(1)
-#define MODEM_IOC_POWEROFF   _MODEMIOC(2)
-#define MODEM_IOC_RESET      _MODEMIOC(3)
-#define MODEM_IOC_GETSTATUS  _MODEMIOC(4)
+/* See IOCTL definitions in include/nuttx/modem/ioctl.h */
 
 /****************************************************************************
  * Public Types