Merge branch 'next'

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

1 files changed, 0 insertions, 31 deletions

diff --git a/firmware/microblaze/lib/banal.c b/firmware/microblaze/lib/banal.c
deleted file mode 100644
index 42937957f..000000000
--- a/firmware/microblaze/lib/banal.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2009 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 <banal.h>
-
-uint32_t
-get_uint32(const unsigned char *s)
-{
-  return (s[0] << 24) | (s[1] << 16) | (s[2] << 8) | s[3];
-}
-
-uint64_t
-get_uint64(const unsigned char *s)
-{
-  return (((uint64_t)get_uint32(s)) << 32) | get_uint32(s+4);
-}