sdr
/
libusrp
mirror of https://gerrit.osmocom.org/libusrp
8
0
Fork 0
Code Releases Activity

Fixed spelling error: s/writeable/writable/g 

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@8727 221aa14e-8319-0410-a670-987f0aec2ac5
This commit is contained in:
eb 2008-06-26 18:17:15 +00:00
parent 720063a4f7
commit e16ac750ba
10 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
host/apps-inband/test_usrp_inband_2tx.cc
View File

@ -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

2
host/apps-inband/test_usrp_inband_timestamps.cc
View File

@ -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

2
host/apps-inband/test_usrp_inband_tx.cc
View File

@ -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

2
host/apps-inband/test_usrp_inband_underrun.cc
View File

@ -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

10
host/lib/inband/usrp_inband_usb_packet.cc
View File

@ -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

2
host/lib/inband/usrp_rx.cc
View File

@ -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);

4
host/lib/inband/usrp_rx_stub.cc
View File

@ -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);

16
host/lib/inband/usrp_server.cc
View File

@ -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);

2
host/lib/inband/usrp_tx.cc
View File

@ -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);

8
host/lib/inband/usrp_tx_stub.cc
View File

@ -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<long>(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))