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

Switch back to C++14; remove use of designated initialisers.

Browse Source
This commit is contained in:
David Given
2021-08-04 21:25:11 +02:00
parent 7be5623952
commit b9623a09d3
5 changed files with 62 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -1,6 +1,6 @@
PACKAGES = zlib sqlite3 libusb-1.0 protobuf
export CFLAGS = -x c++ --std=c++2a -ffunction-sections -fdata-sections
export CFLAGS = -x c++ --std=c++14 -ffunction-sections -fdata-sections
export LDFLAGS = -pthread
export COPTFLAGS = -Os

14
lib/imagereader/diskcopyimagereader.cc
View File

@@ -115,13 +115,13 @@ public:
}
}
image.setGeometry({
.numTracks = numCylinders,
.numSides = numHeads,
.numSectors = 12,
.sectorSize = 512 + 12,
.irregular = true
});
Geometry g;
g.numTracks = numCylinders;
g.numSides = numHeads;
g.numSectors = 12;
g.sectorSize = 512 + 12;
g.irregular = true;
image.setGeometry(g);
return image;
}
};

12
lib/imagereader/imdimagereader.cc
View File

@@ -259,12 +259,12 @@ public:
}
//Write format detected in IMD image to screen to help user set the right write parameters
image.setGeometry({
.numTracks = header.track,
.numSides = header.Head + 1U,
.numSectors = header.numSectors,
.sectorSize = sectorSize
});
Geometry g;
g.numTracks = header.track;
g.numSides = header.Head + 1U;
g.numSectors = header.numSectors;
g.sectorSize = sectorSize;
image.setGeometry(g);
size_t headSize = header.numSectors * sectorSize;
size_t trackSize = headSize * (header.Head + 1);

12
lib/imagereader/nsiimagereader.cc
View File

@@ -97,12 +97,12 @@ public:
}
}
image.setGeometry({
.numTracks = numCylinders,
.numSides = numHeads,
.numSectors = numSectors,
.sectorSize = sectorSize
});
Geometry g;
g.numTracks = numCylinders;
g.numSides = numHeads;
g.numSectors = numSectors;
g.sectorSize = sectorSize;
image.setGeometry(g);
return image;
}
};

78
lib/usb/fluxengineusb.cc
View File

@@ -120,7 +120,9 @@ private:
public:
int getVersion()
{
struct any_frame f = { .f = {.type = F_FRAME_GET_VERSION_CMD, .size = sizeof(f)} };
struct any_frame f;
f.f.type = F_FRAME_GET_VERSION_CMD;
f.f.size = sizeof(f);
usb_cmd_send(&f, f.f.size);
auto r = await_reply<struct version_frame>(F_FRAME_GET_VERSION_REPLY);
return r->version;
@@ -128,29 +130,29 @@ public:
void seek(int track)
{
struct seek_frame f = {
.f = { .type = F_FRAME_SEEK_CMD, .size = sizeof(f) },
.track = (uint8_t) track
};
struct seek_frame f;
f.f.type = F_FRAME_SEEK_CMD;
f.f.size = sizeof(f);
f.track = (uint8_t) track;
usb_cmd_send(&f, f.f.size);
await_reply<struct any_frame>(F_FRAME_SEEK_REPLY);
}
void recalibrate()
{
struct any_frame f = {
.f = { .type = F_FRAME_RECALIBRATE_CMD, .size = sizeof(f) },
};
struct any_frame f;
f.f.type = F_FRAME_RECALIBRATE_CMD;
f.f.size = sizeof(f);
usb_cmd_send(&f, f.f.size);
await_reply<struct any_frame>(F_FRAME_RECALIBRATE_REPLY);
}
nanoseconds_t getRotationalPeriod(int hardSectorCount)
{
struct measurespeed_frame f = {
.f = {.type = F_FRAME_MEASURE_SPEED_CMD, .size = sizeof(f)},
.hard_sector_count = (uint8_t) hardSectorCount,
};
struct measurespeed_frame f;
f.f.type = F_FRAME_MEASURE_SPEED_CMD;
f.f.size = sizeof(f);
f.hard_sector_count = (uint8_t) hardSectorCount;
usb_cmd_send(&f, f.f.size);
auto r = await_reply<struct speed_frame>(F_FRAME_MEASURE_SPEED_REPLY);
@@ -159,7 +161,9 @@ public:
void testBulkWrite()
{
struct any_frame f = { .f = {.type = F_FRAME_BULK_WRITE_TEST_CMD, .size = sizeof(f)} };
struct any_frame f;
f.f.type = F_FRAME_BULK_WRITE_TEST_CMD;
f.f.size = sizeof(f);
usb_cmd_send(&f, f.f.size);
/* These must match the device. */
@@ -198,7 +202,9 @@ public:
void testBulkRead()
{
struct any_frame f = { .f = {.type = F_FRAME_BULK_READ_TEST_CMD, .size = sizeof(f)} };
struct any_frame f;
f.f.type = F_FRAME_BULK_READ_TEST_CMD;
f.f.size = sizeof(f);
usb_cmd_send(&f, f.f.size);
/* These must match the device. */
@@ -234,11 +240,11 @@ public:
Bytes read(int side, bool synced, nanoseconds_t readTime,
nanoseconds_t hardSectorThreshold)
{
struct read_frame f = {
.f = { .type = F_FRAME_READ_CMD, .size = sizeof(f) },
.side = (uint8_t) side,
.synced = (uint8_t) synced,
};
struct read_frame f;
f.f.type = F_FRAME_READ_CMD;
f.f.size = sizeof(f);
f.side = (uint8_t) side;
f.synced = (uint8_t) synced;
f.hardsec_threshold_ms = (hardSectorThreshold + 5e5) / 1e6; /* round to nearest ms */
uint16_t milliseconds = readTime / 1e6;
((uint8_t*)&f.milliseconds)[0] = milliseconds;
@@ -260,10 +266,10 @@ public:
unsigned safelen = bytes.size() & ~(FRAME_SIZE-1);
Bytes safeBytes = bytes.slice(0, safelen);
struct write_frame f = {
.f = { .type = F_FRAME_WRITE_CMD, .size = sizeof(f) },
.side = (uint8_t) side,
};
struct write_frame f;
f.f.type = F_FRAME_WRITE_CMD;
f.f.size = sizeof(f);
f.side = (uint8_t) side;
f.hardsec_threshold_ms = (hardSectorThreshold + 5e5) / 1e6; /* round to nearest ms */
((uint8_t*)&f.bytes_to_write)[0] = safelen;
((uint8_t*)&f.bytes_to_write)[1] = safelen >> 8;
@@ -278,10 +284,10 @@ public:
void erase(int side, nanoseconds_t hardSectorThreshold)
{
struct erase_frame f = {
.f = { .type = F_FRAME_ERASE_CMD, .size = sizeof(f) },
.side = (uint8_t) side,
};
struct erase_frame f;
f.f.type = F_FRAME_ERASE_CMD;
f.f.size = sizeof(f);
f.side = (uint8_t) side;
f.hardsec_threshold_ms = (hardSectorThreshold + 5e5) / 1e6; /* round to nearest ms */
usb_cmd_send(&f, f.f.size);
@@ -290,21 +296,21 @@ public:
void setDrive(int drive, bool high_density, int index_mode)
{
struct set_drive_frame f = {
.f = { .type = F_FRAME_SET_DRIVE_CMD, .size = sizeof(f) },
.drive = (uint8_t) drive,
.high_density = high_density,
.index_mode = (uint8_t) index_mode
};
struct set_drive_frame f;
f.f.type = F_FRAME_SET_DRIVE_CMD;
f.f.size = sizeof(f);
f.drive = (uint8_t) drive;
f.high_density = high_density;
f.index_mode = (uint8_t) index_mode;
usb_cmd_send(&f, f.f.size);
await_reply<struct any_frame>(F_FRAME_SET_DRIVE_REPLY);
}
void measureVoltages(struct voltages_frame* voltages)
{
struct any_frame f = {
{ .type = F_FRAME_MEASURE_VOLTAGES_CMD, .size = sizeof(f) },
};
struct any_frame f;
f.f.type = F_FRAME_MEASURE_VOLTAGES_CMD;
f.f.size = sizeof(f);
usb_cmd_send(&f, f.f.size);
auto convert_voltages_from_usb = [&](const struct voltages& vin, struct voltages& vout)