diff options
author | Josh Blum <josh@joshknows.com> | 2011-01-19 22:23:46 -0800 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2011-01-19 22:23:46 -0800 |
commit | 9239878b0b81c3a368bf11cfc2fe48bfb05ff902 (patch) | |
tree | f41a5e58eac89b35cb99537a0a0b64662384a9f2 /firmware/microblaze/lib/ihex.h | |
parent | fc138381ee4bd8d191795230b7447071a85e1f28 (diff) | |
parent | 7d918c5f6acc9a5d2c8ae03e2e67b403f7efd5ff (diff) | |
download | uhd-9239878b0b81c3a368bf11cfc2fe48bfb05ff902.tar.gz uhd-9239878b0b81c3a368bf11cfc2fe48bfb05ff902.tar.bz2 uhd-9239878b0b81c3a368bf11cfc2fe48bfb05ff902.zip |
Merge branch 'next'
Conflicts:
host/lib/usrp/usrp2/codec_impl.cpp
Diffstat (limited to 'firmware/microblaze/lib/ihex.h')
-rw-r--r-- | firmware/microblaze/lib/ihex.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/firmware/microblaze/lib/ihex.h b/firmware/microblaze/lib/ihex.h deleted file mode 100644 index 9f471fbe2..000000000 --- a/firmware/microblaze/lib/ihex.h +++ /dev/null @@ -1,18 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2010 Ettus Research LLC - * - */ - -#include <stdint.h> -#include <stddef.h> - -typedef struct { - uint8_t type; - size_t length; - uint32_t addr; - uint8_t *data; -} ihex_record_t; - - -int ihex_parse(char input[], ihex_record_t *record); |