summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Jones <pjones@redhat.com>2006-02-17 22:14:27 +0000
committerPeter Jones <pjones@redhat.com>2006-02-17 22:14:27 +0000
commit6042eb92a9232c8298783437c9cef66ee423b2a2 (patch)
tree82a2109ce0a9501d3d3947900efcaf18bcc93a0d
parent63cb13ec9b76efb7f8debf9ba7ae509efdc83397 (diff)
downloadanaconda-6042eb92a9232c8298783437c9cef66ee423b2a2.tar.gz
anaconda-6042eb92a9232c8298783437c9cef66ee423b2a2.tar.xz
anaconda-6042eb92a9232c8298783437c9cef66ee423b2a2.zip
- add python bindings for lapic probing
-rw-r--r--isys/Makefile4
-rw-r--r--isys/isys.c9
-rw-r--r--isys/isys.py1
3 files changed, 12 insertions, 2 deletions
diff --git a/isys/Makefile b/isys/Makefile
index f0b536cd0..138f7dfd2 100644
--- a/isys/Makefile
+++ b/isys/Makefile
@@ -1,11 +1,11 @@
include ../Makefile.inc
-CFLAGS = -ffunction-sections -I$(PYTHONINCLUDE) -I.. -Wall -Os -g -DHAVE_NFS -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -Werror
+CFLAGS = -ffunction-sections -I$(PYTHONINCLUDE) -I.. -Wall -Os -g -DHAVE_NFS -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -Werror -Wno-pointer-sign
OBJECTS = nfsmount.o nfsmount_clnt.o nfsmount_xdr.o imount.o getmacaddr.o \
smp.o devnodes.o cpio.o uncpio.o dasd.o \
lang.o isofs.o dns.o linkdetect.o pdc.o hpt.o silraid.o vio.o \
- ethtool.o getipaddr.o wireless.o eddsupport.o
+ ethtool.o getipaddr.o wireless.o eddsupport.o acpi.o
SOBJECTS = $(patsubst %.o,%.lo,$(OBJECTS))
SOURCES = $(patsubst %.o,%.c,$(OBJECTS)) isys.c
LOADLIBES = -lresolv -lpci -lpopt -lpump -lext2fs -lz -lbterm -lbogl -lwlite -lkudzu -lpci -lselinux
diff --git a/isys/isys.c b/isys/isys.c
index 556f32769..17b46f381 100644
--- a/isys/isys.c
+++ b/isys/isys.c
@@ -50,6 +50,7 @@
#include "getmacaddr.h"
#include "wireless.h"
#include "eddsupport.h"
+#include "acpi.h"
#ifndef CDROMEJECT
#define CDROMEJECT 0x5309
@@ -66,6 +67,7 @@ static PyObject * doMknod(PyObject * s, PyObject * args);
static PyObject * smpAvailable(PyObject * s, PyObject * args);
static PyObject * htAvailable(PyObject * s, PyObject * args);
static PyObject * coresPerPackage(PyObject * s, PyObject * args);
+static PyObject * acpiCpusAvailable(PyObject *s, PyObject * args);
static PyObject * summitAvailable(PyObject * s, PyObject * args);
static PyObject * doCheckBoot(PyObject * s, PyObject * args);
static PyObject * doSwapon(PyObject * s, PyObject * args);
@@ -140,6 +142,7 @@ static PyMethodDef isysModuleMethods[] = {
{ "smpavailable", (PyCFunction) smpAvailable, METH_VARARGS, NULL },
{ "htavailable", (PyCFunction) htAvailable, METH_VARARGS, NULL },
{ "coresavailable", (PyCFunction) coresPerPackage, METH_VARARGS, NULL },
+ { "acpicpus", (PyCFunction) acpiCpusAvailable, METH_VARARGS, NULL },
{ "summitavailable", (PyCFunction) summitAvailable, METH_VARARGS, NULL },
{ "umount", (PyCFunction) doUMount, METH_VARARGS, NULL },
{ "confignetdevice", (PyCFunction) doConfigNetDevice, METH_VARARGS, NULL },
@@ -565,6 +568,12 @@ static PyObject * coresPerPackage(PyObject * s, PyObject * args) {
return Py_BuildValue("i", detectCoresPerPackage());
}
+static PyObject * acpiCpusAvailable(PyObject * s, PyObject * args) {
+ if (!PyArg_ParseTuple(args, "")) return NULL;
+
+ return Py_BuildValue("i", detectAcpiCpusAvailable());
+}
+
static PyObject * summitAvailable(PyObject * s, PyObject * args) {
if (!PyArg_ParseTuple(args, "")) return NULL;
diff --git a/isys/isys.py b/isys/isys.py
index a463ae0f3..89d8c21bb 100644
--- a/isys/isys.py
+++ b/isys/isys.py
@@ -222,6 +222,7 @@ def smpAvailable():
htavailable = _isys.htavailable
coresavailable = _isys.coresavailable
+acpicpus = _isys.acpicpus
def summitavailable():
try: