[Uludag-commits] r14621 - in trunk/staj-projeleri/zorg: comar zorg
uludag-commits at pardus.org.tr
uludag-commits at pardus.org.tr
2 Tem 2007 Pzt 12:26:53 EEST
Author: fatih
Date: Mon Jul 2 12:26:53 2007
New Revision: 14621
Added:
trunk/staj-projeleri/zorg/comar/model.xml.patch
Modified:
trunk/staj-projeleri/zorg/comar/xman.py
trunk/staj-projeleri/zorg/zorg/parser.py
Log:
* A patch for model.xml (not ready)
* Check if zorg configuration directory is present
* Some fixes and cleanup
Modified: trunk/staj-projeleri/zorg/comar/xman.py
=================================================================
--- trunk/staj-projeleri/zorg/comar/xman.py (original)
+++ trunk/staj-projeleri/zorg/comar/xman.py Mon Jul 2 12:26:53 2007
@@ -9,7 +9,6 @@
from zorg import modeline
xorg_conf = "/etc/X11/xorg.conf"
-activeCards = "/etc/X11/activeCards"
xorg_off = "/var/run/xorg_off"
xdriverlist = "/usr/lib/X11/xdriverlist"
MonitorsDB = "/usr/lib/X11/MonitorsDB"
@@ -71,14 +70,14 @@
"alps" : alpsOptions}
class Device:
- def __init__(self, vendorId="", deviceId=""):
+ def __init__(self, busId="", vendorId="", deviceId=""):
self.identifier = None
+
+ self.busId = busId
self.vendorId = vendorId
self.deviceId = deviceId
- self.busId = ""
- self.pciId = "%s:%s" % (vendorId, deviceId)
- self.cardId = ""
+ self.cardId = "%s:%s@%s" % (self.vendorId, self.deviceId, self.busId)
self.driver = None
self.vendorName = "Unknown Vendor"
@@ -87,7 +86,6 @@
self.monitors = []
def query(self):
- self.cardId = "%s:%s@%s" % (self.vendorId, self.deviceId, self.busId)
self.vendorName, self.boardName = queryPCI(self.vendorId, self.deviceId)
availableDrivers = listAvailableDrivers()
@@ -162,12 +160,6 @@
i = self.monitor.res.index(self.res)
self.modes = self.monitor.res[i:]
-def saveActiveCard(cards):
- f = file(activeCards, "w")
- for card in cards:
- f.write("%s\n" % card.PciId)
- f.close()
-
def queryTouchpad():
try:
a = file("/proc/bus/input/devices")
@@ -245,8 +237,7 @@
deviceId = lremove(sysValue(sysDir, _dev, "device"), "0x")
busId = tuple(int(x, 16) for x in _dev.replace(".",":").split(":"))[1:4]
- a = Device(vendorId, deviceId)
- a.busId = "PCI:%d:%d:%d" % busId
+ a = Device("PCI:%d:%d:%d" % busId, vendorId, deviceId)
cards.append(a)
#except:
# pass
@@ -433,18 +424,6 @@
return monitors
-
-def getActiveCards():
- if os.path.exists(activeCards):
- cards = []
- lines = file(activeCards,'r').readlines()
- for card in lines:
- pciId, busId = card.rstrip("\n").split("@")
- cards.append((pciId.split(":"), busId))
- return cards
- else:
- return None
-
class XConfig:
def __init__(self):
self._parser = XorgParser()
@@ -728,8 +707,9 @@
sec = card.cardId
zconfig.setSection(sec)
- zconfig.set("pciId", card.pciId)
zconfig.set("busId", card.busId)
+ zconfig.set("vendorId", card.vendorId)
+ zconfig.set("deviceId", card.deviceId)
zconfig.set("vendorName", card.vendorName)
zconfig.set("boardName", card.boardName)
zconfig.set("driver", card.driver)
@@ -789,7 +769,7 @@
safedrv = driver.upper()
dev = Device()
- dev.cardId = "0:0@%s:0:0:0" % safedrv
+ dev.cardId = "%s_CONFIGURED_CARD" % safedrv
dev.boardName = "%s Configured Board" % safedrv
dev.vendorName = "%s Configured Vendor" % safedrv
dev.driver = driver
@@ -826,18 +806,17 @@
if not zconfig.hasOption("cards"):
return ""
- cardNames = zconfig.get("cards").split(",")
+ cardIds = zconfig.get("cards").split(",")
cards = []
- for cardName in cardNames:
- if not zconfig.hasSection(cardName):
+ for cardId in cardIds:
+ if not zconfig.hasSection(cardId):
continue # zorg.conf is broken
- zconfig.setSection(cardName)
- #busId = zconfig.get("busid")
+ zconfig.setSection(cardId)
vendorName = zconfig.get("vendorName")
boardName = zconfig.get("boardName")
- cards.append("%s %s - %s" % (cardName, boardName, vendorName))
+ cards.append("%s %s - %s" % (cardId, boardName, vendorName))
return "\n".join(cards)
@@ -852,7 +831,6 @@
zconfig.setSection(cardId)
info = []
- #info.append("identifier=%s" % zconfig.get("identifier"))
name = "%s - %s" % (zconfig.get("boardName"), zconfig.get("vendorName"))
info.append("name=%s" % name)
@@ -877,13 +855,13 @@
return "\n".join(monitors)
-def monitorInfo(identifier):
+def monitorInfo(monitorId):
zconfig = ZorgConfig()
- if not zconfig.hasSection(identifier):
+ if not zconfig.hasSection(monitorId):
return ""
- zconfig.setSection(identifier)
+ zconfig.setSection(monitorId)
info = []
name = "%s - %s" % (zconfig.get("modelName"), zconfig.get("vendorName"))
info.append("name=%s" % name)
@@ -891,7 +869,7 @@
return "\n".join(info)
-def addMonitor(data):
+def addMonitor(monitorData):
zconfig = ZorgConfig()
numbers = set(atoi(lremove(x, "Monitor")) for x in zconfig.cp.sections() if x.startswith("Monitor"))
@@ -899,7 +877,7 @@
numbers.sort()
number = numbers[0]
- info = dict(x.split("=", 1) for x in data.strip().splitlines())
+ info = dict(x.split("=", 1) for x in monitorData.strip().splitlines())
zconfig.setSection("Monitor%d" % number)
keys = ("modelname", "vendorname", "probed", "eisaid", "digital", \
@@ -971,10 +949,11 @@
return
zconfig.setSection(cardId)
- pciId, busId = cardId.split("@")
- vendorId, deviceId = pciId.split(":")
+ busId = zconfig.get("busId")
+ vendorId = zconfig.get("vendorId")
+ deviceId = zconfig.get("deviceId")
- dev = Device(vendorId, deviceId)
+ dev = Device(busId, vendorId, deviceId)
dev.driver = zconfig.get("driver")
dev.vendorName = zconfig.get("vendorName")
dev.boardName = zconfig.get("boardName")
Modified: trunk/staj-projeleri/zorg/zorg/parser.py
=================================================================
--- trunk/staj-projeleri/zorg/zorg/parser.py (original)
+++ trunk/staj-projeleri/zorg/zorg/parser.py Mon Jul 2 12:26:53 2007
@@ -2,7 +2,8 @@
from ConfigParser import RawConfigParser, ParsingError
-zorg_config = "/var/lib/zorg/config"
+zorgConfigDir = "/var/lib/zorg"
+zorgConfig = "config"
trueList = ("1", "on", "true", "yes", "enable")
falseList = ("0", "off", "false", "no", "disable")
@@ -207,9 +208,16 @@
class ZorgConfig:
def __init__(self):
+ import os
+
+ if not os.path.exists(zorgConfigDir):
+ os.mkdir(zorgConfigDir, 0755)
+
+ self.configFile = os.path.join(zorgConfigDir, zorgConfig)
+
self.cp = RawConfigParser()
try:
- self.cp.read(zorg_config)
+ self.cp.read(self.configFile)
except ParsingError:
pass
@@ -259,6 +267,6 @@
self.cp.set(section, option, value)
def write(self):
- f = file(zorg_config, "w")
+ f = file(self.configFile, "w")
self.cp.write(f)
f.close()
Uludag-commits mesaj listesiyle ilgili
daha fazla bilgi