salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-31 11:17:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Clean up the GreaseWeazle bandwidth tester. Sometimes it doesn't read the right

Browse Source 
amount of data from the device?
This commit is contained in:
David Given
2021-12-14 18:01:53 +00:00
parent 5d3002f118
commit 53c8ec864c
2 changed files with 23 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/usb/greaseweazleusb.cc
View File

@@ -27,6 +27,11 @@ static const char* gw_error(int e)
}
}
static uint32_t ss_rand_next(uint32_t x)
{
return (x&1) ? (x>>1) ^ 0x80000062 : x>>1;
}
class GreaseWeazleUsb : public USB
{
private:
@@ -182,6 +187,7 @@ public:
void testBulkWrite()
{
std::cout << "Writing data: " << std::flush;
const int LEN = 10*1024*1024;
Bytes cmd;
switch (_version)
@@ -211,23 +217,24 @@ public:
do_command(cmd);
Bytes junk(LEN);
uint32_t seed = 0;
for (int i=0; i<LEN; i++)
{
junk[i] = seed;
seed = ss_rand_next(seed);
}
double start_time = getCurrentTime();
_serial->write(junk);
_serial->readBytes(1);
double elapsed_time = getCurrentTime() - start_time;
std::cout << "Transferred "
<< LEN
<< " bytes from PC -> GreaseWeazle in "
<< int(elapsed_time * 1000.0)
<< " ms ("
<< int((LEN / 1024.0) / elapsed_time)
<< " kB/s)"
<< std::endl;
std::cout << fmt::format("transferred {} bytes from PC -> device in {} ms ({} kb/s)\n",
LEN, int(elapsed_time * 1000.0), int((LEN / 1024.0) / elapsed_time));
}
void testBulkRead()
{
std::cout << "Reading data: " << std::flush;
const int LEN = 10*1024*1024;
Bytes cmd;
switch (_version)
@@ -260,14 +267,8 @@ public:
_serial->readBytes(LEN);
double elapsed_time = getCurrentTime() - start_time;
std::cout << "Transferred "
<< LEN
<< " bytes from GreaseWeazle -> PC in "
<< int(elapsed_time * 1000.0)
<< " ms ("
<< int((LEN / 1024.0) / elapsed_time)
<< " kB/s)"
<< std::endl;
std::cout << fmt::format("transferred {} bytes from device -> PC in {} ms ({} kb/s)\n",
LEN, int(elapsed_time * 1000.0), int((LEN / 1024.0) / elapsed_time));
}
Bytes read(int side, bool synced, nanoseconds_t readTime, nanoseconds_t hardSectorThreshold)
@@ -394,4 +395,3 @@ USB* createGreaseWeazleUsb(const std::string& port)
}
// vim: sw=4 ts=4 et

21
lib/usb/serial.cc
View File

@@ -170,22 +170,13 @@ SerialPort::~SerialPort()
void SerialPort::read(uint8_t* buffer, size_t len)
{
while (len > 0)
while (len != 0)
{
if (_readbuffer_ptr < _readbuffer_fill)
{
int buffered = std::min(len, _readbuffer_fill - _readbuffer_ptr);
memcpy(buffer, _readbuffer + _readbuffer_ptr, buffered);
_readbuffer_ptr += buffered;
buffer += buffered;
len -= buffered;
}
if (len == 0)
break;
_readbuffer_fill = this->readImpl(_readbuffer, sizeof(_readbuffer));
_readbuffer_ptr = 0;
//std::cout << "want " << len << " " << std::flush;
size_t rlen = this->readImpl(buffer, len);
//std::cout << "got " << rlen << "\n" << std::flush;
buffer += rlen;
len -= rlen;
}
}