From 204750b8c5f48897dbb03c9ff04cb2da46861fe7 Mon Sep 17 00:00:00 2001
From: Matteo Cypriani <matteo.cypriani@univ-fcomte.fr>
Date: Fri, 25 Mar 2011 16:30:40 +0100
Subject: [PATCH] [lib] Rename PACKET_TYPE_* -> OWL_REQUEST_*

---
 libowlps/owlps.h                 | 6 +++---
 owlps-client/owlps-client.c      | 4 ++--
 owlps-listener/owlps-listenerd.c | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libowlps/owlps.h b/libowlps/owlps.h
index 170b689..635dc23 100644
--- a/libowlps/owlps.h
+++ b/libowlps/owlps.h
@@ -130,9 +130,9 @@ typedef struct _owl_autocalibration_order
 
 
 /* Positioning request types */
-#define PACKET_TYPE_NORMAL 0
-#define PACKET_TYPE_CALIBRATION 1
-#define PACKET_TYPE_AUTOCALIBRATION 2
+#define OWL_REQUEST_NORMAL 0
+#define OWL_REQUEST_CALIBRATION 1
+#define OWL_REQUEST_AUTOCALIBRATION 2
 
 
 /* Wi-Fi channel frequencies in Hz */
diff --git a/owlps-client/owlps-client.c b/owlps-client/owlps-client.c
index edd978c..e1b3727 100644
--- a/owlps-client/owlps-client.c
+++ b/owlps-client/owlps-client.c
@@ -331,7 +331,7 @@ void make_packet()
         sizeof(uint8_t) * 2 + sizeof(owl_timestamp) + sizeof(float) * 3 ;
       packet = malloc(packet_size) ;
 
-      memset(&packet[offset], PACKET_TYPE_CALIBRATION, 1) ; // Packet type
+      memset(&packet[offset], OWL_REQUEST_CALIBRATION, 1) ; // Packet type
       ++offset ;
       memcpy(&packet[offset], &request_time, sizeof(request_time)) ;
       offset += sizeof(request_time) ;
@@ -352,7 +352,7 @@ void make_packet()
       printf("Preparing request packet…\n") ;
       packet_size = sizeof(uint8_t) + sizeof(owl_timestamp) ;
       packet = malloc(packet_size) ;
-      memset(&packet[0], PACKET_TYPE_NORMAL, 1) ; // Packet type
+      memset(&packet[0], OWL_REQUEST_NORMAL, 1) ; // Packet type
       memcpy(&packet[1], &request_time, sizeof(request_time)) ;
     }
 
diff --git a/owlps-listener/owlps-listenerd.c b/owlps-listener/owlps-listenerd.c
index 54afeaa..c9030da 100644
--- a/owlps-listener/owlps-listenerd.c
+++ b/owlps-listener/owlps-listenerd.c
@@ -758,12 +758,12 @@ void read_packet(u_char *args, const struct pcap_pkthdr *header,
                + sizeof(struct iphdr) + sizeof(struct udphdr)] ;
       switch(packet_type)
         {
-        case PACKET_TYPE_NORMAL :
+        case OWL_REQUEST_NORMAL :
           if (GET_VERBOSE())
             printf("\nExplicit packet received.\n") ;
           break ;
 
-        case PACKET_TYPE_CALIBRATION :
+        case OWL_REQUEST_CALIBRATION :
           if (GET_VERBOSE())
             printf("\nExplicit calibration packet received.\n") ;
           request.direction =
@@ -783,7 +783,7 @@ void read_packet(u_char *args, const struct pcap_pkthdr *header,
                          + sizeof(struct udphdr) + 18], sizeof(float)) ;
           break ;
 
-        case PACKET_TYPE_AUTOCALIBRATION :
+        case OWL_REQUEST_AUTOCALIBRATION :
           if (GET_VERBOSE())
             {
               printf("\nAutocalibration packet received.") ;
@@ -1160,7 +1160,7 @@ uint_fast16_t make_packet(uint8_t **packet)
   size = sizeof(char) + sizeof(owl_timestamp) ;
   pkt = malloc(size) ;
 
-  memset(&pkt[0], PACKET_TYPE_AUTOCALIBRATION, 1) ; // Packet type
+  memset(&pkt[0], OWL_REQUEST_AUTOCALIBRATION, 1) ; // Packet type
   memcpy(&pkt[1], &request_time, sizeof(request_time)) ;
 
   *packet = pkt ;