Patchwork [meta-oe] uhd: Fix compile errors

login
register
mail settings
Submitter Khem Raj
Date July 1, 2013, 7:23 a.m.
Message ID <1372663401-12751-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/52719/
State Accepted, archived
Commit 830baf380ea86782a5a52fbe8762904840e05691
Headers show

Comments

Khem Raj - July 1, 2013, 7:23 a.m.
uhd would fail with wrong scope for uint8_t type
errors.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
CC: Philip Balister <philip@balister.org>
---
 .../0001-use-uint8_t-from-boost-namespace.patch    |   29 ++++++++++++++++++++
 meta-oe/recipes-connectivity/uhd/uhd_git.bb        |    3 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-connectivity/uhd/uhd/0001-use-uint8_t-from-boost-namespace.patch
Philip Balister - July 1, 2013, 6:34 p.m.
Acked-by: Philip Balister <philip@balister.org>

I'll make sure the patch gets into the upstream codebase and drop the
patch ASAP.

Thanks,

Philip

On 07/01/2013 03:23 AM, Khem Raj wrote:
> uhd would fail with wrong scope for uint8_t type
> errors.
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> CC: Philip Balister <philip@balister.org>
> ---
>  .../0001-use-uint8_t-from-boost-namespace.patch    |   29 ++++++++++++++++++++
>  meta-oe/recipes-connectivity/uhd/uhd_git.bb        |    3 +-
>  2 files changed, 31 insertions(+), 1 deletion(-)
>  create mode 100644 meta-oe/recipes-connectivity/uhd/uhd/0001-use-uint8_t-from-boost-namespace.patch
> 
> diff --git a/meta-oe/recipes-connectivity/uhd/uhd/0001-use-uint8_t-from-boost-namespace.patch b/meta-oe/recipes-connectivity/uhd/uhd/0001-use-uint8_t-from-boost-namespace.patch
> new file mode 100644
> index 0000000..8978ddc
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/uhd/uhd/0001-use-uint8_t-from-boost-namespace.patch
> @@ -0,0 +1,29 @@
> +From 317f6f08cedf005ce1f2d6f0d04cfb2659863423 Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Sun, 30 Jun 2013 22:10:50 -0700
> +Subject: [PATCH] use uint8_t from boost namespace
> +
> +Fixes errors like
> +codec_ctrl.cpp:113:10: error: 'uint8_t' was not declared in this scope
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +---
> + host/lib/usrp/e100/codec_ctrl.cpp |    2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/host/lib/usrp/e100/codec_ctrl.cpp b/host/lib/usrp/e100/codec_ctrl.cpp
> +index 13b3bc9..2c13176 100644
> +--- a/host/lib/usrp/e100/codec_ctrl.cpp
> ++++ b/host/lib/usrp/e100/codec_ctrl.cpp
> +@@ -110,7 +110,7 @@ e100_codec_ctrl_impl::e100_codec_ctrl_impl(spi_iface::sptr iface){
> +     //_ad9862_regs.dis2 = ad9862_regs_t::DIS2_DIS; needed for transmit
> + 
> +     //write the register settings to the codec
> +-    for (uint8_t addr = 0; addr <= 25; addr++){
> ++    for (boost::uint8_t addr = 0; addr <= 25; addr++){
> +         this->send_reg(addr);
> +     }
> + 
> +-- 
> +1.7.9.5
> +
> diff --git a/meta-oe/recipes-connectivity/uhd/uhd_git.bb b/meta-oe/recipes-connectivity/uhd/uhd_git.bb
> index 06d5eff..180fd27 100644
> --- a/meta-oe/recipes-connectivity/uhd/uhd_git.bb
> +++ b/meta-oe/recipes-connectivity/uhd/uhd_git.bb
> @@ -4,7 +4,8 @@ PV = "3.5.3"
>  PR = "${INC_PR}.0"
>  
>  SRC_URI = "git://ettus.sourcerepo.com/ettus/uhd.git;branch=maint;protocol=git \
> -"
> +           file://0001-use-uint8_t-from-boost-namespace.patch;striplevel=2 \
> +          "
>  S = "${WORKDIR}/git/host"
>  
>  SRCREV = "f4c58120dc1e3674ee0228213f0f0011a0f80dcf"
>

Patch

diff --git a/meta-oe/recipes-connectivity/uhd/uhd/0001-use-uint8_t-from-boost-namespace.patch b/meta-oe/recipes-connectivity/uhd/uhd/0001-use-uint8_t-from-boost-namespace.patch
new file mode 100644
index 0000000..8978ddc
--- /dev/null
+++ b/meta-oe/recipes-connectivity/uhd/uhd/0001-use-uint8_t-from-boost-namespace.patch
@@ -0,0 +1,29 @@ 
+From 317f6f08cedf005ce1f2d6f0d04cfb2659863423 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 30 Jun 2013 22:10:50 -0700
+Subject: [PATCH] use uint8_t from boost namespace
+
+Fixes errors like
+codec_ctrl.cpp:113:10: error: 'uint8_t' was not declared in this scope
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ host/lib/usrp/e100/codec_ctrl.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/host/lib/usrp/e100/codec_ctrl.cpp b/host/lib/usrp/e100/codec_ctrl.cpp
+index 13b3bc9..2c13176 100644
+--- a/host/lib/usrp/e100/codec_ctrl.cpp
++++ b/host/lib/usrp/e100/codec_ctrl.cpp
+@@ -110,7 +110,7 @@ e100_codec_ctrl_impl::e100_codec_ctrl_impl(spi_iface::sptr iface){
+     //_ad9862_regs.dis2 = ad9862_regs_t::DIS2_DIS; needed for transmit
+ 
+     //write the register settings to the codec
+-    for (uint8_t addr = 0; addr <= 25; addr++){
++    for (boost::uint8_t addr = 0; addr <= 25; addr++){
+         this->send_reg(addr);
+     }
+ 
+-- 
+1.7.9.5
+
diff --git a/meta-oe/recipes-connectivity/uhd/uhd_git.bb b/meta-oe/recipes-connectivity/uhd/uhd_git.bb
index 06d5eff..180fd27 100644
--- a/meta-oe/recipes-connectivity/uhd/uhd_git.bb
+++ b/meta-oe/recipes-connectivity/uhd/uhd_git.bb
@@ -4,7 +4,8 @@  PV = "3.5.3"
 PR = "${INC_PR}.0"
 
 SRC_URI = "git://ettus.sourcerepo.com/ettus/uhd.git;branch=maint;protocol=git \
-"
+           file://0001-use-uint8_t-from-boost-namespace.patch;striplevel=2 \
+          "
 S = "${WORKDIR}/git/host"
 
 SRCREV = "f4c58120dc1e3674ee0228213f0f0011a0f80dcf"