Merge branch 'next'

Conflicts:
	host/lib/usrp/usrp2/codec_impl.cpp

1 files changed, 0 insertions, 71 deletions

diff --git a/firmware/microblaze/lib/udp_fw_update.h b/firmware/microblaze/lib/udp_fw_update.h
deleted file mode 100644
index d25525bd2..000000000
--- a/firmware/microblaze/lib/udp_fw_update.h
+++ /dev/null
@@ -1,71 +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"
-
-#define USRP2_UDP_UPDATE_PORT 49154
-
-typedef enum {
-  USRP2_FW_UPDATE_ID_WAT = ' ',
-
-  USRP2_FW_UPDATE_ID_OHAI_LOL = 'a',
-  USRP2_FW_UPDATE_ID_OHAI_OMG = 'A',
-
-  USRP2_FW_UPDATE_ID_WATS_TEH_FLASH_INFO_LOL = 'f',
-  USRP2_FW_UPDATE_ID_HERES_TEH_FLASH_INFO_OMG = 'F',
-
-  USRP2_FW_UPDATE_ID_ERASE_TEH_FLASHES_LOL = 'e',
-  USRP2_FW_UPDATE_ID_ERASING_TEH_FLASHES_OMG = 'E',
-
-  USRP2_FW_UPDATE_ID_R_U_DONE_ERASING_LOL = 'd',
-  USRP2_FW_UPDATE_ID_IM_DONE_ERASING_OMG = 'D',
-  USRP2_FW_UPDATE_ID_NOPE_NOT_DONE_ERASING_OMG = 'B',
-
-  USRP2_FW_UPDATE_ID_WRITE_TEH_FLASHES_LOL = 'w',
-  USRP2_FW_UPDATE_ID_WROTE_TEH_FLASHES_OMG = 'W',
-
-  USRP2_FW_UPDATE_ID_READ_TEH_FLASHES_LOL = 'r',
-  USRP2_FW_UPDATE_ID_KK_READ_TEH_FLASHES_OMG = 'R',
-
-  USRP2_FW_UPDATE_ID_RESET_MAH_COMPUTORZ_LOL = 's',
-  USRP2_FW_UPDATE_ID_RESETTIN_TEH_COMPUTORZ_OMG = 'S',
-
-  USRP2_FW_UPDATE_ID_KTHXBAI = '~'
-
-} usrp2_fw_update_id_t;
-
-typedef struct {
-  uint32_t proto_ver;
-  uint32_t id;
-  uint32_t seq;
-  union {
-      uint32_t ip_addr;
-    struct {
-      uint32_t flash_addr;
-      uint32_t length;
-      uint8_t  data[256];
-    } flash_args;
-    struct {
-      uint32_t sector_size_bytes;
-      uint32_t memory_size_bytes;
-    } flash_info_args;
-  } data;
-} usrp2_fw_update_data_t;
-
-void handle_udp_fw_update_packet(struct socket_address src, struct socket_address dst,
-                                 unsigned char *payload, int payload_len);