usrp_x3xx_fpga_burner: use internal cdecode files

3 files changed, 2 insertions, 109 deletions

diff --git a/host/utils/CMakeLists.txt b/host/utils/CMakeLists.txt
index 7e23b18c3..1ea86f2cc 100644
--- a/host/utils/CMakeLists.txt
+++ b/host/utils/CMakeLists.txt
@@ -30,7 +30,7 @@ SET(util_runtime_sources
 
 SET(x3xx_burner_sources
     usrp_x3xx_fpga_burner.cpp
-    cdecode.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/../lib/usrp/x300/cdecode.c
 )
 
 find_package(UDev)
@@ -49,6 +49,7 @@ FOREACH(util_source ${util_runtime_sources})
 ENDFOREACH(util_source)
 
 IF(ENABLE_X300)
+    INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/lib/usrp/x300)
     ADD_EXECUTABLE(usrp_x3xx_fpga_burner ${x3xx_burner_sources})
     TARGET_LINK_LIBRARIES(usrp_x3xx_fpga_burner uhd ${Boost_LIBRARIES})
     UHD_INSTALL(TARGETS usrp_x3xx_fpga_burner RUNTIME DESTINATION ${RUNTIME_DIR} COMPONENT utilities)
diff --git a/host/utils/cdecode.c b/host/utils/cdecode.c
deleted file mode 100644
index 1d09cbe22..000000000
--- a/host/utils/cdecode.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-cdecoder.c - c source to a base64 decoding algorithm implementation
-
-This is part of the libb64 project, and has been placed in the public domain.
-For details, see http://sourceforge.net/projects/libb64
-*/
-
-#include "cdecode.h"
-
-int base64_decode_value(char value_in){
-    static const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51};
-    static const char decoding_size = sizeof(decoding);
-    value_in -= 43;
-    if ((signed char)value_in < 0 || value_in > decoding_size) return -1;
-    return decoding[(int)value_in];
-}
-
-void base64_init_decodestate(base64_decodestate* state_in){
-    state_in->step = step_a;
-    state_in->plainchar = 0;
-}
-
-size_t base64_decode_block(const char* code_in, const size_t length_in, char* plaintext_out, base64_decodestate* state_in){
-    const char* codechar = code_in;
-    char* plainchar = plaintext_out;
-    char fragment;
-    
-    *plainchar = state_in->plainchar;
-    
-    switch (state_in->step){
-        while (1){
-            case step_a:
-                do{
-                    if (codechar == code_in+length_in){
-                        state_in->step = step_a;
-                        state_in->plainchar = *plainchar;
-                        return plainchar - plaintext_out;
-                    }
-                    fragment = (char)base64_decode_value(*codechar++);
-                } while ((signed char)fragment < 0);
-                *plainchar = (fragment & 0x03f) << 2;
-
-            case step_b:
-                do{
-                    if (codechar == code_in+length_in){
-                        state_in->step = step_b;
-                        state_in->plainchar = *plainchar;
-                        return plainchar - plaintext_out;
-                    }
-                    fragment = (char)base64_decode_value(*codechar++);
-                } while ((signed char)fragment < 0);
-                *plainchar++ |= (fragment & 0x030) >> 4;
-                *plainchar    = (fragment & 0x00f) << 4;
-            case step_c:
-                do{
-                    if (codechar == code_in+length_in)
-                    {
-                        state_in->step = step_c;
-                        state_in->plainchar = *plainchar;
-                        return plainchar - plaintext_out;
-                    }
-                    fragment = (char)base64_decode_value(*codechar++);
-                } while ((signed char)fragment < 0);
-                *plainchar++ |= (fragment & 0x03c) >> 2;
-                *plainchar    = (fragment & 0x003) << 6;
-            case step_d:
-                do{
-                    if (codechar == code_in+length_in){
-                        state_in->step = step_d;
-                        state_in->plainchar = *plainchar;
-                        return plainchar - plaintext_out;
-                    }
-                    fragment = (char)base64_decode_value(*codechar++);
-                } while ((signed char)fragment < 0);
-                *plainchar++   |= (fragment & 0x03f);
-        }
-    }
-    /* control should not reach here */
-    return plainchar - plaintext_out;
-}
diff --git a/host/utils/cdecode.h b/host/utils/cdecode.h
deleted file mode 100644
index e1eee301f..000000000
--- a/host/utils/cdecode.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-cdecode.h - c header for a base64 decoding algorithm
-
-This is part of the libb64 project, and has been placed in the public domain.
-For details, see http://sourceforge.net/projects/libb64
-*/
-
-#ifndef BASE64_CDECODE_H
-#define BASE64_CDECODE_H
-
-#include <stddef.h>
-
-typedef enum{
-    step_a, step_b, step_c, step_d
-} base64_decodestep;
-
-typedef struct{
-    base64_decodestep step;
-    char plainchar;
-} base64_decodestate;
-
-void base64_init_decodestate(base64_decodestate* state_in);
-
-int base64_decode_value(char value_in);
-
-size_t base64_decode_block(const char* code_in, const size_t length_in, char* plaintext_out, base64_decodestate* state_in);
-
-#endif /* BASE64_CDECODE_H */