- Prevent File Service Protocol from being used as configuration device.

DDinghoya · Dec 14, 2019 · 922337a · 922337a
1 parent c21854a
commit 922337a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/cube/swiss/source/config/config.c b/cube/swiss/source/config/config.c
@@ -95,7 +95,7 @@ bool config_set_device() {
 	DEVICEHANDLER_INTERFACE *configDevice = getDeviceByUniqueId(swissSettings.configDeviceId);
 	devices[DEVICE_CONFIG] = NULL;
 	if(configDevice != NULL) {
-		if((configDevice->features & FEAT_WRITE) && (configDevice->test())) {
+		if(configDevice->test()) {
 			deviceHandler_setDeviceAvailable(configDevice, true);
 			devices[DEVICE_CONFIG] = configDevice;
 		}

diff --git a/cube/swiss/source/gui/settings.c b/cube/swiss/source/gui/settings.c
@@ -86,7 +86,7 @@ void refreshSRAM(SwissSettings *settings) {
 	__SYS_UnlockSram(0);
 	sramex = __SYS_LockSramEx();
 	settings->configDeviceId = sramex->__padding0;
-	if(settings->configDeviceId > DEVICE_ID_MAX || !(getDeviceByUniqueId(settings->configDeviceId)->features & FEAT_WRITE)) {
+	if(settings->configDeviceId > DEVICE_ID_MAX || (getDeviceByUniqueId(settings->configDeviceId)->features & (FEAT_WRITE|FEAT_BOOT_DEVICE)) != (FEAT_WRITE|FEAT_BOOT_DEVICE)) {
 		settings->configDeviceId = DEVICE_ID_UNK;
 	}
 	__SYS_UnlockSramEx(0);
@@ -327,7 +327,7 @@ void settings_toggle(int page, int option, int direction, file_handle *file, Con
 				// Set it to the first writable device available
 				if(swissSettings.configDeviceId == DEVICE_ID_UNK) {
 					for(int i = 0; i < MAX_DEVICES; i++) {
-						if(allDevices[i] != NULL && (allDevices[i]->features & FEAT_WRITE)) {
+						if(allDevices[i] != NULL && (allDevices[i]->features & (FEAT_WRITE|FEAT_BOOT_DEVICE)) == (FEAT_WRITE|FEAT_BOOT_DEVICE)) {
 							swissSettings.configDeviceId = allDevices[i]->deviceUniqueId;
 							return;
 						}
@@ -350,7 +350,7 @@ void settings_toggle(int page, int option, int direction, file_handle *file, Con
 						curDevicePos = curDevicePos > 0 ? curDevicePos-1 : 0;
 					}
 					// Go to next writable device
-					while((allDevices[curDevicePos] == NULL) || !(allDevices[curDevicePos]->features & FEAT_WRITE)) {
+					while((allDevices[curDevicePos] == NULL) || (allDevices[curDevicePos]->features & (FEAT_WRITE|FEAT_BOOT_DEVICE)) != (FEAT_WRITE|FEAT_BOOT_DEVICE)) {
 						curDevicePos += direction;
 						if((curDevicePos < 0) || (curDevicePos >= MAX_DEVICES)){
 							curDevicePos = direction > 0 ? 0 : MAX_DEVICES-1;

diff --git a/cube/swiss/source/main.c b/cube/swiss/source/main.c
@@ -209,7 +209,7 @@ int main ()
 	// If there's no default config device, set it to the first writable device available
 	if(swissSettings.configDeviceId == DEVICE_ID_UNK) {
 		for(int i = 0; i < MAX_DEVICES; i++) {
-			if(allDevices[i] != NULL && (allDevices[i]->features & FEAT_WRITE) && deviceHandler_getDeviceAvailable(allDevices[i])) {
+			if(allDevices[i] != NULL && (allDevices[i]->features & (FEAT_WRITE|FEAT_BOOT_DEVICE)) == (FEAT_WRITE|FEAT_BOOT_DEVICE) && deviceHandler_getDeviceAvailable(allDevices[i])) {
 				swissSettings.configDeviceId = allDevices[i]->deviceUniqueId;
 				print_gecko("No default config device found, using [%s]\r\n", allDevices[i]->deviceName);
 				syssramex* sramex = __SYS_LockSramEx();