net: move ping to sys/net

* moved the former ping module from `sys` to `sys/net/link_layer` and renamed to l2_ping
* use defaulttransceiver instead of cc110x
* some refactoring

sys/Makefile

@@ -13,6 +13,9 @@ endif
 ifneq (,$(filter net_if,$(USEMODULE)))
     DIRS += net/link_layer/net_if
 endif
+ifneq (,$(filter l2_ping,$(USEMODULE)))
+    DIRS += net/link_layer/ping
+endif
 ifneq (,$(filter transport_layer,$(USEMODULE)))
 	USEMODULE += udp
 	USEMODULE += tcp

sys/Makefile.include

@@ -37,6 +37,9 @@ endif
 ifneq (,$(filter ieee802154,$(USEMODULE)))
     USEMODULE_INCLUDES += $(RIOTBASE)/sys/net/include
 endif
+ifneq (,$(filter l2_ping,$(USEMODULE)))
+    USEMODULE_INCLUDES += $(RIOTBASE)/sys/net/include
+endif
 ifneq (,$(filter ccn_lite,$(USEMODULE)))
     USEMODULE_INCLUDES += $(RIOTBASE)/sys/net/include
     USEMODULE_INCLUDES += $(RIOTBASE)/sys/net/ccn_lite

sys/include/ping.h

@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2010 Freie Universität Berlin
- *
- * This file is subject to the terms and conditions of the GNU Lesser
- * General Public License v2.1. See the file LICENSE in the top level
- * directory for more details.
- */
-
-
-/**
- * @defgroup    sys_ping Ping
- * @ingroup     sys
- * @brief       Ping
- */
-
-#include "radio/radio.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void init_payload(void);
-void ping_init(protocol_t protocol, uint8_t channr, radio_address_t addr);
-void ping(radio_address_t addr, uint8_t channr);
-void calc_rtt(void);
-void print_success(void);
-void print_failed(void);
-void gpio_n_timer_init(void);
-void adjust_timer(void);
-static void ping_handler(void *payload, int payload_size,
-                         packet_info_t *packet_info);
-static void pong_handler(void *payload, int payload_size,
-                         packet_info_t *packet_info);
-void pong(uint16_t src);
-
-typedef struct pong {
-    int hopcount;
-    int ttl;
-    radio_address_t radio_address;
-} ping_r;
-
-typedef struct ping_payload {
-    char *payload;
-} ping_payload;
-
-#ifdef __cplusplus
-}
-#endif

sys/net/include/ping.h

@@ -0,0 +1,31 @@
+
+/**
+ * @defgroup    sys_ping Ping
+ * @ingroup     sys
+ * @brief       Ping
+ */
+
+#include "radio/radio.h"
+
+#define RCV_BUFFER_SIZE     (64)
+#define RADIO_STACK_SIZE    (KERNEL_CONF_STACKSIZE_DEFAULT)
+#define PING_PAYLOAD    (8)
+
+typedef enum {
+    L2_PING,
+    L2_PONG
+} l2_ping_type_t;
+
+void ping_init(void);
+void ping(radio_address_t addr);
+
+typedef struct pong {
+    int hopcount;
+    int ttl;
+    radio_address_t radio_address;
+} ping_r;
+
+typedef struct ping_payload {
+    uint8_t type;
+    char payload[PING_PAYLOAD];
+} ping_payload;

sys/net/link_layer/ping/Makefile

@@ -1 +1,3 @@
+MODULE := l2_ping
+
 include $(RIOTBASE)/Makefile.base

sys/net/link_layer/ping/ping.c

@@ -0,0 +1,154 @@
+/**
+ * Ping: low level ping pong
+ *
+ * Copyright (C) 2013, Igor Merkulow <igor.merkulow@gmail.com>
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser General
+ * Public License. See the file LICENSE in the top level directory for more
+ * details.
+ */
+
+/**
+ * @file
+ * @author Igor Merkulow <igor.merkulow@gmail.com>
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "thread.h"
+#include "msg.h"
+
+#include "transceiver.h"
+#include "radio/types.h"
+#include "vtimer.h"
+#include "timex.h"
+#include "ping.h"
+
+static void send_l2_packet(radio_address_t dst, l2_ping_type_t type);
+static void pong(radio_address_t src);
+static void *pkt_handler(void *unused);
+static void ping_handler(packet_info_t *packet_info);
+static void pong_handler(void);
+static void print_success(void);
+static void print_failed(void);
+static void calc_rtt(void);
+
+char radio_stack_buffer[RADIO_STACK_SIZE];
+msg_t msg_q[RCV_BUFFER_SIZE];
+
+ping_payload pipa;
+timex_t start;
+float rtt = 0;
+
+void ping_handler(packet_info_t *packet_info)
+{
+    pong(packet_info->phy_src);
+}
+
+void ping_init(void)
+{
+    kernel_pid_t radio_pid = thread_create(radio_stack_buffer,
+                                           RADIO_STACK_SIZE, PRIORITY_MAIN - 2,
+                                           CREATE_STACKTEST, pkt_handler, NULL,
+                                           "l2_ping_handler");
+    uint16_t transceivers = TRANSCEIVER_DEFAULT;
+
+    transceiver_init(transceivers);
+    (void) transceiver_start();
+    transceiver_register(transceivers, radio_pid);
+}
+
+void ping(radio_address_t addr)
+{
+    while (1) {
+        vtimer_now(&start);
+
+        send_l2_packet(addr, L2_PING);
+        vtimer_usleep(500 * 1000);
+    }
+}
+
+static void pkt_handler(void)
+{
+    (void) unused;
+
+    msg_t m;
+    radio_packet_t *p;
+
+    msg_init_queue(msg_q, sizeof(msg_q));
+
+    while (1) {
+        msg_receive(&m);
+
+        if (m.type == PKT_PENDING) {
+            p = (radio_packet_t *) m.content.ptr;
+
+            p->processing--;
+        }
+        else if (m.type == ENOBUFFER) {
+            puts("Transceiver buffer full");
+        }
+        else {
+            puts("Unknown packet received");
+        }
+    }
+
+    return NULL;
+}
+
+static void calc_rtt(void)
+{
+    timex_t end;
+    vtimer_now(&end);
+    timex_t result = timex_sub(end, start);
+
+    rtt = result.seconds + (float)result.microseconds / (1000.0 * 1000.0);
+}
+
+static void print_success(void)
+{
+    printf("%s%f%s\n", "time=", rtt, "ms");
+}
+
+static void print_failed(void)
+{
+    printf("%s\n", "ping failed");
+}
+
+static void pong(radio_address_t src)
+{
+    send_l2_packet(src, L2_PONG);
+}
+
+static void send_l2_packet(radio_address_t dst, l2_ping_type_t type)
+{
+    radio_packet_t p;
+
+    transceiver_command_t tcmd;
+    tcmd.transceivers = TRANSCEIVER_DEFAULT;
+    tcmd.data = &p;
+
+    pipa.type = type;
+
+    p.data = (uint8_t*) &pipa;
+    p.length = sizeof(pipa);
+    p.dst = dst;
+
+    msg_t mesg;
+    mesg.type = SND_PKT;
+    mesg.content.ptr = (char *) &tcmd;
+
+    msg_send_receive(&mesg, &mesg, transceiver_pid);
+    int8_t response = mesg.content.value;
+
+    if (response <= 0) {
+        print_failed();
+    }
+}
+
+static void pong_handler(void)
+{
+    calc_rtt();
+    print_success();
+}

sys/ping/ping.c

@@ -1,111 +0,0 @@
-/**
- * Ping: low level ping pong
- *
- * Copyright (C) 2013, Igor Merkulow <igor.merkulow@gmail.com>
- *
- * This file is subject to the terms and conditions of the GNU Lesser
- * General Public License v2.1. See the file LICENSE in the top level
- * directory for more details.
- */
-
-/**
- * @file
- * @author Igor Merkulow <igor.merkulow@gmail.com>
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "thread.h"
-#include "msg.h"
-
-#include "cc110x_legacy_csma/cc1100.h"
-#include "lpc2387.h"
-
-#include "vtimer.h"
-#include "timex.h"
-#include "gpioint.h"
-#include "ping.h"
-
-ping_payload *pipa;
-protocol_t protocol_id = 0;
-radio_address_t r_address = 0;
-timex_t start = 0;
-float rtt = 0;
-
-void ping_handler(void *payload, int payload_size,
-                  packet_info_t *packet_info)
-{
-    pong(packet_info->phy_src);
-}
-
-void pong_handler(void *payload, int payload_size,
-                  packet_info_t *packet_info)
-{
-    calc_rtt();
-    print_success();
-}
-
-void pong(uint16_t src)
-{
-    int trans_ok = cc1100_send_csmaca(src, protocol_id, 2, pipa->payload,
-                                      sizeof(pipa->payload));
-
-    if (trans_ok < 0) {
-        print_failed();
-    }
-}
-
-void ping_init(protocol_t protocol, uint8_t channr, radio_address_t addr)
-{
-    protocol_id = protocol;
-    r_address = addr;
-    cc1100_set_packet_handler(protocol, ping_handler);
-    cc1100_set_channel(channr);
-    cc1100_set_address(r_address);
-    init_payload();
-}
-
-void ping(radio_address_t addr, uint8_t channr)
-{
-    cc1100_set_packet_handler(protocol_id, pong_handler);
-    cc1100_set_channel(channr);
-    cc1100_set_address(r_address);
-
-    while (1) {
-        vtimer_now(&start);
-        int trans_ok = cc1100_send_csmaca(addr,
-                                          protocol_id, 2, pipa->payload, sizeof(pipa->payload));
-
-        if (trans_ok < 0) {
-            print_failed();
-        }
-
-        hwtimer_wait(HWTIMER_TICKS(500 * 1000));
-    }
-}
-
-void calc_rtt(void)
-{
-    timex_t end;
-    vtimer_now(&end);
-    timex_t result = timex_sub(end, start);
-
-    rtt = result.seconds + (float)result.microseconds / (1000.0 * 1000.0);
-}
-
-void print_success(void)
-{
-    printf("%s%f%s\n", "time=", rtt, "ms");
-}
-
-void print_failed(void)
-{
-    printf("%s\n", "ping failed");
-}
-
-void init_payload(void)
-{
-    pipa = malloc(sizeof(*pipa));
-    pipa->payload = NULL;
-}