Author: mvidner Date: Fri Jan 13 14:23:44 2012 New Revision: 67187 URL: http://svn.opensuse.org/viewcvs/yast?rev=67187&view=rev Log: Removed dead code from Select, SetItem, S390Dialog. Modified: branches/SuSE-Code-11-SP2-Branch/network/src/lan/hardware.ycp branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp Modified: branches/SuSE-Code-11-SP2-Branch/network/src/lan/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/network/src/lan/hardware.ycp?rev=67187&r1=67186&r2=67187&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/lan/hardware.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/lan/hardware.ycp Fri Jan 13 14:23:44 2012 @@ -602,7 +602,6 @@ /* TextEntry label */ `InputField(`id(`qeth_macaddress), `opt(`hstretch), _("Layer2 &MAC Address"), LanItems::qeth_macaddress), `VSpacing(1), -// `InputField(`id(`qeth_chanids), `opt(`hstretch), _("CHAN IDS"), LanItems::qeth_chanids) `HBox( `InputField(`id(`qeth_chan_read), `opt(`hstretch), _("Read Channel"), chanids_map["read"]:""), `InputField(`id(`qeth_chan_write), `opt(`hstretch), _("Write Channel"), chanids_map["write"]:""), @@ -620,29 +619,6 @@ _("<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured with layer 2 support.</p>"); } -/* - if(LanItems::type == "hsi") { - contents = `HBox( - `HSpacing(6), - `Frame(_("S/390 Device Settings"), `HBox(`HSpacing(2), `VBox( - `VSpacing(1), - `InputField(`id(`qeth_options), `opt(`hstretch), Label::Options (), LanItems::qeth_options), - `VSpacing(1), - `Left(`CheckBox(`id(`ipa_takeover), _("&Enable IPA Takeover"))), - `VSpacing(1), - `Left(`CheckBox(`id(`qeth_layer2), `opt(`notify), _("Enable &Layer 2 Support"))), - `InputField(`id(`qeth_macaddress), `opt(`hstretch), _("Layer2 &MAC Address"), LanItems::qeth_macaddress), - `VSpacing(1) - ), `HSpacing(2))), - `HSpacing(6) - ); - helptext = _("<p>Enter any additional <b>Options</b> for this interface (separated by spaces).</p>") + - _("<p>Select <b>Enable IPA Takeover</b> if IP address takeover should be enabled for this interface.</p>") + - _("<p>Select <b>Enable Layer 2 Support</b> if this card has been configured with layer 2 support.</p>") + - _("<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured with layer 2 support.</p>"); - } -*/ - if(drvtype == "lcs") { list<string> tmp_list=splitstring(LanItems::qeth_chanids, " "); map<string, any> chanids_map = $[ @@ -775,8 +751,7 @@ LanItems::nm_name = "static-iucv-id-" + (string) UI::QueryWidget(`id(`chan_mode), `Value); LanItems::device = "id-" + (string) UI::QueryWidget(`id(`chan_mode), `Value); } -// if (LanItems::type != "hsi") - LanItems::chan_mode = (string) UI::QueryWidget(`id(`chan_mode), `Value); + LanItems::chan_mode = (string) UI::QueryWidget(`id(`chan_mode), `Value); if(LanItems::type == "lcs") LanItems::lcs_timeout = (string) UI::QueryWidget(`id(`lcs_timeout), `Value); Modified: branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp?rev=67187&r1=67186&r2=67187&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp Fri Jan 13 14:23:44 2012 @@ -968,8 +968,6 @@ global define boolean Select(string dev) { y2debug("dev=%1", dev); map devmap = $[]; - /* dev=="" -> Add */ -// if(dev == "") { // defaults for a new device devmap = $[ // for hotplug devices set STARTMODE=hotplug (#132583) @@ -1000,91 +998,31 @@ } type = Items[current, "hwinfo", "type"]:"eth"; -// type = "eth0"; device = NetworkInterfaces::GetFreeDevice(type); - // FIXME: MOD AddModule(type); -// NetworkModules::AddM(); -// nm_name = NetworkModules::GetFreeName("static-"); - // TODO: instead of udev use hwinfo dev_name NetworkInterfaces::Name = GetItemUdev("NAME"); if (size(Items)<current) Items[current] = $["ifcfg":NetworkInterfaces::Name]; else Items[current, "ifcfg"] = NetworkInterfaces::Name; -// interfacename = GetItemUdev()[1]:""; - /* FIXME: alias: how to prefill new alias? */ alias = ""; -// } - /* dev!="" -> Edit */ -/* FIXME: NI: - else { - if(!CheckDevice(dev)) { - y2error("Device not found: %1", dev); - return false; - } - NetworkInterfaces::Edit(dev); - devmap = NetworkInterfaces::Current; - type = NetworkInterfaces::device_type(dev); - device = NetworkInterfaces::device_num(dev); - alias = NetworkInterfaces::alias_num(dev); - } -*/ + /* general stuff */ description = BuildDescription (type, device, devmap, Hardware); SetDeviceVars(devmap, SysconfigDefaults); hotplug = ""; - /* - if(issubstring(device, "bus-pcmcia")) - hotplug = "pcmcia"; - else if(issubstring(device, "bus-usb")) - hotplug = "usb"; - */ - y2debug("type=%1", type); if(issubstring(type, "-")) type = regexpsub(type, "([^-]+)-.*$", "\\1"); y2debug("type=%1", type); - /* kernel options */ -// if(hotplug == "" && alias == "" && nm_name != "") { - // FIXME: MOD SelectModule(dev); -// NetworkModules::SelectM(nm_name); -// } -// else { - // FIXME: MOD SelectModule(""); -// NetworkModules::AddM(); -// } - -// qeth_options = NetworkModules::QETH_OPTIONS; -// chan_mode = NetworkModules::CCW_CHAN_MODE; -// lcs_timeout = NetworkModules::LCS_LANCMD_TIMEOUT; - -/* - if (NetworkModules::QETH_IPA_TAKEOVER == nil || - NetworkModules::QETH_IPA_TAKEOVER == "" || - NetworkModules::QETH_IPA_TAKEOVER == "0") - ipa_takeover = false; - else - ipa_takeover = true; - - if (NetworkModules::QETH_LAYER2_SUPPORT == nil || - NetworkModules::QETH_LAYER2_SUPPORT == "" || - NetworkModules::QETH_LAYER2_SUPPORT == "0") - qeth_layer2 = false; - else - qeth_layer2 = true; -*/ - /* We always have to set the MAC Address for qeth Layer2 support */ if (qeth_layer2 ) { qeth_macaddress = devmap["LLADDR"]:"00:00:00:00:00:00"; } - //if(bootproto == "none") bootproto = "static"; - return true; } @@ -1479,51 +1417,17 @@ if (!hasAnyValue(type)) type = NetworkInterfaces::GetType(getCurrentItem()["ifcfg"]:""); device = getCurrentItem()["ifcfg"]:""; alias = NetworkInterfaces::alias_num(getCurrentItem()["ifcfg"]:""); -// nm_name = Items[current, "hwcfg"]:""; -// if (nm_name=="") nm_name_old = createHwcfgName(Items[current, "hwinfo"]:$[], type); -// NetworkModules::SelectM(nm_name); /* general stuff */ description = BuildDescription (type, device, devmap, Hardware); SetDeviceVars(devmap, SysconfigDefaults); - hotplug = ""; - y2debug("type=%1", type); if(issubstring(type, "-")) type = regexpsub(type, "([^-]+)-.*$", "\\1"); y2debug("type=%1", type); - /* kernel options */ - if(hotplug == "" && alias == "" && nm_name != "") { - // FIXME: MOD SelectModule(dev); -// NetworkModules::SelectM(nm_name); - } - else { - // FIXME: MOD SelectModule(""); -// NetworkModules::AddM(); - } - -/* - qeth_options = NetworkModules::QETH_OPTIONS; - chan_mode = NetworkModules::CCW_CHAN_MODE; - lcs_timeout = NetworkModules::LCS_LANCMD_TIMEOUT; - - if (NetworkModules::QETH_IPA_TAKEOVER == nil || - NetworkModules::QETH_IPA_TAKEOVER == "" || - NetworkModules::QETH_IPA_TAKEOVER == "0") - ipa_takeover = false; - else - ipa_takeover = true; - - if (NetworkModules::QETH_LAYER2_SUPPORT == nil || - NetworkModules::QETH_LAYER2_SUPPORT == "" || - NetworkModules::QETH_LAYER2_SUPPORT == "0") - qeth_layer2 = false; - else - qeth_layer2 = true; -*/ /* We always have to set the MAC Address for qeth Layer2 support */ if (qeth_layer2 ) { qeth_macaddress = devmap["LLADDR"]:"00:00:00:00:00:00"; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org