diff options
author | Matt Wilson <msw@redhat.com> | 2000-08-24 01:32:39 +0000 |
---|---|---|
committer | Matt Wilson <msw@redhat.com> | 2000-08-24 01:32:39 +0000 |
commit | 941e36f6d29d33fbac8d925427fcec1ea5464ee7 (patch) | |
tree | 741640930337be5b9515f4affbe42e33fcc7262b /edd | |
parent | e6854befee404e8b99e5f9841ce79df398870e54 (diff) | |
download | anaconda-941e36f6d29d33fbac8d925427fcec1ea5464ee7.tar.gz anaconda-941e36f6d29d33fbac8d925427fcec1ea5464ee7.tar.xz anaconda-941e36f6d29d33fbac8d925427fcec1ea5464ee7.zip |
revert
Diffstat (limited to 'edd')
-rw-r--r-- | edd/Makefile | 2 | ||||
-rw-r--r-- | edd/edd.c | 12 | ||||
-rw-r--r-- | edd/pyedd.c | 17 |
3 files changed, 13 insertions, 18 deletions
diff --git a/edd/Makefile b/edd/Makefile index fdba1ff65..320b99e32 100644 --- a/edd/Makefile +++ b/edd/Makefile @@ -2,7 +2,7 @@ include ../Makefile.inc CFLAGS=-Wall -O -g -fpic -I/usr/include/python1.5# -DDEBUG -#libedd.a(edd.o lrmi.o) +libedd.a(edd.o lrmi.o) TARGETS=eddmodule.so ifeq (.depend,$(wildcard .depend)) @@ -108,6 +108,18 @@ edd_supported(int drive) { struct LRMI_regs regs; + FILE *f = fopen("/proc/cmdline", "r"); + if (f) { + char buf[100]; + fgets(buf, sizeof(buf) - 1, f); + fclose(f); + if (strstr(buf, "lba32")) { + EDDCapability *ec = malloc (sizeof (EDDCapability)); + ec->edd = 1; + return rc; + } + return NULL; + } return NULL; if (edd_lrmi_init() == EDD_ERROR) { diff --git a/edd/pyedd.c b/edd/pyedd.c index eeae3ee46..d98e4932d 100644 --- a/edd/pyedd.c +++ b/edd/pyedd.c @@ -15,9 +15,7 @@ * */ -#if 0 #include "edd.h" -#endif #include <Python.h> @@ -30,20 +28,6 @@ static PyMethodDef edd_module_methods[] = { static PyObject * edd_py_detect (PyObject * s, PyObject * args) { - - FILE *f = fopen("/proc/cmdline", "r"); - if (f) { - char buf[100]; - fgets(buf, sizeof(buf) - 1, f); - fclose(f); - if (strstr(buf, "lba32")) - return Py_BuildValue ("i", 1); - return Py_BuildValue ("i", 0); - } else - return Py_BuildValue ("i", 0); - -#if 0 - /* not reached */ EDDCapability *ec; int device = 0x80; @@ -55,7 +39,6 @@ edd_py_detect (PyObject * s, PyObject * args) { return Py_BuildValue ("i", 1); } return Py_BuildValue ("i", 0); -#endif } void initedd (void) { |