Moved UDP firmware update stuff out of fw_common.h into udp_fw_update.h.

This stuff should only go back into fw_common.h if we decide to integrate firmware update into
the UHD code. Right now it's a separate Python script.

Also moved udp_fw_update.h to lib/ because it's the same between USRP2 and USRP2P.

2 files changed, 2 insertions, 24 deletions

diff --git a/firmware/microblaze/usrp2/udp_fw_update.c b/firmware/microblaze/usrp2/udp_fw_update.c
index bd62aed85..14eb0b1ee 100644
--- a/firmware/microblaze/usrp2/udp_fw_update.c
+++ b/firmware/microblaze/usrp2/udp_fw_update.c
@@ -20,14 +20,14 @@
 
 #include "net_common.h"
 #include "usrp2/fw_common.h"
-#include "udp_fw_update.h"
 #include <nonstdio.h>
+#include "udp_fw_update.h"
 
 //Firmware update packet handler
 void handle_udp_fw_update_packet(struct socket_address src, struct socket_address dst,
                                  unsigned char *payload, int payload_len) {
 
-  udp_fw_update_data_t update_data_out;
+  usrp2_fw_update_data_t update_data_out;
   update_data_out.id = USRP2_FW_UPDATE_ID_WAT;
 
   send_udp_pkt(USRP2_UDP_UPDATE_PORT, src, &update_data_out, sizeof(update_data_out));
diff --git a/firmware/microblaze/usrp2/udp_fw_update.h b/firmware/microblaze/usrp2/udp_fw_update.h
deleted file mode 100644
index dcf44bc42..000000000
--- a/firmware/microblaze/usrp2/udp_fw_update.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2010 Ettus Research LLC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "net_common.h"
-
-void handle_udp_fw_update_packet(struct socket_address src, struct socket_address dst,
-                                 unsigned char *payload, int payload_len);