From: <ow...@us...> - 2007-12-12 08:36:11
|
Revision: 876 http://ipcop.svn.sourceforge.net/ipcop/?rev=876&view=rev Author: owes Date: 2007-12-12 00:36:14 -0800 (Wed, 12 Dec 2007) Log Message: ----------- ATM no need to differentiate between special HW modules. Modified Paths: -------------- ipcop/trunk/src/installer/arch_defs.h ipcop/trunk/src/installer/hardware.c ipcop/trunk/src/installer/partition.c Modified: ipcop/trunk/src/installer/arch_defs.h =================================================================== --- ipcop/trunk/src/installer/arch_defs.h 2007-12-12 08:35:24 UTC (rev 875) +++ ipcop/trunk/src/installer/arch_defs.h 2007-12-12 08:36:14 UTC (rev 876) @@ -73,8 +73,7 @@ cdrom, /* bootable and sources available */ harddisk, /* possible installation target */ network, /* bootable (PXE) and source available (http/ftp server) */ - massstorage = 100, /* for module list only */ - bridgedevice, /* for module list only */ + specialmodule = 100, /* for module list only */ } supported_media_t; Modified: ipcop/trunk/src/installer/hardware.c =================================================================== --- ipcop/trunk/src/installer/hardware.c 2007-12-12 08:35:24 UTC (rev 875) +++ ipcop/trunk/src/installer/hardware.c 2007-12-12 08:36:14 UTC (rev 876) @@ -278,14 +278,14 @@ !strcmp(busclass, "0180") /* Other mass storage controller */ ) ) { - type = massstorage; + type = specialmodule; } else if ( flag_installer && ( ( !strcmp(busclass, "0605") && !nopcmcia) || /* PCMCIA bridge */ ( !strcmp(busclass, "0607") && !nopcmcia) /* Cardbus bridge */ ) ) { - type = bridgedevice; + type = specialmodule; } /* @@ -309,7 +309,7 @@ /* Some special handling for special devices */ - if ( flag_installer && (module != NULL) && ((type == massstorage) || (type == bridgedevice)) ) + if ( flag_installer && (module != NULL) && (type == specialmodule) ) { char command[STRING_SIZE]; @@ -317,7 +317,7 @@ mysystem(command); /* SCSI, go looking for drives */ - if ( (type == massstorage) && !strcmp(busclass, "0100") ) + if ( !strcmp(busclass, "0100") ) { char deviceletter; @@ -341,7 +341,7 @@ } /* IDE, go looking for drives */ - if ( (type == massstorage) && !strcmp(busclass, "0101") ) + if ( !strcmp(busclass, "0101") ) { char deviceletter; @@ -363,7 +363,6 @@ scanprocide(deviceletter, 1); } } - } } } Modified: ipcop/trunk/src/installer/partition.c =================================================================== --- ipcop/trunk/src/installer/partition.c 2007-12-12 08:35:24 UTC (rev 875) +++ ipcop/trunk/src/installer/partition.c 2007-12-12 08:36:14 UTC (rev 876) @@ -621,7 +621,7 @@ /* TODO make sure we do not run out of space (STRING_SIZE_LARGE) */ for (i = 0; i < numhardwares; i++) { - if ( hardwares[i].type == massstorage ) + if ( hardwares[i].type == specialmodule ) { strcat(bigstring, hardwares[i].module); strcat(bigstring, ","); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |