Skip to content

Drivewire only has 4 disk drives #1057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 10, 2025
Merged

Drivewire only has 4 disk drives #1057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions lib/device/drivewire/drivewireFuji.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ bool _validate_host_slot(uint8_t slot, const char *dmsg)

bool _validate_device_slot(uint8_t slot, const char *dmsg)
{
if (slot < MAX_DISK_DEVICES)
if (slot < MAX_DWDISK_DEVICES)
return true;

if (dmsg == NULL)
Expand Down Expand Up @@ -732,7 +732,7 @@ void drivewireFuji::disk_image_umount()
Debug_printf("Fuji cmd: UNMOUNT IMAGE 0x%02X\n", deviceSlot);

// Handle disk slots
if (deviceSlot < MAX_DISK_DEVICES)
if (deviceSlot < MAX_DWDISK_DEVICES)
{
_fnDisks[deviceSlot].disk_dev.unmount();
_fnDisks[deviceSlot].disk_dev.device_active = false;
Expand Down Expand Up @@ -790,7 +790,7 @@ void drivewireFuji::image_rotate()
// This gets called when we're about to shutdown/reboot
void drivewireFuji::shutdown()
{
for (int i = 0; i < MAX_DISK_DEVICES; i++)
for (int i = 0; i < MAX_DWDISK_DEVICES; i++)
_fnDisks[i].disk_dev.unmount();
}

Expand Down Expand Up @@ -1108,7 +1108,7 @@ void drivewireFuji::unmount_host()
unsigned char hostSlot = SYSTEM_BUS.read();

// Unmount any disks associated with host slot
for (int i = 0; i < MAX_DISK_DEVICES; i++)
for (int i = 0; i < MAX_DWDISK_DEVICES; i++)
{
if (_fnDisks[i].host_slot == hostSlot)
{
Expand Down Expand Up @@ -1166,13 +1166,13 @@ void drivewireFuji::read_device_slots()
uint8_t mode;
char filename[MAX_DISPLAY_FILENAME_LEN];
};
disk_slot diskSlots[MAX_DISK_DEVICES];
disk_slot diskSlots[MAX_DWDISK_DEVICES];

int returnsize;
char *filename;

// Load the data from our current device array
for (int i = 0; i < MAX_DISK_DEVICES; i++)
for (int i = 0; i < MAX_DWDISK_DEVICES; i++)
{
diskSlots[i].mode = _fnDisks[i].access_mode;
diskSlots[i].hostSlot = _fnDisks[i].host_slot;
Expand All @@ -1195,7 +1195,7 @@ void drivewireFuji::read_device_slots()
}
}

returnsize = sizeof(disk_slot) * MAX_DISK_DEVICES;
returnsize = sizeof(disk_slot) * MAX_DWDISK_DEVICES;

response.clear();
response.shrink_to_fit();
Expand All @@ -1215,12 +1215,12 @@ void drivewireFuji::write_device_slots()
uint8_t hostSlot;
uint8_t mode;
char filename[MAX_DISPLAY_FILENAME_LEN];
} diskSlots[MAX_DISK_DEVICES];
} diskSlots[MAX_DWDISK_DEVICES];

SYSTEM_BUS.read((uint8_t *)&diskSlots, sizeof(diskSlots));

// Load the data into our current device array
for (int i = 0; i < MAX_DISK_DEVICES; i++)
for (int i = 0; i < MAX_DWDISK_DEVICES; i++)
_fnDisks[i].reset(diskSlots[i].filename, diskSlots[i].hostSlot, diskSlots[i].mode);

// Save the data to disk
Expand All @@ -1239,7 +1239,7 @@ void drivewireFuji::_populate_slots_from_config()
_fnHosts[i].set_hostname(Config.get_host_name(i).c_str());
}

for (int i = 0; i < MAX_DISK_DEVICES; i++)
for (int i = 0; i < MAX_DWDISK_DEVICES; i++)
{
_fnDisks[i].reset();

Expand Down Expand Up @@ -1278,7 +1278,7 @@ void drivewireFuji::_populate_config_from_slots()
}
}

for (int i = 0; i < MAX_DISK_DEVICES; i++)
for (int i = 0; i < MAX_DWDISK_DEVICES; i++)
{
if (_fnDisks[i].host_slot >= MAX_HOSTS || _fnDisks[i].filename[0] == '\0')
Config.clear_mount(i);
Expand All @@ -1304,7 +1304,7 @@ void drivewireFuji::set_device_filename()
Debug_printf("Fuji cmd: SET DEVICE SLOT 0x%02X/%02X/%02X FILENAME: %s\n", slot, host, mode, tmp);

// Handle DISK slots
if (slot < MAX_DISK_DEVICES)
if (slot < MAX_DWDISK_DEVICES)
{
memcpy(_fnDisks[slot].filename, tmp, MAX_FILENAME_LEN);
// If the filename is empty, mark this as an invalid host, so that mounting will ignore it too
Expand Down
4 changes: 3 additions & 1 deletion lib/device/drivewire/drivewireFuji.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#define ESP_OK 0
#endif

#define MAX_DWDISK_DEVICES 4

class drivewireFuji : public virtualDevice
{
private:
Expand All @@ -34,7 +36,7 @@ class drivewireFuji : public virtualDevice

fujiHost _fnHosts[MAX_HOSTS];

fujiDisk _fnDisks[MAX_DISK_DEVICES];
fujiDisk _fnDisks[MAX_DWDISK_DEVICES];

Hash::Algorithm algorithm = Hash::Algorithm::UNKNOWN;

Expand Down
Loading