mirror of https://github.com/opencardev/aasdk
USBDataSink renamed to DataSink
parent
219d8dd525
commit
b8bcf7cbef
|
@ -40,8 +40,8 @@ enum class ErrorCode
|
||||||
USB_LIST_DEVICES = 8,
|
USB_LIST_DEVICES = 8,
|
||||||
USB_OBTAIN_CONFIG_DESCRIPTOR = 9,
|
USB_OBTAIN_CONFIG_DESCRIPTOR = 9,
|
||||||
USB_TRANSFER = 10,
|
USB_TRANSFER = 10,
|
||||||
USB_SINK_COMMIT_OVERFLOW = 11,
|
DATA_SINK_COMMIT_OVERFLOW = 11,
|
||||||
USB_SINK_CONSUME_UNDERFLOW = 12,
|
DATA_SINK_CONSUME_UNDERFLOW = 12,
|
||||||
USB_AOAP_PROTOCOL_VERSION = 13,
|
USB_AOAP_PROTOCOL_VERSION = 13,
|
||||||
USB_EMPTY_DEVICE_LIST = 14,
|
USB_EMPTY_DEVICE_LIST = 14,
|
||||||
USB_AOAP_DEVICE_NOT_FOUND = 15,
|
USB_AOAP_DEVICE_NOT_FOUND = 15,
|
||||||
|
|
|
@ -0,0 +1,51 @@
|
||||||
|
/*
|
||||||
|
* This file is part of aasdk library project.
|
||||||
|
* Copyright (C) 2018 f1x.studio (Michal Szwaj)
|
||||||
|
*
|
||||||
|
* aasdk 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 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
|
||||||
|
* aasdk 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 aasdk. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <limits>
|
||||||
|
#include <boost/circular_buffer.hpp>
|
||||||
|
#include <f1x/aasdk/Common/Data.hpp>
|
||||||
|
|
||||||
|
|
||||||
|
namespace f1x
|
||||||
|
{
|
||||||
|
namespace aasdk
|
||||||
|
{
|
||||||
|
namespace transport
|
||||||
|
{
|
||||||
|
|
||||||
|
class DataSink
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
DataSink();
|
||||||
|
|
||||||
|
common::DataBuffer fill();
|
||||||
|
void commit(common::Data::size_type size);
|
||||||
|
|
||||||
|
common::Data::size_type getAvailableSize();
|
||||||
|
common::Data consume(common::Data::size_type size);
|
||||||
|
|
||||||
|
private:
|
||||||
|
boost::circular_buffer<common::Data::value_type> data_;
|
||||||
|
static constexpr common::Data::size_type cChunkSize = 16384;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -22,7 +22,7 @@
|
||||||
#include <queue>
|
#include <queue>
|
||||||
#include <boost/asio.hpp>
|
#include <boost/asio.hpp>
|
||||||
#include <f1x/aasdk/Transport/ITransport.hpp>
|
#include <f1x/aasdk/Transport/ITransport.hpp>
|
||||||
#include <f1x/aasdk/Transport/USBDataSink.hpp>
|
#include <f1x/aasdk/Transport/DataSink.hpp>
|
||||||
#include <f1x/aasdk/USB/IAOAPDevice.hpp>
|
#include <f1x/aasdk/USB/IAOAPDevice.hpp>
|
||||||
|
|
||||||
namespace f1x
|
namespace f1x
|
||||||
|
@ -54,7 +54,7 @@ private:
|
||||||
void sendHandler(OutTransferQueue::iterator queueElementIter, common::Data::size_type offset, size_t bytesTransferred);
|
void sendHandler(OutTransferQueue::iterator queueElementIter, common::Data::size_type offset, size_t bytesTransferred);
|
||||||
|
|
||||||
usb::IAOAPDevice::Pointer aoapDevice_;
|
usb::IAOAPDevice::Pointer aoapDevice_;
|
||||||
USBDataSink usbReceivedDataSink_;
|
DataSink usbReceivedDataSink_;
|
||||||
|
|
||||||
boost::asio::io_service::strand receiveStrand_;
|
boost::asio::io_service::strand receiveStrand_;
|
||||||
InTransferQueue receiveQueue_;
|
InTransferQueue receiveQueue_;
|
||||||
|
|
|
@ -0,0 +1,74 @@
|
||||||
|
/*
|
||||||
|
* This file is part of aasdk library project.
|
||||||
|
* Copyright (C) 2018 f1x.studio (Michal Szwaj)
|
||||||
|
*
|
||||||
|
* aasdk 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 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
|
||||||
|
* aasdk 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 aasdk. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <cstring>
|
||||||
|
#include <f1x/aasdk/Transport/DataSink.hpp>
|
||||||
|
#include <f1x/aasdk/Error/Error.hpp>
|
||||||
|
|
||||||
|
namespace f1x
|
||||||
|
{
|
||||||
|
namespace aasdk
|
||||||
|
{
|
||||||
|
namespace transport
|
||||||
|
{
|
||||||
|
|
||||||
|
DataSink::DataSink()
|
||||||
|
: data_(common::cStaticDataSize)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
common::DataBuffer DataSink::fill()
|
||||||
|
{
|
||||||
|
const auto offset = data_.size();
|
||||||
|
data_.resize(data_.size() + cChunkSize);
|
||||||
|
|
||||||
|
return common::DataBuffer(&data_[offset], cChunkSize);
|
||||||
|
}
|
||||||
|
|
||||||
|
void DataSink::commit(common::Data::size_type size)
|
||||||
|
{
|
||||||
|
if(size > cChunkSize)
|
||||||
|
{
|
||||||
|
throw error::Error(error::ErrorCode::DATA_SINK_COMMIT_OVERFLOW);
|
||||||
|
}
|
||||||
|
|
||||||
|
data_.resize(data_.size() - (cChunkSize - size));
|
||||||
|
}
|
||||||
|
|
||||||
|
common::Data::size_type DataSink::getAvailableSize()
|
||||||
|
{
|
||||||
|
return data_.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
common::Data DataSink::consume(common::Data::size_type size)
|
||||||
|
{
|
||||||
|
if(size > data_.size())
|
||||||
|
{
|
||||||
|
throw error::Error(error::ErrorCode::DATA_SINK_CONSUME_UNDERFLOW);
|
||||||
|
}
|
||||||
|
|
||||||
|
common::Data data;
|
||||||
|
common::copy(data, common::DataConstBuffer(&data_[0], size));
|
||||||
|
data_.erase(data_.begin(), data_.begin() + size);
|
||||||
|
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue