From 2f5300e6a8d41ec45fc38806d61947518ce32663 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 20 Jun 2001 21:15:47 +0000 Subject: revert S390 changes --- fonts/Makefile | 3 --- fonts/fonts-s390 | Bin 5974 -> 0 bytes fonts/fonts-s390x | Bin 5974 -> 0 bytes isys/devnodes.c | 12 ------------ isys/isys.c | 11 ----------- isys/probe.c | 40 ---------------------------------------- isys/probe.h | 1 - isys/smp.c | 28 ---------------------------- iutil.py | 4 ---- loader/Makefile | 10 ---------- loader/loader.c | 6 ------ loader/net.c | 47 ----------------------------------------------- 12 files changed, 162 deletions(-) delete mode 100644 fonts/fonts-s390 delete mode 100644 fonts/fonts-s390x diff --git a/fonts/Makefile b/fonts/Makefile index edce9313c..d4da8d7ca 100644 --- a/fonts/Makefile +++ b/fonts/Makefile @@ -20,6 +20,3 @@ sparc: ia64: ./updfonts ia64 - -s390: - ./updfonts s390 diff --git a/fonts/fonts-s390 b/fonts/fonts-s390 deleted file mode 100644 index 778228c32..000000000 Binary files a/fonts/fonts-s390 and /dev/null differ diff --git a/fonts/fonts-s390x b/fonts/fonts-s390x deleted file mode 100644 index 778228c32..000000000 Binary files a/fonts/fonts-s390x and /dev/null differ diff --git a/isys/devnodes.c b/isys/devnodes.c index 54638964f..624176bf3 100644 --- a/isys/devnodes.c +++ b/isys/devnodes.c @@ -143,18 +143,6 @@ int devMakeInode(char * devName, char * path) { minor = 1; if (devName[3]) minor += devName[3] - '1'; - } else if (!strncmp(devName, "dasd", 4)) { - /* IBM Dasd Drives */ - type = S_IFBLK; - major = 94; - minor = ( devName[4] - 'a' ) * 4; - if (devName[5]) - minor += devName[5] - '0'; - } else if (!strncmp(devName, "mnd", 4)) { - /* IBM MiniDisk Drives */ - type = S_IFBLK; - major = 95; - minor = devName[3] - 'a'; } else if (!strncmp(devName, "rd/", 3)) { /* dac 960 "/rd/c0d0{p1}" */ type = S_IFBLK; diff --git a/isys/isys.c b/isys/isys.c index 3f61b47ea..d61710d17 100644 --- a/isys/isys.c +++ b/isys/isys.c @@ -155,7 +155,6 @@ static void probedListDealloc (probedListObject * o); static PyObject * probedListNet(probedListObject * s, PyObject * args); static PyObject * probedListScsi(probedListObject * s, PyObject * args); static PyObject * probedListIde(probedListObject * s, PyObject * args); -static PyObject * probedListDasd(probedListObject * s, PyObject * args); static int probedListLength(PyObject * o); static PyObject * probedListSubscript(probedListObject * o, int item); @@ -163,7 +162,6 @@ static PyMethodDef probedListObjectMethods[] = { { "updateNet", (PyCFunction) probedListNet, METH_VARARGS, NULL }, { "updateScsi", (PyCFunction) probedListScsi, METH_VARARGS, NULL }, { "updateIde", (PyCFunction) probedListIde, METH_VARARGS, NULL }, - { "updateDasd", (PyCFunction) probedListDasd, METH_VARARGS, NULL }, { NULL }, }; @@ -858,15 +856,6 @@ static PyObject * probedListScsi(probedListObject * o, PyObject * args) { return Py_None; } -static PyObject * probedListDasd(probedListObject * o, PyObject * args) { - if (!PyArg_ParseTuple(args, "")) return NULL; - - kdFindDasdList(&o->list, 0); - - Py_INCREF(Py_None); - return Py_None; -} - int pdc_dev_running_raid(int fd); #ifdef __i386__ diff --git a/isys/probe.c b/isys/probe.c index 800a14ff8..a66956ef6 100644 --- a/isys/probe.c +++ b/isys/probe.c @@ -404,46 +404,6 @@ bye: return val; } -int kdFindDasdList(struct knownDevices * devices, int code) { - /* patch for s390 by Oliver Paukstadt */ - /* based upon code by Erik Tews */ - - FILE * fd; - struct kddevice device; - char line[200]; - char name[10]; - char status[10]; - char model[30]; - - if (access("/proc/dasd/devices", R_OK)) return 0; - /* a system without /proc/dasd/devices is nothing to worry about */ - - fd = fopen ("/proc/dasd/devices", "r"); - if (fd == NULL) return 1; - - /* Every line in this file is a harddisk */ - while ((fgets(line, 190, fd)) != NULL) { - - sscanf(line, "%*X %*[(A-Z)] at (%*d:%*d) is %[a-z0-9]:%s ", name, status); - /* Take every dasd, formated and unformated */ - - if (!deviceKnown(devices, name)) { - snprintf(model, sizeof(model), "IBM DASD (%s)", status); - device.class = CLASS_HD; - device.name = strdup(name); - device.model = strdup(model); - device.code = code; - addDevice(devices, device); - } - } - fclose (fd); - - qsort(devices->known, devices->numKnown, sizeof(*devices->known), - sortDevices); - return 0; - -} - struct knownDevices kdInit(void) { struct knownDevices kd; diff --git a/isys/probe.h b/isys/probe.h index dea610b05..90a4ee4c0 100644 --- a/isys/probe.h +++ b/isys/probe.h @@ -26,7 +26,6 @@ int kdFindIdeList(struct knownDevices * devices, int code); int kdFindFilteredIdeList(struct knownDevices * devices, int code, kdFilterType filter); int kdFindScsiList(struct knownDevices * devices, int code); -int kdFindDasdList(struct knownDevices * devices, int code); void kdFree(struct knownDevices * devices); void kdAddDevice(struct knownDevices * devices, enum deviceClass devClass, char * devName, char * devModel); diff --git a/isys/smp.c b/isys/smp.c index a7e577d65..c7b467b1e 100644 --- a/isys/smp.c +++ b/isys/smp.c @@ -39,30 +39,6 @@ int alphaDetectSMP(void) } #endif /* __alpha__ */ -#if defined (__s390__) || defined (__s390x__) -int s390DetectSMP(void) -{ - int issmp = 0; - FILE *f; - - f = fopen("/proc/cpuinfo", "r"); - if (f) { - char buff[1024]; - - while (fgets (buff, 1024, f) != NULL) { - if (!strncmp (buff, "# processors : ", 18)) { - if (strtoul (buff + 18, NULL, 0) > 1) - issmp = 1; - break; - } - } - fclose(f); - } else - return -1; - - return issmp; -} -#endif /* __s390__ */ #ifdef __sparc__ int sparcDetectSMP(void) @@ -485,10 +461,6 @@ int detectSMP(void) return isSMP = alphaDetectSMP(); #elif __ia64__ return isSMP = 1; -#elif __s390__ - return isSMP = s390DetectSMP(); -#elif __s390x__ - return isSMP = s390DetectSMP(); #else #error unknown architecture #endif diff --git a/iutil.py b/iutil.py index 147f41df5..53566ef52 100644 --- a/iutil.py +++ b/iutil.py @@ -27,10 +27,6 @@ def SetFdDevice(): f.close() elif iutil.getArch() == "alpha": pass - elif iutil.getArch() == "s390": - return - elif iutil.getArch() == "s390x": - return elif iutil.getArch() == "i386" or iutil.getArch() == "ia64": # Look for the first IDE floppy device drives = isys.floppyDriveDict() diff --git a/loader/Makefile b/loader/Makefile index 9b24b3e92..a389fee1f 100644 --- a/loader/Makefile +++ b/loader/Makefile @@ -53,16 +53,6 @@ BINS += loader OBJS += stubs.o endif -ifeq (s390, $(ARCH)) -BINS += loader loader-local -OBJS += stubs.o -endif - -ifeq (s390x, $(ARCH)) -BINS += loader loader-local -OBJS += stubs.o -endif - ifeq (sparc, $(ARCH)) BINS += loader loader-local OBJS += stubs.o diff --git a/loader/loader.c b/loader/loader.c index de1f31812..a3759dc33 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1378,16 +1378,13 @@ static char * doMountImage(char * location, while (step != STEP_DONE) { switch (step) { case STEP_LANG: -#if !defined (__s390__) && !defined (__s390x__) chooseLanguage(lang, flags); -#endif defaultLang = 0; step = STEP_KBD; dir = 1; break; case STEP_KBD: -#if !defined (__s390__) && !defined (__s390x__) rc = chooseKeyboard (keymap, kbdtype, flags); if (rc == LOADER_NOOP) { @@ -1402,12 +1399,9 @@ static char * doMountImage(char * location, step = STEP_LANG; dir = -1; } else { -#endif step = STEP_METHOD; dir = 1; -#if !defined (__s390__) && !defined (__s390x__) } -#endif break; case STEP_METHOD: diff --git a/loader/net.c b/loader/net.c index c147ba00b..d1bdff79b 100644 --- a/loader/net.c +++ b/loader/net.c @@ -296,9 +296,7 @@ int readNetConfig(char * device, struct networkDeviceConfig * cfg, int flags) { struct in_addr addr; char dhcpChoice; char * chptr; - char * env; -#if !defined(__s390__) && !defined(__s390x__) text = newtTextboxReflowed(-1, -1, _("Please enter the IP configuration for this machine. Each " "item should be entered as an IP address in dotted-decimal " @@ -439,49 +437,6 @@ int readNetConfig(char * device, struct networkDeviceConfig * cfg, int flags) { } } while (i != 2); -#else /* s390 now */ - - /* quick and dirty hack by opaukstadt@millenux.com for s390 */ - /* ctc stores remoteip in broadcast-field until pump.h is changed */ - memset(&newCfg, 0, sizeof(newCfg)); - strcpy(newCfg.dev.device, device); - newCfg.isDynamic = 0; - env = getenv("IPADDR"); - if (env) { - inet_aton(env, &newCfg.dev.ip); - newCfg.dev.set |= PUMP_INTFINFO_HAS_IP; - } - env = getenv("NETMASK"); - if (env) { - inet_aton(env, &newCfg.dev.netmask); - newCfg.dev.set |= PUMP_INTFINFO_HAS_NETMASK; - } - env = getenv("GATEWAY"); - if (env) { - inet_aton(env, &newCfg.dev.gateway); - newCfg.dev.set |= PUMP_NETINFO_HAS_GATEWAY; - } - env = getenv("NETWORK"); - if (env) { - inet_aton(env, &newCfg.dev.network); - newCfg.dev.set |= PUMP_INTFINFO_HAS_NETWORK; - } - if (!strncmp(newCfg.dev.device, "ctc", 3)) { - env = getenv("REMIP"); - if (env) { - inet_aton(env, &newCfg.dev.broadcast); - newCfg.dev.set |= PUMP_INTFINFO_HAS_BROADCAST; - } - } else { - env = getenv("BROADCAST"); - if (env) { - inet_aton(env, &newCfg.dev.broadcast); - newCfg.dev.set |= PUMP_INTFINFO_HAS_BROADCAST; - } - } -#endif - - #ifdef __STANDALONE__ if (!newCfg.isDynamic) #endif @@ -504,9 +459,7 @@ int readNetConfig(char * device, struct networkDeviceConfig * cfg, int flags) { } } -#if !defined(__s390__) && !defined(__s390__) newtPopWindow(); -#endif if (!FL_TESTING(flags)) { configureNetwork(cfg); -- cgit