Menu
▾
▴
[Hackndev-commit] SF.net SVN: hackndev: [950] linux4palm/BFUGarux
|
From: <sle...@us...> - 2007-04-04 22:59:11
|
Revision: 950
http://svn.sourceforge.net/hackndev/?rev=950&view=rev
Author: sleep_walker
Date: 2007-04-04 15:59:08 -0700 (Wed, 04 Apr 2007)
Log Message:
-----------
l4p: kEdAR's changes - added ext2 image source support, fixed typos, updated help
Modified Paths:
--------------
linux4palm/BFUGarux/BFUDefaultSettings.h
linux4palm/BFUGarux/BFULinuxHelper.c
linux4palm/BFUGarux/BFUSettings-alone.c
linux4palm/BFUGarux/BFUSettings.Rsrc
Modified: linux4palm/BFUGarux/BFUDefaultSettings.h
===================================================================
--- linux4palm/BFUGarux/BFUDefaultSettings.h 2007-04-03 21:57:39 UTC (rev 949)
+++ linux4palm/BFUGarux/BFUDefaultSettings.h 2007-04-04 22:59:08 UTC (rev 950)
@@ -36,18 +36,17 @@
#define BFUDefaultMask2 255
#define BFUDefaultMask3 255
-#define BFUDefaultSlientBoot 0
-#define BFUDefaultDebug 1
-#define BFUDefaultCPUspeed 3
-//4 possibilities 2 bits
-#define BFUCPUspeedBits 2
-#define BFUDefaultCardRO 0
#define BFUDefaultKeyboard 1
#define BFUDefaultReflash 0
-#define BFUDefaultRAMdiskSize "20%"
-
#define BFUDefaultFSCK 0
+
+#define BFUDefaultCPUspeed 4
+#define BFUDefaultRAMdiskSize "75%"
+#define BFUDefaultSilentBoot 1
+#define BFUDefaultCardRO 0
#define BFUDefaultCopy2RAM 0
+#define BFUDefaultDebug 0
+#define BFUDefaultLiveChanges 0
#define BFUDelimiter ';'
Modified: linux4palm/BFUGarux/BFULinuxHelper.c
===================================================================
--- linux4palm/BFUGarux/BFULinuxHelper.c 2007-04-03 21:57:39 UTC (rev 949)
+++ linux4palm/BFUGarux/BFULinuxHelper.c 2007-04-04 22:59:08 UTC (rev 950)
@@ -100,8 +100,8 @@
//now it is used just 16 bits number - that is 4 chars in hex
optint = ReadHexa(4,ptr);
//options - do all the magic here
- printf("BFUSource=%d\n",source = (optint & 3));
- optint >>= 2;
+ printf("BFUSource=%d\n",source = (optint & 7));
+ optint >>= 3;
printf("BFUFS=%ld\n",optint & 3);
optint >>= 2;
printf("BFUUseNet=%d\n",useNet = (optint & 1));
@@ -178,6 +178,13 @@
printf("BFUDevice=");
ReadString(&ptr); //partition, to be mounted
break;
+ case 4:
+ //Ext2 image on card partition
+ printf("BFUAddress=");
+ ReadString(&ptr); //Ext2 image, to be mounted
+ printf("BFUDevice=");
+ ReadString(&ptr); //partition, to be mounted
+ break;
}
//RAMdisk size
printf("BFURAMDiskSize=");
Modified: linux4palm/BFUGarux/BFUSettings-alone.c
===================================================================
--- linux4palm/BFUGarux/BFUSettings-alone.c 2007-04-03 21:57:39 UTC (rev 949)
+++ linux4palm/BFUGarux/BFUSettings-alone.c 2007-04-04 22:59:08 UTC (rev 950)
@@ -206,7 +206,8 @@
options |= BFUSettingsValues.net;
options = options << 2;
options |= BFUSettingsValues.fs;
- options = options << 2;
+ options = options << 3;
+//CPUsource has 5 possibilities
options |= BFUSettingsValues.source;
// BFUPrintHex(options,optstr);
// StrPrintF(optstr,"%x",options);
@@ -317,6 +318,13 @@
StrCat(globalSet,BFUSettingsValues.device);
StrCat(globalSet,del);
break;
+ case 4:
+ //Ext2 image on card partition
+ StrCat(globalSet,BFUSettingsValues.address);
+ StrCat(globalSet,del);
+ StrCat(globalSet,BFUSettingsValues.device);
+ StrCat(globalSet,del);
+ break;
}
StrCat(BFUCommandLinePart,globalSet);
@@ -369,8 +377,9 @@
BFUSettingsValues.mask[2] = BFUDefaultMask2;
BFUSettingsValues.mask[3] = BFUDefaultMask3;
- BFUSettingsValues.silentBoot = BFUDefaultSlientBoot;
+ BFUSettingsValues.silentBoot = BFUDefaultSilentBoot;
BFUSettingsValues.debug = BFUDefaultDebug;
+ BFUSettingsValues.live_changes = BFUDefaultLiveChanges;
BFUSettingsValues.CPUspeed = BFUDefaultCPUspeed;
BFUSettingsValues.cardRO = BFUDefaultCardRO;
BFUSettingsValues.keyboard = BFUDefaultKeyboard;
@@ -1182,6 +1191,10 @@
CtlShowControl(getObjectPtr(pForm,BFUFileSystemTrigger));
FldDrawField(getObjectPtr(pForm,BFUDeviceField));
break;
+ case 4:
+ CtlShowControl(getObjectPtr(pForm,BFUFileSystemTrigger));
+ FldDrawField(getObjectPtr(pForm,BFUDeviceField));
+ break;
}
BFUSettingsValues.source = pEvent->data.popSelect.selection;
// handled = true;
Modified: linux4palm/BFUGarux/BFUSettings.Rsrc
===================================================================
--- linux4palm/BFUGarux/BFUSettings.Rsrc 2007-04-03 21:57:39 UTC (rev 949)
+++ linux4palm/BFUGarux/BFUSettings.Rsrc 2007-04-04 22:59:08 UTC (rev 950)
@@ -3,11 +3,11 @@
// --------------- Resources of type 'Talt' ---------------
// --------------- Resources of type 'tFRM' ---------------
FORM ID BFUGlobalForm AT (0 0 160 160)
- FRAME MODAL NOSAVEBEHIND USABLE
- HELPID 8601 DEFAULTBTNID BFUOKButton
+ FRAME MODAL NOSAVEBEHIND USABLE
+ HELPID 8601 DEFAULTBTNID BFUOKButton
BEGIN
TITLE "BFUSettings - Global"
- LIST "Modules on card" "HTTP" "NFS" "Card partition" ID BFUSourceList AT (6 50 70 44) NONUSABLE DISABLED
+ LIST "Modules on card" "HTTP" "NFS" "Card partition" "Ext2 image" ID BFUSourceList AT (6 50 70 55) NONUSABLE DISABLED
POPUPTRIGGER "Source" ID BFUSourceTrigger AT (6 50 82 15) USABLE LEFTANCHOR
POPUPLIST ID BFUSourceTrigger BFUSourceList
LABEL "Source:" ID 8030 AT (9 35) USABLE FONT 1
@@ -29,8 +29,8 @@
END
FORM ID BFUNetForm AT (0 0 160 160)
- FRAME MODAL NOSAVEBEHIND USABLE
- HELPID 8602 DEFAULTBTNID BFUOKButton
+ FRAME MODAL NOSAVEBEHIND USABLE
+ HELPID 8602 DEFAULTBTNID BFUOKButton
BEGIN
TITLE "BFUSettings - Network"
BUTTON "OK" ID BFUOKButton AT (5 140 30 15) USABLE RIGHTANCHOR FRAME
@@ -69,7 +69,7 @@
END
FORM ID BFUModulesForm AT (0 0 160 160)
- FRAME MODAL NOSAVEBEHIND USABLE
+ FRAME MODAL NOSAVEBEHIND USABLE
HELPID 8603 DEFAULTBTNID BFUOKButton
BEGIN
TITLE "BFUSettings - Modules"
@@ -81,14 +81,14 @@
POPUPLIST ID BFUPartTrigger BFUPartList
LABEL "Set:" ID 8035 AT (9 16) USABLE FONT 1
CHECKBOX "To card" ID BFUSave2CardBox AT (74 140 47 15) USABLE LEFTANCHOR GROUP 0
- TABLE ID BFUModulesTable AT (4 46 145 85) ROWS 24 COLUMNS 2 COLUMNWIDTHS 120 15
+ TABLE ID BFUModulesTable AT (4 46 145 85) ROWS 24 COLUMNS 2 COLUMNWIDTHS 120 15
LABEL "modlist:" ID 8210 AT (9 31) USABLE FONT 1
POPUPTRIGGER "Custom" ID BFUModListTrigger AT (52 29 67 15) USABLE LEFTANCHOR
SCROLLBAR ID BFUModScrollBar AT (151 46 7 85) USABLE VALUE 0 MIN 0 MAX 0 PAGESIZE 1
END
FORM ID BFUToolsForm AT (0 0 160 160)
- FRAME MODAL NOSAVEBEHIND USABLE
+ FRAME MODAL NOSAVEBEHIND USABLE
HELPID 8604 DEFAULTBTNID BFUOKButton
BEGIN
TITLE "BFUSettings - Tools"
@@ -108,7 +108,7 @@
FORM ID BFUAdvancedForm AT (0 0 160 160)
- FRAME MODAL NOSAVEBEHIND USABLE
+ FRAME MODAL NOSAVEBEHIND USABLE
HELPID 8605 DEFAULTBTNID BFUOKButton
BEGIN
TITLE "BFUSettings - Advanced"
@@ -143,10 +143,11 @@
"\x09- Modules on card - mount modules located on card\n" \
"\x09- HTTP - get modules from HTTP server and mount them\n" \
"\x09- NFS - mount NFS share as root\n" \
- "\x09- Card partition - mount card partition as root\n\n" \
+ "\x09- Card partition - mount card partition as root\n" \
+ "\x09- Ext2 image - mount Ext2 image from partition\n\n" \
"Address or path:\n" \
- "Here you should enter address of NFS server, path or address of modlist.txt file or path to " \
- "directory on card containing modules.\n\n" \
+ "Here you should enter address of NFS server, path or address of modlist.txt file, " \
+ "path with name of ext2 image or path to directory on card containing modules.\n\n" \
"Device:\n" \
"Here you should specify device which are modules loaded from.\n\n" \
"OK\n" \
@@ -224,7 +225,7 @@
"This window is dedicated to set advanced settings.\n\n" \
"CPU Frequency:\n" \
"You can select CPU speed. Less speed means less battery needs.\n\n" \
- "NOTE: some SD card only work with CPU speed 133. Test it if you see many squashfs errors...\n\n" \
+ "NOTE: some SD card only work with CPU speed '133Mhz' or 'none' (cpufreq disabled).\n\n" \
"RAMdisk size:\n" \
"You can specify MAXIMUM size of RAM will be used for RAMdisk.\n\n" \
"SD/MMC read-only:\n" \
@@ -236,6 +237,9 @@
"This option will switch to shell in some important part of initscript.\n" \
"Usefull for developers.\n" \
"NOTE: need Stowaway compatible keyboard.\n\n" \
+ "Merge live_changes:\n" \
+ "This option will merge live_changes.squashfs with your rootfs.\n" \
+ "NOTE: file is saved from booted linux :)\n\n" \
"OK\n" \
"Prepare settings to be sent and leave BFUSettings\n\n" \
"Save\n" \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
