From 0166ff78f059e4d114ef4328359f0f44fd673c2a Mon Sep 17 00:00:00 2001
From: kos <kos@dev3>
Date: Thu, 25 Aug 2011 20:32:47 +0900
Subject: [PATCH] [FPGAUpgrade] add device

---
 .../Plugins/SystemPlugins/FPGAUpgrade/_fpga.so     | Bin 43782 -> 43782 bytes
 .../Plugins/SystemPlugins/FPGAUpgrade/plugin.py    |  27 +++++++++++++++------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/lib/python/Plugins/SystemPlugins/FPGAUpgrade/_fpga.so b/lib/python/Plugins/SystemPlugins/FPGAUpgrade/_fpga.so
index 0076479c028489066ac066075657f28ad8477886..078852eb4135c1fd07a1b51188b0b9496fe53d48 100644
GIT binary patch
delta 1024
zcmX|=Uu;uV9LLYOy@d`7+`D2{)`oj)OE#fI7Q2ASj5QJhi4P+&aRv-V(O@ERUE644
ztJ~~YjU|`u*9S~y6yif4HafUla*ZU!Xp}!<P>}eCg`y)6-NPP6G85U)?-}Ar&hPU(
zzrW|)bME15+Tm;3<UcJk>E3JErpZa_Y|XCs@`Dw>NE^onK5~4*4hf8auzenV*?Q^8
z_np7?=v~3$%N1*=lnRR-;;Y9rVc0@Qu`}U|=^}0qi7rt}91uh8uLvy>EWS1#5Dni$
z#*lk4azzVG*OU5Gy<K<f3H@~4)=$-=G`*os_R!3RNN79S&KGu8V(mgSE!w_7v7bWL
zUim4#X>D3jJE1KUI_VQ@ldRDN>ybdXf6!Sh?5K>|(Jh8JgB@#$KymP7N<Zr;-&TFv
z2^Q1iXz8G(gO(0jI#GJUjwHhURp%B9Lsd}GOYBQ56rLH6;XF5BSAMtGPHvMm_v7cC
z;ClyGOVNFn`KaPI%pPcb%X}RiJIAcAkzxvrf?uC!PJ?&A9x!-;xffix$Xo?`zGI#O
z4_;#a84Q2Vya;-ry;h3SW#(PrXFnnj^sew5T!ms^MI!jpFU$>a*RRY0Ly9>t36_6j
z?gpzf%q4KFfsKN>o6J|iXMbm&2fO}Y4w_QT&N8RKvD?i1z;k~x_nXp<y?SHSNMqG#
z@7!iwhM32!PAu^q38j0D7uaVSD@}8S+3Yt%y1CA0KCGFRq)29?OwrSsHtEspkVk1G
z6PHPvUe;$aEwJ3p#Mc+TSmFdq>6mJ)!^EycnL7GfWR-UJ#qlN%^;vR^jzBNdDd=JP
zp-<KP8!|<)Y#S=?&c<bw4rMKQfR1E0%eU!s*tgS7*gf*+;&LlJntNOZ=taouG?I(R
zV>AKz9G!=3r(3x;JgC)qmDQP#%QU@^e`}<nyO;B6znpT-ckXKPDR<?&15Mb+2g8=X
zoX3ZziQ#xt4O%UapM=ce5X}t-{gbdv(mnV*XdZmJ^0{5*S*=4Qs^JsHGFAHhwYf}{
ze1F}%Opo?_SdTr3lEM_Nus?{BqFJcR@hDc=9~=KKS49oLTKa#zRyZokJzjCtc{)aa
G3jYf#HCr?Q

delta 1074
zcmX|=U2GIp6oAj2nQgbtT4vhHPP>$ub(ic0YuLsrBrXXth4|2iHo*wN#0Dghgop0#
zY&5Zzwyv~|1EZXp)TAbA(5JTBG7H(@22hEhSW@{5sKg>AHrNMDO2R|g<C$W;$+_S8
zopbKY+`~7d!#AX<<)BEokAs^fQNR}(GYzHefbD~A>S+I`jtpiU@bZHxm+;%hnXNhJ
z?@lQh=zZTdK6trRhrRIqCK*%}K)}AJtVs}wZ-*p&8GRFW#9xB1qMSSKhdH@g{o1`0
zx+(=v<(rk0`M6TZM-?}3Dkt*ml<B;V)9YhmH{Mzw3h8~HI9s^=gPt9BIL_^R`zEU%
znR1}_bF4J>h;z8l*jO?3owU^RBBHTTOyL>hnR*US>U{&wqn<Wf1}W<A9hk%gV_j3L
za@I*GryTC<a9@Y}I^5UczK)J9W=Pz}PP5K`k3bEZ0B*P0yjhI9pS|V;4jp_-K*w34
z5syC*m6+-UqB-W+MIwKVfCAHGp8t`kjk&;lof-Iv$YL&CA{u4x`kAQ6d~1g2ccy-s
zXqj1LM%M_)%@VaUk6+<BX7MT=q)}GPYh1|ex<xe4eC1c7fGS{-nP3k6MzoVTa+_#~
zIX1_GGOasAH<|5!5-l;4cZpO@!2CSX7UtMrL|x2__la_vaKromsQ!4a`dIhkre^-`
z4_HPf%CsO@>8L6CyEN6WX_Z=Sg;wX&>J{y2Sz9Y<h5!tvHi!gnO~rhL=`sO^Gls95
z%WOQ7iikK)r(zBE=`!i;Q&_xZvRq@a@t;(r;hk^F6lH5QTF*Mq3^{x*9jy3>qsxFt
z(~Z7%cJ9OjX+w<Sa5^G#IKg^7&ZJ|)#)rHouqhMcrrR?Sq2qy!A-Zrl^Q^G&B>P+O
zHv0=GtcYmF4c7BQ!QH&y#3NQn8kxnT)>=GgDNP-}l*xMsD-(6p#M}6!-h}66fGFOv
zV&XVfWxWTsWFsPpuV&wNXS3UUqUdVxK9s~ExAMLIDxPV0(D2z=!3Uifj8u)YHlF4G
z8nwYXTpSGe3hXK1V~&+rD{)NmVs3J1UTX0Qy~X!zg<km+TU()5{KT$ZVF^1w%!gOA
u1ZdF6{?#l2wZL}@N*K1^2v7Z2>t*$`cj$k64LDww`-Saz=V>{1UH=y+Ut-Vz

diff --git a/lib/python/Plugins/SystemPlugins/FPGAUpgrade/plugin.py b/lib/python/Plugins/SystemPlugins/FPGAUpgrade/plugin.py
index a5b76b0..7ebadbe 100644
--- a/lib/python/Plugins/SystemPlugins/FPGAUpgrade/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/FPGAUpgrade/plugin.py
@@ -146,13 +146,13 @@ class FPGAUpgrade(Screen):
                 self.STATUS_BAR = self["status"]                                                                             
                 self.STATUS_BAR.setText(_(self.SOURCELIST.getCurrentDirectory()))
 
-		self.DEVICE_PATH = '/dev/misc/dp'                                                                                       
+		self.DEVICE_LIST = '/dev/fpga_dp;/dev/misc/dp;'
 		self.DOWNLOAD_TAR_PATH = '/tmp/'                                                                             
 		self.DOWNLOAD_FILE_NAME = 'TS_PRO.dat'                                                                       
 		self.DOWNLOAD_URL = ''
 		self.doLoadConf()
 		self.FPGA = fpga.Fpga()
-		print self.DEVICE_PATH
+		print self.DEVICE_LIST
 		print self.DOWNLOAD_TAR_PATH
 		print self.DOWNLOAD_FILE_NAME
 		print self.DOWNLOAD_URL
@@ -181,8 +181,6 @@ class FPGAUpgrade(Screen):
 		if confirmed:                                                                                                                    
 			self.doExit()	
 
-
-
 	def doUpgradeHandler(self, confirmed):
 		if confirmed == False:
 			return
@@ -194,14 +192,27 @@ class FPGAUpgrade(Screen):
 			#self.session.open(MessageBox, _("Can't select directory."), MessageBox.TYPE_INFO, timeout = 5)
 			return
 
-		self.ERROR_CODE = self.FPGA.fpga_upgrade(path, self.DEVICE_PATH)
+		device = ""
+		device_list = self.DEVICE_LIST.split(";")
+
+		for d in device_list:
+			if os.path.exists(d):
+				device = d
+				break
+
+		if device == None or len(device) == 0:
+			message = "Fail to upgrade.\nCause : Can't found device.\nDo you want to exit?"
+			self.session.openWithCallback(self.onCallbackHandler, MessageBox, _(message), MessageBox.TYPE_YESNO, timeout = 10, default = True)
+			print "DEVICE_LIST : ", device_list
+
+		print "DEVICE : ", device
+		self.ERROR_CODE = self.FPGA.fpga_upgrade(path, device)
 		if self.ERROR_CODE > 0:
 			self.ERROR_MSG = self.FPGA.get_error_msg(self.ERROR_CODE, self.ERROR_MSG)
 			message = "Fail to upgrade.\nCause : " + self.ERROR_MSG + "\nDo you want to exit?"
 			self.session.openWithCallback(self.onCallbackHandler, MessageBox, _(message), MessageBox.TYPE_YESNO, timeout = 10, default = True)
-
-			print "DEVICE_PATH : ", self.DEVICE_PATH
-			print "FILE_PATH : ", path
+			print "DEVICE : ", device
+			print "FILE : ", path
 		else:
 			#self.session.open(MessageBox, _("Success!!"), MessageBox.TYPE_INFO, timeout = 5)
 			self.session.open(UpgradeStatus, self, timeout = 10)			
-- 
2.7.4