net/ieee802154/ieee802154_conn.c

@@ -83,7 +83,7 @@ static dq_queue_t g_active_ieee802154_connections;
  * Name: ieee802154_conn_initialize
  *
  * Description:
- *   Initialize the IEEE 802.15.5 connection structure allocator.  Called
+ *   Initialize the IEEE 802.15.4 connection structure allocator.  Called
  *   once and only from ieee802154_initialize().
  *
  * Assumptions:
@@ -218,7 +218,7 @@ FAR struct ieee802154_conn_s *
        conn = (FAR struct ieee802154_conn_s *)conn->node.flink)
     {
       /* Does the destination address match the bound address of the socket. */
-      /* REVISIT: Currently and explict address must be assigned.  Should we
+      /* REVISIT: Currently and explicit address must be assigned.  Should we
        * support some moral equivalent to INADDR_ANY?
        */
 

net/ieee802154/ieee802154_container.c

 /****************************************************************************
- *  wireless/pktradio/ieee802154_container.c
+ *  net/ieee802154/ieee802154_container.c
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>

net/ieee802154/ieee802154_finddev.c

 /****************************************************************************
  * net/ieee802154/ieee802154_finddev.c
  *
- *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -56,8 +56,8 @@
 
 struct ieee802154_finddev_s
 {
-    FAR const struct ieee802154_saddr_s *addr;
-    FAR struct radio_driver_s *radio;
+  FAR const struct ieee802154_saddr_s *addr;
+  FAR struct radio_driver_s *radio;
 };
 
 /****************************************************************************
@@ -65,7 +65,7 @@ struct ieee802154_finddev_s
  ****************************************************************************/
 
 /****************************************************************************
- * Name: ieee8021545_dev_callback
+ * Name: ieee802154_dev_callback
  *
  * Description:
  *   Check if this device matches the connections local address.
@@ -79,7 +79,7 @@ struct ieee802154_finddev_s
  *
  ****************************************************************************/
 
-static int ieee8021545_dev_callback(FAR struct net_driver_s *dev, FAR void *arg)
+static int ieee802154_dev_callback(FAR struct net_driver_s *dev, FAR void *arg)
 {
   FAR struct ieee802154_finddev_s *match =
     (FAR struct ieee802154_finddev_s *)arg;
@@ -174,10 +174,10 @@ FAR struct radio_driver_s *
               addr->s_mode == IEEE802154_ADDRMODE_EXTENDED);
 
   /* Other, search for the IEEE 802.15.4 network device whose MAC is equal to
-   * the sockets bount local address.
+   * the sockets bound local address.
    */
 
-  ret = netdev_foreach(ieee8021545_dev_callback, (FAR void *)&match);
+  ret = netdev_foreach(ieee802154_dev_callback, (FAR void *)&match);
   if (ret == 1)
     {
       DEBUGASSERT(match.radio != NULL);

net/ieee802154/ieee802154_input.c

@@ -94,7 +94,7 @@ static int ieee802154_count_frames(FAR struct ieee802154_conn_s *conn)
  * Input Parameters:
  *   conn   - The socket connection structure.
  *   framel - A single frame to add to the RX queue.
- *   meta   - Meta data characterizing the received frane.
+ *   meta   - Meta data characterizing the received frame.
  *
  * Returned Value:
  *   Zero (OK) is returned on success; A negated errno value is returned on
@@ -222,9 +222,9 @@ static int ieee802154_queue_frame(FAR struct ieee802154_conn_s *conn,
  *   framelist - The head of an incoming list of frames.  Normally this
  *               would be a single frame.  A list may be provided if
  *               appropriate, however.
- *   meta      - Meta data characterizing the received frane.
+ *   meta      - Meta data characterizing the received frame.
  *
- *               If there are multilple frames in the list, this metadata
+ *               If there are multiple frames in the list, this metadata
  *               must apply to all of the frames in the list.
  *
  * Returned Value:

net/ieee802154/ieee802154_sendto.c

 /****************************************************************************
  * net/ieee802154/ieee802154_sendto.c
  *
- *   Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved.
- *   Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57,7 +56,6 @@
 #include <nuttx/mm/iob.h>
 #include <nuttx/net/radiodev.h>
 #include <nuttx/net/net.h>
-#include <nuttx/net/ip.h>
 
 #include "netdev/netdev.h"
 #include "devif/devif.h"
@@ -78,7 +76,7 @@ struct ieee802154_sendto_s
 {
   FAR struct socket *is_sock;            /* Points to the parent socket structure */
   FAR struct devif_callback_s *is_cb;    /* Reference to callback instance */
-  struct ieee802154_saddr_s is_destaddr; /* Frame destinatin address */
+  struct ieee802154_saddr_s is_destaddr; /* Frame destination address */
   sem_t is_sem;                          /* Used to wake up the waiting thread */
   FAR const uint8_t *is_buffer;          /* User buffer of data to send */
   size_t is_buflen;                      /* Number of bytes in the is_buffer */
@@ -163,7 +161,7 @@ static inline bool ieee802154_eaddrnull(FAR const uint8_t *eaddr)
  *
  * Description:
  *   Based on the collected attributes and addresses, construct the MAC meta
- *   data structure that we need to interface with the IEEE802.15.4 MAC.
+ *   data structure that we need to interface with the IEEE 802.15.4 MAC.
  *
  * Input Parameters:
  *   radio   - Radio network driver state instance.
@@ -179,9 +177,9 @@ static inline bool ieee802154_eaddrnull(FAR const uint8_t *eaddr)
  *
  ****************************************************************************/
 
-void ieee802154_meta_data(FAR struct radio_driver_s *radio,
-                          FAR struct ieee802154_sendto_s *pstate,
-                          FAR struct ieee802154_frame_meta_s *meta)
+static void ieee802154_meta_data(FAR struct radio_driver_s *radio,
+                                 FAR struct ieee802154_sendto_s *pstate,
+                                 FAR struct ieee802154_frame_meta_s *meta)
 {
   FAR struct ieee802154_saddr_s *destaddr;
   FAR struct ieee802154_saddr_s *srcaddr;
@@ -538,7 +536,7 @@ ssize_t psock_ieee802154_sendto(FAR struct socket *psock, FAR const void *buf,
 
   psock->s_flags = _SS_SETSTATE(psock->s_flags, _SF_IDLE);
 
-  /* Check for a errors, Errors are signalled by negative errno values
+  /* Check for a errors, Errors are signaled by negative errno values
    * for the send length
    */
 

net/socket/net_sockif.c

 /****************************************************************************
  * net/socket/net_sockif.c
  *
- *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2017-2018 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -48,6 +48,7 @@
 #include "inet/inet.h"
 #include "local/local.h"
 #include "pkt/pkt.h"
+#include "bluetooth/bluetooth.h"
 #include "ieee802154/ieee802154.h"
 #include "socket/socket.h"
 
@@ -104,6 +105,12 @@ FAR const struct sock_intf_s *
       break;
 #endif
 
+#ifdef CONFIG_NET_BLUETOOTH
+    case PF_BLUETOOTH:
+      sockif = &g_bluetooth_sockif;
+      break;
+#endif
+
 #ifdef CONFIG_NET_IEEE802154
     case PF_IEEE802154:
       sockif = &g_ieee802154_sockif;