8 files changed, 2 insertions, 176 deletions
diff --git a/gnuradio-core/src/lib/general/CMakeLists.txt b/gnuradio-core/src/lib/general/CMakeLists.txt
index 394b96c6fb..acec7729cf 100644
--- a/gnuradio-core/src/lib/general/CMakeLists.txt
+++ b/gnuradio-core/src/lib/general/CMakeLists.txt
@@ -223,7 +223,6 @@ set(gr_core_general_triple_threats
     gr_keep_one_in_n
     gr_kludge_copy
     gr_lfsr_32k_source_s
-    gr_map_bb
     gr_multiply_cc
     gr_multiply_ff
     gr_multiply_const_cc
diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i
index fce02ec108..e483fb7a9c 100644
--- a/gnuradio-core/src/lib/general/general.i
+++ b/gnuradio-core/src/lib/general/general.i
@@ -102,7 +102,6 @@
 #include <gr_diff_encoder_bb.h>
 #include <gr_diff_decoder_bb.h>
 #include <gr_framer_sink_1.h>
-#include <gr_map_bb.h>
 #include <gr_multiply_cc.h>
 #include <gr_multiply_ff.h>
 #include <gr_multiply_const_cc.h>
@@ -213,7 +212,6 @@
 %include "gr_diff_encoder_bb.i"
 %include "gr_diff_decoder_bb.i"
 %include "gr_framer_sink_1.i"
-%include "gr_map_bb.i"
 %include "gr_multiply_cc.i"
 %include "gr_multiply_ff.i"
 %include "gr_multiply_const_cc.i"
diff --git a/gnuradio-core/src/lib/general/gr_map_bb.cc b/gnuradio-core/src/lib/general/gr_map_bb.cc
deleted file mode 100644
index 7deb8971a5..0000000000
--- a/gnuradio-core/src/lib/general/gr_map_bb.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2007,2010 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio 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, or (at your option)
- * any later version.
- *
- * GNU Radio 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 GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_map_bb.h>
-#include <gr_io_signature.h>
-
-gr_map_bb_sptr
-gr_make_map_bb (const std::vector<int> &map)
-{
-  return gnuradio::get_initial_sptr(new gr_map_bb (map));
-}
-
-gr_map_bb::gr_map_bb (const std::vector<int> &map)
-  : gr_sync_block ("map_bb",
-		   gr_make_io_signature (1, 1, sizeof (unsigned char)),
-		   gr_make_io_signature (1, 1, sizeof (unsigned char)))
-{
-  for (int i = 0; i < 0x100; i++)
-    d_map[i] = i;
-
-  unsigned int size = std::min((size_t) 0x100, map.size());
-  for (unsigned int i = 0; i < size; i++)
-    d_map[i] = map[i];
-}
-
-int
-gr_map_bb::work (int noutput_items,
-		 gr_vector_const_void_star &input_items,
-		 gr_vector_void_star &output_items)
-{
-  const unsigned char *in = (const unsigned char *) input_items[0];
-  unsigned char *out = (unsigned char *) output_items[0];
-
-  for (int i = 0; i < noutput_items; i++)
-    out[i] = d_map[in[i]];
-
-  return noutput_items;
-}
diff --git a/gnuradio-core/src/lib/general/gr_map_bb.h b/gnuradio-core/src/lib/general/gr_map_bb.h
deleted file mode 100644
index 0a2f5a45f8..0000000000
--- a/gnuradio-core/src/lib/general/gr_map_bb.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio 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, or (at your option)
- * any later version.
- *
- * GNU Radio 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 GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef INCLUDED_GR_MAP_BB_H
-#define INCLUDED_GR_MAP_BB_H
-
-#include <gr_core_api.h>
-#include <gr_sync_block.h>
-
-class gr_map_bb;
-typedef boost::shared_ptr<gr_map_bb> gr_map_bb_sptr;
-
-GR_CORE_API gr_map_bb_sptr gr_make_map_bb(const std::vector<int> &map);
-
-/*!
- * \brief output[i] = map[input[i]]
- * \ingroup coding_blk
- */
-
-class GR_CORE_API gr_map_bb : public gr_sync_block
-{
-  friend GR_CORE_API gr_map_bb_sptr gr_make_map_bb(const std::vector<int> &map);
-
-  unsigned char d_map[0x100];
-
-  gr_map_bb(const std::vector<int> &map);
-
-public:
-  int work (int noutput_items,
-	    gr_vector_const_void_star &input_items,
-	    gr_vector_void_star &output_items);
-};
-
-#endif /* INCLUDED_GR_MAP_BB_H */
diff --git a/gnuradio-core/src/lib/general/gr_map_bb.i b/gnuradio-core/src/lib/general/gr_map_bb.i
deleted file mode 100644
index 9c8bff6447..0000000000
--- a/gnuradio-core/src/lib/general/gr_map_bb.i
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio 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, or (at your option)
- * any later version.
- *
- * GNU Radio 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 GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-GR_SWIG_BLOCK_MAGIC(gr,map_bb);
-
-gr_map_bb_sptr gr_make_map_bb (const std::vector<int> &map);
-
-class gr_map_bb : public gr_sync_block
-{
- private:
-  gr_map_bb (const std::vector<int> &map);
-};
-
diff --git a/gr-digital/python/qa_constellation.py b/gr-digital/python/qa_constellation.py
index b17d2a0fcb..5addccf6ea 100755
--- a/gr-digital/python/qa_constellation.py
+++ b/gr-digital/python/qa_constellation.py
@@ -167,7 +167,7 @@ class mod_demod(gr.hier_block2):
         # Apply any pre-differential coding
         # Gray-coding is done here if we're also using differential coding.
         if self.constellation.apply_pre_diff_code():
-            self.blocks.append(gr.map_bb(self.constellation.pre_diff_code()))
+            self.blocks.append(digital_swig.map_bb(self.constellation.pre_diff_code()))
         # Differential encoding.
         if self.differential:
             self.blocks.append(gr.diff_encoder_bb(arity))
@@ -187,7 +187,7 @@ class mod_demod(gr.hier_block2):
             self.blocks.append(gr.diff_decoder_bb(arity))
         # Decode any pre-differential coding.
         if self.constellation.apply_pre_diff_code():
-            self.blocks.append(gr.map_bb(
+            self.blocks.append(digital_swig.map_bb(
                 mod_codes.invert_code(self.constellation.pre_diff_code())))
         # unpack the k bit vector into a stream of bits            
         self.blocks.append(gr.unpack_k_bits_bb(
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index 95640ac83b..9d43a774c0 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -114,7 +114,6 @@
 		<block>gr_packed_to_unpacked_xx</block>
 		<block>gr_unpack_k_bits_bb</block>
 		<block>gr_chunks_to_symbols_xx</block>
-		<block>gr_map_bb</block>
 	</cat>
 	<cat>
 		<name>Synchronizers</name>
diff --git a/grc/blocks/gr_map_bb.xml b/grc/blocks/gr_map_bb.xml
deleted file mode 100644
index 20d6bd2b44..0000000000
--- a/grc/blocks/gr_map_bb.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Map
-###################################################
- -->
-<block>
-	<name>Map</name>
-	<key>gr_map_bb</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.map_bb($map)</make>
-	<param>
-		<name>Map</name>
-		<key>map</key>
-		<type>int_vector</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>byte</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>byte</type>
-	</source>
-</block>