From 20615905cd0bf22772740d132be439bcf7ec4d8d Mon Sep 17 00:00:00 2001 From: eb Date: Thu, 26 Jun 2008 18:17:15 +0000 Subject: [PATCH] Fixed spelling error: s/writeable/writable/g git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@8727 221aa14e-8319-0410-a670-987f0aec2ac5 --- pmt/src/lib/pmt.cc | 6 ++-- pmt/src/lib/pmt.h | 28 +++++++++---------- pmt/src/lib/pmt_int.h | 2 +- pmt/src/lib/unv_qa_template.cc.t | 2 +- pmt/src/lib/unv_template.cc.t | 10 +++---- pmt/src/lib/unv_template.h.t | 4 +-- usrp/host/apps-inband/test_usrp_inband_2tx.cc | 2 +- .../test_usrp_inband_timestamps.cc | 2 +- usrp/host/apps-inband/test_usrp_inband_tx.cc | 2 +- .../apps-inband/test_usrp_inband_underrun.cc | 2 +- .../host/lib/inband/usrp_inband_usb_packet.cc | 10 +++---- usrp/host/lib/inband/usrp_rx.cc | 2 +- usrp/host/lib/inband/usrp_rx_stub.cc | 4 +-- usrp/host/lib/inband/usrp_server.cc | 16 +++++------ usrp/host/lib/inband/usrp_tx.cc | 2 +- usrp/host/lib/inband/usrp_tx_stub.cc | 8 +++--- 16 files changed, 51 insertions(+), 51 deletions(-) diff --git a/pmt/src/lib/pmt.cc b/pmt/src/lib/pmt.cc index 537b7a05..f233a139 100644 --- a/pmt/src/lib/pmt.cc +++ b/pmt/src/lib/pmt.cc @@ -508,11 +508,11 @@ pmt_uniform_vector_elements(pmt_t vector, size_t &len) } void * -pmt_uniform_vector_writeable_elements(pmt_t vector, size_t &len) +pmt_uniform_vector_writable_elements(pmt_t vector, size_t &len) { if (!vector->is_uniform_vector()) - throw pmt_wrong_type("pmt_uniform_vector_writeable_elements", vector); - return _uniform_vector(vector)->uniform_writeable_elements(len); + throw pmt_wrong_type("pmt_uniform_vector_writable_elements", vector); + return _uniform_vector(vector)->uniform_writable_elements(len); } //////////////////////////////////////////////////////////////////////////// diff --git a/pmt/src/lib/pmt.h b/pmt/src/lib/pmt.h index 970dd6c7..57945f70 100644 --- a/pmt/src/lib/pmt.h +++ b/pmt/src/lib/pmt.h @@ -375,20 +375,20 @@ const std::complex *pmt_c64vector_elements(pmt_t v, size_t &len); //< le // Return non-const pointers to the elements -void *pmt_uniform_vector_writeable_elements(pmt_t v, size_t &len); //< works with any; len is in bytes - -uint8_t *pmt_u8vector_writeable_elements(pmt_t v, size_t &len); //< len is in elements -int8_t *pmt_s8vector_writeable_elements(pmt_t v, size_t &len); //< len is in elements -uint16_t *pmt_u16vector_writeable_elements(pmt_t v, size_t &len); //< len is in elements -int16_t *pmt_s16vector_writeable_elements(pmt_t v, size_t &len); //< len is in elements -uint32_t *pmt_u32vector_writeable_elements(pmt_t v, size_t &len); //< len is in elements -int32_t *pmt_s32vector_writeable_elements(pmt_t v, size_t &len); //< len is in elements -uint64_t *pmt_u64vector_writeable_elements(pmt_t v, size_t &len); //< len is in elements -int64_t *pmt_s64vector_writeable_elements(pmt_t v, size_t &len); //< len is in elements -float *pmt_f32vector_writeable_elements(pmt_t v, size_t &len); //< len is in elements -double *pmt_f64vector_writeable_elements(pmt_t v, size_t &len); //< len is in elements -std::complex *pmt_c32vector_writeable_elements(pmt_t v, size_t &len); //< len is in elements -std::complex *pmt_c64vector_writeable_elements(pmt_t v, size_t &len); //< len is in elements +void *pmt_uniform_vector_writable_elements(pmt_t v, size_t &len); //< works with any; len is in bytes + +uint8_t *pmt_u8vector_writable_elements(pmt_t v, size_t &len); //< len is in elements +int8_t *pmt_s8vector_writable_elements(pmt_t v, size_t &len); //< len is in elements +uint16_t *pmt_u16vector_writable_elements(pmt_t v, size_t &len); //< len is in elements +int16_t *pmt_s16vector_writable_elements(pmt_t v, size_t &len); //< len is in elements +uint32_t *pmt_u32vector_writable_elements(pmt_t v, size_t &len); //< len is in elements +int32_t *pmt_s32vector_writable_elements(pmt_t v, size_t &len); //< len is in elements +uint64_t *pmt_u64vector_writable_elements(pmt_t v, size_t &len); //< len is in elements +int64_t *pmt_s64vector_writable_elements(pmt_t v, size_t &len); //< len is in elements +float *pmt_f32vector_writable_elements(pmt_t v, size_t &len); //< len is in elements +double *pmt_f64vector_writable_elements(pmt_t v, size_t &len); //< len is in elements +std::complex *pmt_c32vector_writable_elements(pmt_t v, size_t &len); //< len is in elements +std::complex *pmt_c64vector_writable_elements(pmt_t v, size_t &len); //< len is in elements /* * ------------------------------------------------------------------------ diff --git a/pmt/src/lib/pmt_int.h b/pmt/src/lib/pmt_int.h index d2b55752..285244cb 100644 --- a/pmt/src/lib/pmt_int.h +++ b/pmt/src/lib/pmt_int.h @@ -215,7 +215,7 @@ class pmt_uniform_vector : public pmt_base public: bool is_uniform_vector() const { return true; } virtual const void *uniform_elements(size_t &len) = 0; - virtual void *uniform_writeable_elements(size_t &len) = 0; + virtual void *uniform_writable_elements(size_t &len) = 0; virtual size_t length() const = 0; }; diff --git a/pmt/src/lib/unv_qa_template.cc.t b/pmt/src/lib/unv_qa_template.cc.t index 3db508bc..1e2c8e8e 100644 --- a/pmt/src/lib/unv_qa_template.cc.t +++ b/pmt/src/lib/unv_qa_template.cc.t @@ -26,7 +26,7 @@ qa_pmt_unv::test_@TAG@vector() CPPUNIT_ASSERT_EQUAL(s1, rd[1]); CPPUNIT_ASSERT_EQUAL(s2, rd[2]); - @TYPE@ *wr = pmt_@TAG@vector_writeable_elements(v1, len); + @TYPE@ *wr = pmt_@TAG@vector_writable_elements(v1, len); CPPUNIT_ASSERT_EQUAL(len, N); wr[0] = @TYPE@(0); CPPUNIT_ASSERT_EQUAL(@TYPE@(0), wr[0]); diff --git a/pmt/src/lib/unv_template.cc.t b/pmt/src/lib/unv_template.cc.t index 904829da..1e86caea 100644 --- a/pmt/src/lib/unv_template.cc.t +++ b/pmt/src/lib/unv_template.cc.t @@ -47,7 +47,7 @@ pmt_@TAG@vector::elements(size_t &len) } @TYPE@ * -pmt_@TAG@vector::writeable_elements(size_t &len) +pmt_@TAG@vector::writable_elements(size_t &len) { len = length(); return &d_v[0]; @@ -61,7 +61,7 @@ pmt_@TAG@vector::uniform_elements(size_t &len) } void* -pmt_@TAG@vector::uniform_writeable_elements(size_t &len) +pmt_@TAG@vector::uniform_writable_elements(size_t &len) { len = length() * sizeof(@TYPE@); return &d_v[0]; @@ -110,9 +110,9 @@ pmt_@TAG@vector_elements(pmt_t vector, size_t &len) } @TYPE@ * -pmt_@TAG@vector_writeable_elements(pmt_t vector, size_t &len) +pmt_@TAG@vector_writable_elements(pmt_t vector, size_t &len) { if (!vector->is_@TAG@vector()) - throw pmt_wrong_type("pmt_@TAG@vector_writeable_elements", vector); - return _@TAG@vector(vector)->writeable_elements(len); + throw pmt_wrong_type("pmt_@TAG@vector_writable_elements", vector); + return _@TAG@vector(vector)->writable_elements(len); } diff --git a/pmt/src/lib/unv_template.h.t b/pmt/src/lib/unv_template.h.t index 6a084ec5..83ba0be0 100644 --- a/pmt/src/lib/unv_template.h.t +++ b/pmt/src/lib/unv_template.h.t @@ -17,7 +17,7 @@ public: @TYPE@ ref(size_t k) const; void set(size_t k, @TYPE@ x); const @TYPE@ *elements(size_t &len); - @TYPE@ *writeable_elements(size_t &len); + @TYPE@ *writable_elements(size_t &len); const void *uniform_elements(size_t &len); - void *uniform_writeable_elements(size_t &len); + void *uniform_writable_elements(size_t &len); }; diff --git a/usrp/host/apps-inband/test_usrp_inband_2tx.cc b/usrp/host/apps-inband/test_usrp_inband_2tx.cc index 5ab9be06..942f6df0 100644 --- a/usrp/host/apps-inband/test_usrp_inband_2tx.cc +++ b/usrp/host/apps-inband/test_usrp_inband_2tx.cc @@ -340,7 +340,7 @@ test_usrp_tx::build_and_send_next_frame() size_t nshorts = 2 * nsamples_this_frame; // 16-bit I & Q pmt_t uvec = pmt_make_s16vector(nshorts, 0); size_t ignore; - int16_t *samples = pmt_s16vector_writeable_elements(uvec, ignore); + int16_t *samples = pmt_s16vector_writable_elements(uvec, ignore); // fill in the complex sinusoid diff --git a/usrp/host/apps-inband/test_usrp_inband_timestamps.cc b/usrp/host/apps-inband/test_usrp_inband_timestamps.cc index 297c7126..43d0c46a 100644 --- a/usrp/host/apps-inband/test_usrp_inband_timestamps.cc +++ b/usrp/host/apps-inband/test_usrp_inband_timestamps.cc @@ -405,7 +405,7 @@ test_usrp_inband_timestamps::build_and_send_next_frame() size_t nshorts = 2 * nsamples_this_frame; // 16-bit I & Q pmt_t uvec = pmt_make_s16vector(nshorts, 0); size_t ignore; - int16_t *samples = pmt_s16vector_writeable_elements(uvec, ignore); + int16_t *samples = pmt_s16vector_writable_elements(uvec, ignore); // fill in the complex sinusoid diff --git a/usrp/host/apps-inband/test_usrp_inband_tx.cc b/usrp/host/apps-inband/test_usrp_inband_tx.cc index 7f894a4c..9cdb92c2 100644 --- a/usrp/host/apps-inband/test_usrp_inband_tx.cc +++ b/usrp/host/apps-inband/test_usrp_inband_tx.cc @@ -330,7 +330,7 @@ test_usrp_tx::build_and_send_next_frame() size_t nshorts = 2 * nsamples_this_frame; // 16-bit I & Q pmt_t uvec = pmt_make_s16vector(nshorts, 0); size_t ignore; - int16_t *samples = pmt_s16vector_writeable_elements(uvec, ignore); + int16_t *samples = pmt_s16vector_writable_elements(uvec, ignore); // fill in the complex sinusoid diff --git a/usrp/host/apps-inband/test_usrp_inband_underrun.cc b/usrp/host/apps-inband/test_usrp_inband_underrun.cc index c9630cec..e9f85d31 100644 --- a/usrp/host/apps-inband/test_usrp_inband_underrun.cc +++ b/usrp/host/apps-inband/test_usrp_inband_underrun.cc @@ -571,7 +571,7 @@ test_usrp_inband_underrun::build_and_send_next_frame() size_t nshorts = 2 * nsamples_this_frame; // 16-bit I & Q pmt_t uvec = pmt_make_s16vector(nshorts, 0); size_t ignore; - int16_t *samples = pmt_s16vector_writeable_elements(uvec, ignore); + int16_t *samples = pmt_s16vector_writable_elements(uvec, ignore); // fill in the complex sinusoid diff --git a/usrp/host/lib/inband/usrp_inband_usb_packet.cc b/usrp/host/lib/inband/usrp_inband_usb_packet.cc index 2f02ecc3..72bc45cc 100644 --- a/usrp/host/lib/inband/usrp_inband_usb_packet.cc +++ b/usrp/host/lib/inband/usrp_inband_usb_packet.cc @@ -649,7 +649,7 @@ pmt_t usrp_inband_usb_packet::read_subpacket(int payload_offset) { size_t i2c_data_len; pmt_t i2c_data = pmt_make_u8vector(len - 2, 0); // skip rid+mbz+addr = 2 bytes uint8_t *w_data = - (uint8_t *) pmt_u8vector_writeable_elements(i2c_data, i2c_data_len); + (uint8_t *) pmt_u8vector_writable_elements(i2c_data, i2c_data_len); memcpy(w_data, d_payload + payload_offset + 4, i2c_data_len); // skip first word @@ -664,7 +664,7 @@ pmt_t usrp_inband_usb_packet::read_subpacket(int payload_offset) { size_t spi_data_len; pmt_t spi_data = pmt_make_u8vector(len - 2, 0); // skip rid+mbz+addr = 2 bytes uint8_t *w_data = - (uint8_t *) pmt_u8vector_writeable_elements(spi_data, spi_data_len); + (uint8_t *) pmt_u8vector_writable_elements(spi_data, spi_data_len); memcpy(w_data, d_payload + payload_offset + 4, spi_data_len); // skip first word @@ -719,9 +719,9 @@ pmt_t usrp_inband_usb_packet::read_subpacket(int payload_offset) { // The length includes an extra 2 bytes for storing the mbz and addr pmt_t i2c_data = pmt_make_u8vector(len-2, 0); - // Get a writeable address to copy the data from the packet + // Get a writable address to copy the data from the packet size_t ignore; - uint8_t *w_data = (uint8_t *) pmt_u8vector_writeable_elements(i2c_data, ignore); + uint8_t *w_data = (uint8_t *) pmt_u8vector_writable_elements(i2c_data, ignore); memcpy(w_data, d_payload + payload_offset + 4, len-2); @@ -753,7 +753,7 @@ pmt_t usrp_inband_usb_packet::read_subpacket(int payload_offset) { size_t spi_data_len; pmt_t spi_data = pmt_make_u8vector(len - 6, 0); // skip rid+mbz+addr = 2 bytes uint8_t *w_data = - (uint8_t *) pmt_u8vector_writeable_elements(spi_data, spi_data_len); + (uint8_t *) pmt_u8vector_writable_elements(spi_data, spi_data_len); memcpy(w_data, d_payload + payload_offset + 8, spi_data_len); // skip first 2 words diff --git a/usrp/host/lib/inband/usrp_rx.cc b/usrp/host/lib/inband/usrp_rx.cc index 71c042a5..b1f9f7b9 100644 --- a/usrp/host/lib/inband/usrp_rx.cc +++ b/usrp/host/lib/inband/usrp_rx.cc @@ -130,7 +130,7 @@ usrp_rx::read_and_respond(pmt_t data) pmt_t v_pkt = pmt_make_u8vector(pkt_size, 0); transport_pkt *pkt = - (transport_pkt *) pmt_u8vector_writeable_elements(v_pkt, ignore); + (transport_pkt *) pmt_u8vector_writable_elements(v_pkt, ignore); n_read = d_urx->read(pkt, pkt_size, &underrun); diff --git a/usrp/host/lib/inband/usrp_rx_stub.cc b/usrp/host/lib/inband/usrp_rx_stub.cc index 1c96b7a7..8be70953 100644 --- a/usrp/host/lib/inband/usrp_rx_stub.cc +++ b/usrp/host/lib/inband/usrp_rx_stub.cc @@ -165,7 +165,7 @@ usrp_rx_stub::read_and_respond() long n_bytes = nshorts*2; pmt_t uvec = pmt_make_s16vector(nshorts, 0); size_t ignore; - int16_t *samples = pmt_s16vector_writeable_elements(uvec, ignore); + int16_t *samples = pmt_s16vector_writable_elements(uvec, ignore); // fill in the complex sinusoid @@ -192,7 +192,7 @@ usrp_rx_stub::read_and_respond() pmt_t v_pkt = pmt_make_u8vector(sizeof(transport_pkt), 0); transport_pkt *pkt = - (transport_pkt *) pmt_u8vector_writeable_elements(v_pkt, ignore); + (transport_pkt *) pmt_u8vector_writable_elements(v_pkt, ignore); pkt->set_header(0, channel, 0, n_bytes); pkt->set_timestamp(0xffffffff); diff --git a/usrp/host/lib/inband/usrp_server.cc b/usrp/host/lib/inband/usrp_server.cc index 6a3643e5..9f92e2af 100644 --- a/usrp/host/lib/inband/usrp_server.cc +++ b/usrp/host/lib/inband/usrp_server.cc @@ -721,7 +721,7 @@ void usrp_server::handle_cmd_xmit_raw_frame( pmt_t v_packets = pmt_make_u8vector(sizeof(transport_pkt) * n_packets, 0); transport_pkt *pkts = - (transport_pkt *) pmt_u8vector_writeable_elements(v_packets, psize); + (transport_pkt *) pmt_u8vector_writable_elements(v_packets, psize); for(int n=0; n < n_packets; n++) { @@ -824,7 +824,7 @@ void usrp_server::handle_cmd_to_control_channel( new_packet: // This code needs to become "smart" and only make a new packet when full pmt_t v_packet = pmt_make_u8vector(sizeof(transport_pkt), 0); - transport_pkt *pkt = (transport_pkt *) pmt_u8vector_writeable_elements(v_packet, psize); + transport_pkt *pkt = (transport_pkt *) pmt_u8vector_writable_elements(v_packet, psize); payload_len = 0; pkt->set_header(0, channel, 0, payload_len); @@ -981,7 +981,7 @@ void usrp_server::handle_cmd_to_control_channel( // Get a readable address to the data which also gives us the length size_t data_len; - uint8_t *i2c_data = (uint8_t *) pmt_u8vector_writeable_elements(data, data_len); + uint8_t *i2c_data = (uint8_t *) pmt_u8vector_writable_elements(data, data_len); // Make the USB packet if(!pkt->cs_i2c_write(i2c_addr, i2c_data, data_len)) @@ -1039,7 +1039,7 @@ void usrp_server::handle_cmd_to_control_channel( // Get a readable address to the data which also gives us the length size_t data_len; - uint8_t *spi_data = (uint8_t *) pmt_u8vector_writeable_elements(data, data_len); + uint8_t *spi_data = (uint8_t *) pmt_u8vector_writable_elements(data, data_len); // Make the USB packet if(!pkt->cs_spi_write(enables, format, opt, spi_data, data_len)) @@ -1252,7 +1252,7 @@ usrp_server::handle_response_usrp_read(pmt_t data) } // Extract the packet and return appropriately - transport_pkt *pkt = (transport_pkt *) pmt_u8vector_writeable_elements(v_pkt, n_bytes); + transport_pkt *pkt = (transport_pkt *) pmt_u8vector_writable_elements(v_pkt, n_bytes); // The channel is used to find the port to pass the samples on long channel = pkt->chan(); @@ -1273,7 +1273,7 @@ usrp_server::handle_response_usrp_read(pmt_t data) return; // Don't know where to send the sample... possibility on abrupt close pmt_t v_samples = pmt_make_u8vector(payload_len, 0); - uint8_t *samples = pmt_u8vector_writeable_elements(v_samples, ignore); + uint8_t *samples = pmt_u8vector_writable_elements(v_samples, ignore); memcpy(samples, pkt->payload(), payload_len); @@ -1814,7 +1814,7 @@ usrp_server::set_register(long reg, long val) long payload_len = 0; pmt_t v_packet = pmt_make_u8vector(sizeof(transport_pkt), 0); - transport_pkt *pkt = (transport_pkt *) pmt_u8vector_writeable_elements(v_packet, psize); + transport_pkt *pkt = (transport_pkt *) pmt_u8vector_writable_elements(v_packet, psize); pkt->set_header(0, CONTROL_CHAN, 0, payload_len); pkt->set_timestamp(0xffffffff); @@ -1844,7 +1844,7 @@ usrp_server::read_register(long reg) long payload_len = 0; pmt_t v_packet = pmt_make_u8vector(sizeof(transport_pkt), 0); - transport_pkt *pkt = (transport_pkt *) pmt_u8vector_writeable_elements(v_packet, psize); + transport_pkt *pkt = (transport_pkt *) pmt_u8vector_writable_elements(v_packet, psize); pkt->set_header(0, CONTROL_CHAN, 0, payload_len); pkt->set_timestamp(0xffffffff); diff --git a/usrp/host/lib/inband/usrp_tx.cc b/usrp/host/lib/inband/usrp_tx.cc index da877751..5c0a8c30 100644 --- a/usrp/host/lib/inband/usrp_tx.cc +++ b/usrp/host/lib/inband/usrp_tx.cc @@ -105,7 +105,7 @@ usrp_tx::write(pmt_t data) size_t n_bytes; bool underrun; // this will need to go, as it is taken care of in the packet headers - transport_pkt *pkts = (transport_pkt *) pmt_u8vector_writeable_elements(v_packets, n_bytes); + transport_pkt *pkts = (transport_pkt *) pmt_u8vector_writable_elements(v_packets, n_bytes); int ret = d_utx->write (pkts, n_bytes, &underrun); diff --git a/usrp/host/lib/inband/usrp_tx_stub.cc b/usrp/host/lib/inband/usrp_tx_stub.cc index 6cff3b4e..8d47f815 100644 --- a/usrp/host/lib/inband/usrp_tx_stub.cc +++ b/usrp/host/lib/inband/usrp_tx_stub.cc @@ -95,7 +95,7 @@ usrp_tx_stub::write(pmt_t data) size_t n_bytes; - transport_pkt *pkts = (transport_pkt *) pmt_u8vector_writeable_elements(v_packets, n_bytes); + transport_pkt *pkts = (transport_pkt *) pmt_u8vector_writable_elements(v_packets, n_bytes); long n_packets = static_cast(std::ceil(n_bytes / (double)transport_pkt::max_pkt_size())); // Parse the packets looking for C/S packets and dump them to a disk if @@ -138,7 +138,7 @@ usrp_tx_stub::parse_cs(pmt_t invocation_handle, transport_pkt pkt) pmt_t v_pkt = pmt_make_u8vector(sizeof(transport_pkt), 0); transport_pkt *q_pkt = - (transport_pkt *) pmt_u8vector_writeable_elements(v_pkt, ignore); + (transport_pkt *) pmt_u8vector_writable_elements(v_pkt, ignore); q_pkt->set_header(0, CONTROL_CHAN, 0, 0); q_pkt->set_timestamp(0xffffffff); @@ -261,7 +261,7 @@ usrp_tx_stub::parse_cs(pmt_t invocation_handle, transport_pkt pkt) // Create data to place as a response, filled with 0xff size_t ignore; pmt_t i2c_data = pmt_make_u8vector(i2c_bytes, 0xff); - uint8_t *w_data = (uint8_t *) pmt_u8vector_writeable_elements(i2c_data, ignore); + uint8_t *w_data = (uint8_t *) pmt_u8vector_writable_elements(i2c_data, ignore); // Generate a reply and put it in the queue for the RX stub to read if(!q_pkt->cs_i2c_read_reply(rid, i2c_addr, w_data, i2c_bytes)) @@ -304,7 +304,7 @@ usrp_tx_stub::parse_cs(pmt_t invocation_handle, transport_pkt pkt) // Create data to place as a fake response size_t ignore; pmt_t spi_data = pmt_make_u8vector(n_bytes, 0xff); - uint8_t *w_data = (uint8_t *) pmt_u8vector_writeable_elements(spi_data, ignore); + uint8_t *w_data = (uint8_t *) pmt_u8vector_writable_elements(spi_data, ignore); // Generate a reply and put it in the queue for the RX stub to read if(!q_pkt->cs_spi_read_reply(rid, w_data, n_bytes)) -- 2.30.2