You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(26) |
Sep
(22) |
Oct
(55) |
Nov
(24) |
Dec
(30) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(68) |
Feb
(85) |
Mar
(54) |
Apr
(12) |
May
(52) |
Jun
(75) |
Jul
(116) |
Aug
(71) |
Sep
(54) |
Oct
|
Nov
(2) |
Dec
|
From: <ke...@us...> - 2007-04-12 00:11:25
|
Revision: 955 http://svn.sourceforge.net/hackndev/?rev=955&view=rev Author: keddar Date: 2007-04-11 17:11:22 -0700 (Wed, 11 Apr 2007) Log Message: ----------- l4p: 'Custom' changed to 'All found modules' Modified Paths: -------------- linux4palm/BFUGarux/BFUSettings-alone.c linux4palm/BFUGarux/BFUSettings.Rsrc Modified: linux4palm/BFUGarux/BFUSettings-alone.c =================================================================== --- linux4palm/BFUGarux/BFUSettings-alone.c 2007-04-09 11:49:13 UTC (rev 954) +++ linux4palm/BFUGarux/BFUSettings-alone.c 2007-04-12 00:11:22 UTC (rev 955) @@ -107,8 +107,8 @@ Boolean UseSclBar,CardIn; - + static Boolean BFUCopySettingsStruct(BFUSettingsType *source,BFUSettingsType *dest) { UInt8 i; @@ -211,7 +211,7 @@ options |= BFUSettingsValues.source; // BFUPrintHex(options,optstr); // StrPrintF(optstr,"%x",options); -// BFUdoDie(optstr,options); +// BFUdoDie(optstr,options); // StrPrintF(BFUCommandLinePart,"%x",(UInt16)options); /*now it should look like this bit content @@ -340,7 +340,7 @@ StrPrintF(netSet,"%d",BFUSettingsValues.modlist); StrCat(BFUCommandLinePart,netSet); StrCat(BFUCommandLinePart,del); -// +// #ifdef BFU_VERBOSE BFUdoDie(BFUCommandLinePart,0); #endif @@ -438,7 +438,7 @@ return true; } return false; - + } /* @@ -514,7 +514,7 @@ #endif //file doesn't exists, try another card return false; - break; + break; case dmErrAlreadyExists: //- not possible - RAM is tested first BFUPrefsVolRefNum=volRefNum; @@ -636,7 +636,7 @@ { err = DmGetLastErr(); BFUdoDie("Couldn't create new record.",err); - DmCloseDatabase(db); + DmCloseDatabase(db); return false; } // BFUdoDie("going to lock new handle",0); @@ -646,7 +646,7 @@ err = DmGetLastErr(); BFUdoDie("Couldn't create new record.",err); DmReleaseRecord(db, index, false); - DmCloseDatabase(db); + DmCloseDatabase(db); return false; } // BFUdoDie("going copy settings",0); @@ -658,7 +658,7 @@ // BFUdoDie("going to close dbase",0); DmCloseDatabase(db); // if (BFUPrefsFoundOnCard) -// return +// return if (BFUSettingsValues.save2card) return BFUExportPrefs2Card(); else @@ -685,7 +685,7 @@ case vfsErrDirNotEmpty: BFUdoDie("Directory is not empty (VFSFileDelete). That means something is wrong, I'm not deleting directories...",0); return false; - break; + break; case vfsErrFileStillOpen: BFUdoDie("Old preferences are still opened - shouldn't happen",0); break; @@ -787,12 +787,12 @@ break; case BFUCopy2RAMBox: BFUSettingsValues.copy2ram = CtlGetValue(getObjectPtr(pForm,BFUCopy2RAMBox)); - break; + break; case BFULiveChangesBox: BFUSettingsValues.live_changes = CtlGetValue(getObjectPtr(pForm,BFULiveChangesBox)); break; - + } break; case popSelectEvent: @@ -1233,7 +1233,7 @@ BFUSetFieldText(pForm,BFUPalmIPField2,c,4); StrPrintF(c,"%d",BFUSettingsValues.PalmIP[3]); BFUSetFieldText(pForm,BFUPalmIPField3,c,4); - + StrPrintF(c,"%d",BFUSettingsValues.PCIP[0]); BFUSetFieldText(pForm,BFUPCIPField0,c,4); StrPrintF(c,"%d",BFUSettingsValues.PCIP[1]); @@ -1324,7 +1324,7 @@ { ControlType *pTrigger = getObjectPtr(pForm,idxT); ListType *pList = getObjectPtr(pForm,idxL); -// CtlSetValue(pTrigger, selection); +// CtlSetValue(pTrigger, selection); CtlSetLabel(pTrigger,LstGetSelectionText(pList,selection)); // CtlShowControl(pTrigger); } @@ -1340,7 +1340,7 @@ static void BFUNetFormSaveFields(FormType *pForm) { UInt8 i; - + for (i =0 ; i <4 ; ++i) { BFUSettingsValues.PalmIP[i] = StrAToI(FldGetTextPtr(getObjectPtr(pForm,BFUPalmIPField0+i))); @@ -1394,7 +1394,7 @@ } static void BFUToolsFormSaveFields(FormType *pForm) -{ +{ } static void BFUAdvancedFormSaveFields(FormType *pForm) @@ -1474,7 +1474,7 @@ msize = 1; listHandle = 0; ptrHandle = 0; - modPtrHandle = 0; + modPtrHandle = 0; modListHandle = 0; if (!fileName) @@ -1490,9 +1490,9 @@ return false; } ptr = MemHandleLock(modListHandle); - StrCopy(ptr,"Custom"); - ptr[6]='\0'; - mlength=7;//"Custom" + StrCopy(ptr," All found modules"); + ptr[18]='\0'; + mlength=19;//" All found modules" MemHandleUnlock(modListHandle); @@ -1560,7 +1560,7 @@ // MemHandleUnlock(listHandle); MemHandleUnlock(ptrHandle); } - + ptr = MemHandleLock(modListHandle); if (!ptr) { @@ -1706,7 +1706,7 @@ Char *ptr, name[BFUDefaultFileNameSize]; Err err; int i = StrLen(whole_name)-StrLen("modlist-")-StrLen(".txt"); - + #ifdef MODULES_VERBOSE_DEBUG BFUdoDie("Entering BFUPush2ModList()",0); #endif Modified: linux4palm/BFUGarux/BFUSettings.Rsrc =================================================================== --- linux4palm/BFUGarux/BFUSettings.Rsrc 2007-04-09 11:49:13 UTC (rev 954) +++ linux4palm/BFUGarux/BFUSettings.Rsrc 2007-04-12 00:11:22 UTC (rev 955) @@ -83,7 +83,7 @@ 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 LABEL "modlist:" ID 8210 AT (9 31) USABLE FONT 1 - POPUPTRIGGER "Custom" ID BFUModListTrigger AT (52 29 67 15) USABLE LEFTANCHOR + POPUPTRIGGER " All found modules" 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2007-04-09 11:49:15
|
Revision: 954 http://svn.sourceforge.net/hackndev/?rev=954&view=rev Author: marex_z71 Date: 2007-04-09 04:49:13 -0700 (Mon, 09 Apr 2007) Log Message: ----------- PalmLD: I forgot to remove one ssleep :-/ Modified Paths: -------------- linux4palm/linux/trunk/drivers/usb/gadget/sx2_udc.c Modified: linux4palm/linux/trunk/drivers/usb/gadget/sx2_udc.c =================================================================== --- linux4palm/linux/trunk/drivers/usb/gadget/sx2_udc.c 2007-04-09 10:54:38 UTC (rev 953) +++ linux4palm/linux/trunk/drivers/usb/gadget/sx2_udc.c 2007-04-09 11:49:13 UTC (rev 954) @@ -67,8 +67,6 @@ int sx2_enum(void) { -printk("sx2_mach: %08x\n",sx2_mach.virt_base); -ssleep(10); /* ENUMERATE WITH BUILTIN DESCRIPTOR */ /* select register 0x30 - descriptor RAM*/ sx2_cmd_set_reg(0x30); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2007-04-09 10:54:42
|
Revision: 953 http://svn.sourceforge.net/hackndev/?rev=953&view=rev Author: marex_z71 Date: 2007-04-09 03:54:38 -0700 (Mon, 09 Apr 2007) Log Message: ----------- PalmLD: Switch SX2 to Linux USB Gadget driver API Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c linux4palm/linux/trunk/drivers/usb/gadget/Kconfig linux4palm/linux/trunk/drivers/usb/gadget/Makefile Added Paths: ----------- linux4palm/linux/trunk/drivers/usb/gadget/sx2_udc.c linux4palm/linux/trunk/drivers/usb/gadget/sx2_udc.h linux4palm/linux/trunk/include/asm-arm/arch-pxa/sx2.h Removed Paths: ------------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_usb.c linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-usb2.h Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c 2007-04-06 22:44:13 UTC (rev 952) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c 2007-04-09 10:54:38 UTC (rev 953) @@ -30,6 +30,7 @@ #include <asm/arch/pxa27x_keyboard.h> #include <asm/arch/pxapwm-bl.h> #include <asm/arch/pxa-pm_ll.h> +#include <asm/arch/sx2.h> #include <sound/driver.h> #include <sound/core.h> @@ -163,6 +164,30 @@ .id = -1, }; +/* + * Cypress EZUSB SX2 USB2.0 Controller + */ +static struct sx2_udc_mach_info palmldusb2_platform_data = { + .virt_base = PALMLD_USB_VIRT, + + .ready_pin = GPIO_NR_PALMLD_USB_READY, + .int_pin = 0, // gotta detect it + .reset_pin = GPIO_NR_PALMLD_USB_RESET, + .power_pin = GPIO_NR_PALMLD_USB_POWER, + + .sloe_pin = 0, // gotta detect it + .slrd_pin = 0, // gotta detect it + .slwr_pin = 0, // gotta detect it +}; + +static struct platform_device palmldusb2_device = { + .name = "sx2-udc", + .id = -1, + .dev = { + .platform_data = &palmldusb2_platform_data, + }, +}; + /** * Backlight */ @@ -258,7 +283,7 @@ static struct platform_device *devices[] __initdata = { &palmld_kbd, &palmld_ac97, &palmld_ide, &palmld_backlight, - &palmldled_device, &palmld_pm, + &palmldled_device, &palmldusb2_device, &palmld_pm, }; /********************************************************* Deleted: linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_usb.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_usb.c 2007-04-06 22:44:13 UTC (rev 952) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_usb.c 2007-04-09 10:54:38 UTC (rev 953) @@ -1,310 +0,0 @@ -#include <linux/module.h> -#include <linux/kernel.h> -#include <linux/errno.h> -#include <linux/interrupt.h> -#include <linux/init.h> -#include <linux/device.h> -#include <linux/platform_device.h> -#include <linux/delay.h> - -#include <asm/mach-types.h> -#include <asm/hardware.h> -#include <asm/arch/pxa-regs.h> -#include <asm/irq.h> -#include <asm/arch/palmld-gpio.h> -#include <asm/arch/palmld-usb2.h> - -u16 palmld_usb2_cmd_read(int reg) -{ - u8 data = PALMLD_USB2_CMD_ADDR | PALMLD_USB2_CMD_READ - | (reg & PALMLD_USB2_ADDR_MASK); - PALMLD_USB2_ADDR_CMD = data; - while((GET_PALMLD_GPIO(USB_READY)?1:0)==0) { - }; -/* printk("REG 0x%02x F2 0x%02x F4 0x%02x\n",reg,PALMLD_USB2_ADDR_FIFO2,PALMLD_USB2_ADDR_FIFO4); - printk("REG 0x%02x F2 0x%02x F4 0x%02x\n",reg,PALMLD_USB2_ADDR_FIFO6,PALMLD_USB2_ADDR_FIFO8); - printk("REG 0x%02x CD 0x%02x\n",reg,PALMLD_USB2_ADDR_CMD); -*/ return 0; -} - -int palmld_usb2_cmd_set_reg(int reg) -{ - /* initiate write to addr */ - printk("SETTING 0x%02x\n",(reg | PALMLD_USB2_CMD_ADDR)); - PALMLD_USB2_ADDR_CMD=(reg | PALMLD_USB2_CMD_ADDR); - /* wait for READY line */ - while((GET_PALMLD_GPIO(USB_READY)?1:0)==0) { - }; - return 0; -} - -int palmld_usb2_cmd_write(u8 data) -{ - /* prepare data */ - u8 data1 = ((data & 0xf0)>>4); /* Upper nibble */ - u8 data2 = (data & 0x0f); /* Lower nibble */ - - /* initiate write to reg */ - printk("UPPER NIBBLE %02x\n",(data1 | PALMLD_USB2_CMD_WRITE)); - PALMLD_USB2_ADDR_CMD=(data1 | PALMLD_USB2_CMD_WRITE); - /* wait for READY line */ - while((GET_PALMLD_GPIO(USB_READY)?1:0)==0) { - }; - - printk("LOWER NIBBLE %02x\n",(data2 | PALMLD_USB2_CMD_WRITE)); - PALMLD_USB2_ADDR_CMD=(data2 | PALMLD_USB2_CMD_WRITE); - /* wait for READY line */ - while((GET_PALMLD_GPIO(USB_READY)?1:0)==0) { - }; - - return 0; -} - -u8 palmld_usb2_test_cmd(void) { - /* RESET THE CHIP */ - SET_GPIO(118,0); - udelay(100); - SET_GPIO(118,1); - udelay(500); - - /* ENUMERATE WITH BUILTIN DESCRIPTOR */ - /* select register 0x30 - descriptor RAM*/ - palmld_usb2_cmd_set_reg(0x30); - /* write descriptor length */ - palmld_usb2_cmd_write(0xa0); - palmld_usb2_cmd_write(0x00); - - /* write descriptor as described in SX2 docs */ - /* Device Descriptor */ - palmld_usb2_cmd_write(18); - palmld_usb2_cmd_write(01); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write(02); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write(64); - palmld_usb2_cmd_write(0x12); - palmld_usb2_cmd_write(0x34); - palmld_usb2_cmd_write(0x56); - palmld_usb2_cmd_write(0x78); - palmld_usb2_cmd_write(0xcd); - palmld_usb2_cmd_write(0xab); - palmld_usb2_cmd_write(01); - palmld_usb2_cmd_write(02); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write(01); - /* Device qualifier */ - palmld_usb2_cmd_write(10); - palmld_usb2_cmd_write(06); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write(02); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write(64); - palmld_usb2_cmd_write(01); - palmld_usb2_cmd_write(00); - - /* High Speed Config */ - palmld_usb2_cmd_write(9); - palmld_usb2_cmd_write(02); - palmld_usb2_cmd_write(46); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write(01); - palmld_usb2_cmd_write(01); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write(0x0A); - palmld_usb2_cmd_write(50); - /* Interface descr */ - palmld_usb2_cmd_write(9); - palmld_usb2_cmd_write(04); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write(04); - palmld_usb2_cmd_write(0xFF); - palmld_usb2_cmd_write(0x00); - palmld_usb2_cmd_write(0x00); - palmld_usb2_cmd_write(00); - /* Endpoint descr */ - palmld_usb2_cmd_write(07); - palmld_usb2_cmd_write(05); - palmld_usb2_cmd_write(0x02); - palmld_usb2_cmd_write(02); - palmld_usb2_cmd_write(0x00); - palmld_usb2_cmd_write(0x02); - palmld_usb2_cmd_write(0x00); - /* Endpoint descr */ - palmld_usb2_cmd_write(07); - palmld_usb2_cmd_write(05); - palmld_usb2_cmd_write(0x04); - palmld_usb2_cmd_write(02); - palmld_usb2_cmd_write(0x00); - palmld_usb2_cmd_write(0x02); - palmld_usb2_cmd_write(0x00); - /* Endpoint descr */ - palmld_usb2_cmd_write(07); - palmld_usb2_cmd_write(05); - palmld_usb2_cmd_write(0x86); - palmld_usb2_cmd_write(02); - palmld_usb2_cmd_write(0x00); - palmld_usb2_cmd_write(0x02); - palmld_usb2_cmd_write(0x00); - /* Endpoint descr */ - palmld_usb2_cmd_write(07); - palmld_usb2_cmd_write(05); - palmld_usb2_cmd_write(0x88); - palmld_usb2_cmd_write(02); - palmld_usb2_cmd_write(0x00); - palmld_usb2_cmd_write(0x02); - palmld_usb2_cmd_write(0x00); - - /* Full Speed Config */ - palmld_usb2_cmd_write(9); - palmld_usb2_cmd_write(02); - palmld_usb2_cmd_write(46); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write(01); - palmld_usb2_cmd_write(01); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write(0x0A); - palmld_usb2_cmd_write(50); - /* Interface descr */ - palmld_usb2_cmd_write(9); - palmld_usb2_cmd_write(04); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write(04); - palmld_usb2_cmd_write(0xFF); - palmld_usb2_cmd_write(0x00); - palmld_usb2_cmd_write(0x00); - palmld_usb2_cmd_write(00); - /* Endpoint descr */ - palmld_usb2_cmd_write(07); - palmld_usb2_cmd_write(05); - palmld_usb2_cmd_write(0x02); - palmld_usb2_cmd_write(02); - palmld_usb2_cmd_write(0x40); - palmld_usb2_cmd_write(0x00); - palmld_usb2_cmd_write(0x00); - /* Endpoint descr */ - palmld_usb2_cmd_write(07); - palmld_usb2_cmd_write(05); - palmld_usb2_cmd_write(0x04); - palmld_usb2_cmd_write(02); - palmld_usb2_cmd_write(0x40); - palmld_usb2_cmd_write(0x00); - palmld_usb2_cmd_write(0x00); - /* Endpoint descr */ - palmld_usb2_cmd_write(07); - palmld_usb2_cmd_write(05); - palmld_usb2_cmd_write(0x86); - palmld_usb2_cmd_write(02); - palmld_usb2_cmd_write(0x40); - palmld_usb2_cmd_write(0x00); - palmld_usb2_cmd_write(0x00); - /* Endpoint descr */ - palmld_usb2_cmd_write(07); - palmld_usb2_cmd_write(05); - palmld_usb2_cmd_write(0x88); - palmld_usb2_cmd_write(02); - palmld_usb2_cmd_write(0x40); - palmld_usb2_cmd_write(0x00); - palmld_usb2_cmd_write(0x00); - - /* String descr 0 */ - palmld_usb2_cmd_write(04); - palmld_usb2_cmd_write(03); - palmld_usb2_cmd_write(0x09); - palmld_usb2_cmd_write(0x04); - - /* String descr 1 */ - palmld_usb2_cmd_write(16); - palmld_usb2_cmd_write(03); - palmld_usb2_cmd_write('C'); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write('y'); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write('p'); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write('r'); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write('e'); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write('s'); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write('s'); - palmld_usb2_cmd_write(00); - - /* String descr 1 */ - palmld_usb2_cmd_write(20); - palmld_usb2_cmd_write(3); - palmld_usb2_cmd_write('C'); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write('Y'); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write('7'); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write('C'); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write('6'); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write('8'); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write('0'); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write('0'); - palmld_usb2_cmd_write(00); - palmld_usb2_cmd_write('1'); - palmld_usb2_cmd_write(00); - - - /* A LOT OF DEBUGING CRAP */ -/* printk("GPIO106 %i\n",(GET_GPIO(106)?1:0)); - printk("GPIO106 %i\n",(GET_GPIO(106)?1:0)); - printk("GPIO106 %i\n",(GET_GPIO(106)?1:0)); - printk("GPIO106 %i\n",(GET_GPIO(106)?1:0)); - printk("GPIO106 %i\n",(GET_GPIO(106)?1:0)); - printk("GPIO106 %i\n",(GET_GPIO(106)?1:0)); - printk("GPIO106 %i\n",(GET_GPIO(106)?1:0)); - printk("GPIO106 %i\n",(GET_GPIO(106)?1:0)); - printk("GPIO106 %i\n",(GET_GPIO(106)?1:0)); - printk("GPIO106 %i\n",(GET_GPIO(106)?1:0)); - printk("GPIO106 %i\n",(GET_GPIO(106)?1:0)); -*/ - - for (;;) { - /* printk("%02x%02x|%02x%02x|%02x%02x|%02x%02x|%i|%i|%i|%i|%i|%i\n", - PALMLD_USB2_ADDR_FIFO2,PALMLD_USB2_ADDR_FIFO4, - PALMLD_USB2_ADDR_FIFO6,PALMLD_USB2_ADDR_FIFO8, - PALMLD_USB2_ADDR_CMD,PALMLD_USB2_ADDR_RESERVED1, - PALMLD_USB2_ADDR_RESERVED2,PALMLD_USB2_ADDR_RESERVED3, - (GET_GPIO(18)?1:0),(GET_GPIO(20)?1:0), - (GET_GPIO(53)?1:0),(GET_GPIO(86)?1:0), - (GET_GPIO(90)?1:0),(GET_GPIO(106)?1:0)); - */} - - return 0; -} - -static int __init palmld_usb2_init(void) -{ - printk ("sx2_init()\n"); - - if(!machine_is_xscale_palmld()) return -ENODEV; - - palmld_usb2_test_cmd(); - - return -ENODEV; -} - -static void __exit palmld_usb2_exit(void) -{ -} - -module_init(palmld_usb2_init); -module_exit(palmld_usb2_exit); - -MODULE_AUTHOR ("Marek Vasut <mar...@gm...>"); -MODULE_DESCRIPTION ("USB2 driver for Palm LifeDrive"); -MODULE_LICENSE ("GPL"); Modified: linux4palm/linux/trunk/drivers/usb/gadget/Kconfig =================================================================== --- linux4palm/linux/trunk/drivers/usb/gadget/Kconfig 2007-04-06 22:44:13 UTC (rev 952) +++ linux4palm/linux/trunk/drivers/usb/gadget/Kconfig 2007-04-09 10:54:38 UTC (rev 953) @@ -148,6 +148,19 @@ depends on USB_GADGET_PXA27X default n +config USB_GADGET_SX2 + boolean "Cypress EZUSB SX2" + depends on ARCH_PXA + help + Cypress EZUSB SX2 driver + +config USB_SX2 + tristate + depends on USB_GADGET_SX2 + default USB_GADGET + select USB_GADGET_SELECTED + + config USB_GADGET_GOKU boolean "Toshiba TC86C001 'Goku-S'" depends on PCI Modified: linux4palm/linux/trunk/drivers/usb/gadget/Makefile =================================================================== --- linux4palm/linux/trunk/drivers/usb/gadget/Makefile 2007-04-06 22:44:13 UTC (rev 952) +++ linux4palm/linux/trunk/drivers/usb/gadget/Makefile 2007-04-09 10:54:38 UTC (rev 953) @@ -4,6 +4,7 @@ obj-$(CONFIG_USB_DUMMY_HCD) += dummy_hcd.o obj-$(CONFIG_USB_NET2280) += net2280.o obj-$(CONFIG_USB_PXA2XX) += pxa2xx_udc.o +obj-$(CONFIG_USB_SX2) += sx2_udc.o obj-$(CONFIG_USB_GOKU) += goku_udc.o obj-$(CONFIG_USB_OMAP) += omap_udc.o obj-$(CONFIG_USB_LH7A40X) += lh7a40x_udc.o Added: linux4palm/linux/trunk/drivers/usb/gadget/sx2_udc.c =================================================================== --- linux4palm/linux/trunk/drivers/usb/gadget/sx2_udc.c (rev 0) +++ linux4palm/linux/trunk/drivers/usb/gadget/sx2_udc.c 2007-04-09 10:54:38 UTC (rev 953) @@ -0,0 +1,434 @@ +/* + * linux/drivers/usb/gadget/sx2_udc.c + * Cypress EZUSB SX2 high speed USB device controller + * + * Copyright (C) 2007 Marek Vasut + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/ioport.h> +#include <linux/types.h> +#include <linux/version.h> +#include <linux/errno.h> +#include <linux/delay.h> +#include <linux/sched.h> +#include <linux/slab.h> +#include <linux/init.h> +#include <linux/timer.h> +#include <linux/list.h> +#include <linux/interrupt.h> +#include <linux/proc_fs.h> +#include <linux/mm.h> +#include <linux/platform_device.h> +#include <linux/dma-mapping.h> + +#include <asm/byteorder.h> +#include <asm/dma.h> +#include <asm/io.h> +#include <asm/irq.h> +#include <asm/system.h> +#include <asm/mach-types.h> +#include <asm/unaligned.h> +#include <asm/hardware.h> + +#include <asm/arch/gpio.h> + +#include <linux/usb_ch9.h> +#include <linux/usb_gadget.h> + +#include <asm/arch/sx2.h> +#include <asm/arch/palmld-gpio.h> + +#include "sx2_udc.h" + +struct sx2_udc_mach_info sx2_mach; + +/* + TESTING STUFF + */ +int sx2_cmd_set_reg(int reg); +int sx2_cmd_write(u8 data); + +int sx2_enum(void) +{ +printk("sx2_mach: %08x\n",sx2_mach.virt_base); +ssleep(10); + /* ENUMERATE WITH BUILTIN DESCRIPTOR */ + /* select register 0x30 - descriptor RAM*/ + sx2_cmd_set_reg(0x30); + /* write descriptor length */ + sx2_cmd_write(0xa0); + sx2_cmd_write(0x00); + + /* write descriptor as described in SX2 docs */ + /* Device Descriptor */ + sx2_cmd_write(18); + sx2_cmd_write(01); + sx2_cmd_write(00); + sx2_cmd_write(02); + sx2_cmd_write(00); + sx2_cmd_write(00); + sx2_cmd_write(00); + sx2_cmd_write(64); + sx2_cmd_write(0x25); + sx2_cmd_write(0x05); + sx2_cmd_write(0xab); + sx2_cmd_write(0xcd); + sx2_cmd_write(0x12); + sx2_cmd_write(0x34); + sx2_cmd_write(01); + sx2_cmd_write(02); + sx2_cmd_write(00); + sx2_cmd_write(01); + /* Device qualifier */ + sx2_cmd_write(10); + sx2_cmd_write(06); + sx2_cmd_write(00); + sx2_cmd_write(02); + sx2_cmd_write(00); + sx2_cmd_write(00); + sx2_cmd_write(00); + sx2_cmd_write(64); + sx2_cmd_write(01); + sx2_cmd_write(00); + + /* High Speed Config */ + sx2_cmd_write(9); + sx2_cmd_write(02); + sx2_cmd_write(46); + sx2_cmd_write(00); + sx2_cmd_write(01); + sx2_cmd_write(01); + sx2_cmd_write(00); + sx2_cmd_write(0x0A); + sx2_cmd_write(50); + /* Interface descr */ + sx2_cmd_write(9); + sx2_cmd_write(04); + sx2_cmd_write(00); + sx2_cmd_write(00); + sx2_cmd_write(04); + sx2_cmd_write(0xFF); + sx2_cmd_write(0x00); + sx2_cmd_write(0x00); + sx2_cmd_write(00); + /* Endpoint descr */ + sx2_cmd_write(07); + sx2_cmd_write(05); + sx2_cmd_write(0x02); + sx2_cmd_write(02); + sx2_cmd_write(0x00); + sx2_cmd_write(0x02); + sx2_cmd_write(0x00); + /* Endpoint descr */ + sx2_cmd_write(07); + sx2_cmd_write(05); + sx2_cmd_write(0x04); + sx2_cmd_write(02); + sx2_cmd_write(0x00); + sx2_cmd_write(0x02); + sx2_cmd_write(0x00); + /* Endpoint descr */ + sx2_cmd_write(07); + sx2_cmd_write(05); + sx2_cmd_write(0x86); + sx2_cmd_write(02); + sx2_cmd_write(0x00); + sx2_cmd_write(0x02); + sx2_cmd_write(0x00); + /* Endpoint descr */ + sx2_cmd_write(07); + sx2_cmd_write(05); + sx2_cmd_write(0x88); + sx2_cmd_write(02); + sx2_cmd_write(0x00); + sx2_cmd_write(0x02); + sx2_cmd_write(0x00); + + /* Full Speed Config */ + sx2_cmd_write(9); + sx2_cmd_write(02); + sx2_cmd_write(46); + sx2_cmd_write(00); + sx2_cmd_write(01); + sx2_cmd_write(01); + sx2_cmd_write(00); + sx2_cmd_write(0x0A); + sx2_cmd_write(50); + /* Interface descr */ + sx2_cmd_write(9); + sx2_cmd_write(04); + sx2_cmd_write(00); + sx2_cmd_write(00); + sx2_cmd_write(04); + sx2_cmd_write(0xFF); + sx2_cmd_write(0x00); + sx2_cmd_write(0x00); + sx2_cmd_write(00); + /* Endpoint descr */ + sx2_cmd_write(07); + sx2_cmd_write(05); + sx2_cmd_write(0x02); + sx2_cmd_write(02); + sx2_cmd_write(0x40); + sx2_cmd_write(0x00); + sx2_cmd_write(0x00); + /* Endpoint descr */ + sx2_cmd_write(07); + sx2_cmd_write(05); + sx2_cmd_write(0x04); + sx2_cmd_write(02); + sx2_cmd_write(0x40); + sx2_cmd_write(0x00); + sx2_cmd_write(0x00); + /* Endpoint descr */ + sx2_cmd_write(07); + sx2_cmd_write(05); + sx2_cmd_write(0x86); + sx2_cmd_write(02); + sx2_cmd_write(0x40); + sx2_cmd_write(0x00); + sx2_cmd_write(0x00); + /* Endpoint descr */ + sx2_cmd_write(07); + sx2_cmd_write(05); + sx2_cmd_write(0x88); + sx2_cmd_write(02); + sx2_cmd_write(0x40); + sx2_cmd_write(0x00); + sx2_cmd_write(0x00); + + /* String descr 0 */ + sx2_cmd_write(04); + sx2_cmd_write(03); + sx2_cmd_write(0x09); + sx2_cmd_write(0x04); + + /* String descr 1 */ + sx2_cmd_write(16); + sx2_cmd_write(03); + sx2_cmd_write('C'); + sx2_cmd_write(00); + sx2_cmd_write('y'); + sx2_cmd_write(00); + sx2_cmd_write('p'); + sx2_cmd_write(00); + sx2_cmd_write('r'); + sx2_cmd_write(00); + sx2_cmd_write('e'); + sx2_cmd_write(00); + sx2_cmd_write('s'); + sx2_cmd_write(00); + sx2_cmd_write('s'); + sx2_cmd_write(00); + + /* String descr 2 */ + sx2_cmd_write(20); + sx2_cmd_write(03); + sx2_cmd_write('C'); + sx2_cmd_write(00); + sx2_cmd_write('Y'); + sx2_cmd_write(00); + sx2_cmd_write('7'); + sx2_cmd_write(00); + sx2_cmd_write('C'); + sx2_cmd_write(00); + sx2_cmd_write('6'); + sx2_cmd_write(00); + sx2_cmd_write('8'); + sx2_cmd_write(00); + sx2_cmd_write('0'); + sx2_cmd_write(00); + sx2_cmd_write('0'); + sx2_cmd_write(00); + sx2_cmd_write('1'); + sx2_cmd_write(00); + return 0; +} + +u16 sx2_cmd_read(int reg) +{ + u8 data = SX2_CMD_ADDR | SX2_CMD_READ + | (reg & SX2_ADDR_MASK); + + printk("READING 0x%02x\n",reg); + SX2_ADDR_CMD=data; +// while((gpio_get_value(sx2_udc.mach->ready_pin)?1:0)==0) { + while((GET_PALMLD_GPIO(USB_READY)?1:0)==0) { + printk("WAITING FOR IRQ\n"); + }; + printk("REG 0x%02x F2 0x%02x F4 0x%02x\n",reg,SX2_ADDR_FIFO2,SX2_ADDR_FIFO4); + printk("REG 0x%02x F2 0x%02x F4 0x%02x\n",reg,SX2_ADDR_FIFO6,SX2_ADDR_FIFO8); + printk("REG 0x%02x CD 0x%02x\n",reg,SX2_ADDR_CMD); + return 0; +} + +int sx2_cmd_set_reg(int reg) +{ + /* initiate write to addr */ + printk("SETTING 0x%02x\n",(reg | SX2_CMD_ADDR)); + SX2_ADDR_CMD=(reg | SX2_CMD_ADDR); + /* wait for READY line */ +// while((gpio_get_value(sx2_udc.mach->ready_pin)?1:0)==0) { + while((GET_PALMLD_GPIO(USB_READY)?1:0)==0) { + printk("WAITING FOR IRQ\n"); + }; + + return 0; +} + +int sx2_cmd_write(u8 data) +{ + /* prepare data */ + u8 data1 = ((data & 0xf0)>>4); /* Upper nibble */ + u8 data2 = (data & 0x0f); /* Lower nibble */ + + /* initiate write to reg */ + printk("UPPER NIBBLE %02x\n",(data1 | SX2_CMD_WRITE)); + SX2_ADDR_CMD=(data1 | SX2_CMD_WRITE); + /* wait for READY line */ +// while((gpio_get_value(sx2_udc.mach->ready_pin)?1:0)==0) { + while((GET_PALMLD_GPIO(USB_READY)?1:0)==0) { + printk("WAITING FOR IRQ\n"); + }; + + printk("LOWER NIBBLE %02x\n",(data2 | SX2_CMD_WRITE)); + SX2_ADDR_CMD=(data2 | SX2_CMD_WRITE); + /* wait for READY line */ +// while((gpio_get_value(sx2_udc.mach->ready_pin)?1:0)==0) { + while((GET_PALMLD_GPIO(USB_READY)?1:0)==0) { + printk("WAITING FOR IRQ\n"); + }; + + return 0; +} + + + + + +/* + GADGET LEVEL HANDLING STUFF + */ + +static const char driver_name [] = "sx2_udc"; + +int usb_gadget_register_driver(struct usb_gadget_driver *driver) +{ +printk("SX2: usb_gadget_register_driver\n"); +return 0; +} +EXPORT_SYMBOL(usb_gadget_register_driver); + +int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) +{ +printk("SX2: usb_gadget_unregister_driver\n"); +return 0; +} +EXPORT_SYMBOL(usb_gadget_unregister_driver); + + + + + + + + + +/* + HARDWARE LEVEL HANDLING STUFF + */ +static int sx2_udc_probe(struct platform_device *pdev) +{ + static struct sx2_dev *usb; +/* +INIT THE CONTROLLER - POWER UP ETC +*/ + /* FIXME - this cant be static :-E */ + if(!request_mem_region(SX2_ADDR_BASE, 0x10000, "sx2-udc")) + return -EBUSY; + + usb = kmalloc(sizeof(struct sx2_dev), GFP_KERNEL); + if(!usb) + return -ENOMEM; + + memset(usb, 0,sizeof(struct sx2_dev)); + platform_set_drvdata(pdev, usb); + + usb->dev = &(pdev->dev); + usb->mach = pdev->dev.platform_data; + sx2_mach = *(usb->mach); + +/* Now power down and up the chip */ + gpio_set_value(usb->mach->power_pin,0); + udelay(100); + gpio_set_value(usb->mach->power_pin,1); + udelay(500); + sx2_enum(); + printk("SX2: sx2_udc_probe DONE\n"); + return 0; +} + +static int sx2_udc_remove(struct platform_device *pdev) +{ + platform_set_drvdata(pdev, 0); + +printk("SX2: sx2_udc_remove\n"); + return 0; +} + +/*-------------------------------------------------------------------------*/ + +static struct platform_driver udc_driver = { + .probe = sx2_udc_probe, + .remove = __exit_p(sx2_udc_remove), + .suspend = NULL, + .resume = NULL, + .driver = { + .owner = THIS_MODULE, + .name = "sx2-udc", + }, +}; + +static int __init udc_init(void) +{ + return platform_driver_register(&udc_driver); +} +module_init(udc_init); + +static void __exit udc_exit(void) +{ + platform_driver_unregister(&udc_driver); +} +module_exit(udc_exit); + +MODULE_DESCRIPTION("Cypress EZUSB SX2 Peripheral Controller"); +MODULE_AUTHOR("Marek Vasut"); +MODULE_LICENSE("GPL"); + + + + + + + + + + + Added: linux4palm/linux/trunk/drivers/usb/gadget/sx2_udc.h =================================================================== --- linux4palm/linux/trunk/drivers/usb/gadget/sx2_udc.h (rev 0) +++ linux4palm/linux/trunk/drivers/usb/gadget/sx2_udc.h 2007-04-09 10:54:38 UTC (rev 953) @@ -0,0 +1,170 @@ +/* + * sx2_udc.h + * + * Cypress EZUSB SX2 - CY7C68001 External master register definitions + * + * Author: Marek Vasut <mar...@gm...> + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * + * + */ +#ifndef _INCLUDE_SX2_UDC_H_ + +#define _INCLUDE_SX2_UDC_H_ + +/*************************************************** + * SX2 REGISTERS * + ***************************************************/ + +/* General configuration */ +#define SX2_REG_IFCONFIG 0x01 +#define SX2_REG_FLAGSAB 0x02 +#define SX2_REG_FLAGSCD 0x03 +#define SX2_REG_POLAR 0x04 +#define SX2_REG_REVID 0x05 + +/* Endpoint configuration */ +#define SX2_REG_EP2CFG 0x06 +#define SX2_REG_EP4CFG 0x07 +#define SX2_REG_EP6CFG 0x08 +#define SX2_REG_EP8CFG 0x09 +#define SX2_REG_EP2PKTLENH 0x0A +#define SX2_REG_EP2PKTLENL 0x0B +#define SX2_REG_EP4PKTLENH 0x0C +#define SX2_REG_EP4PKTLENL 0x0D +#define SX2_REG_EP6PKTLENH 0x0E +#define SX2_REG_EP6PKTLENL 0x0F +#define SX2_REG_EP8PKTLENH 0x10 +#define SX2_REG_EP8PKTLENL 0x11 +#define SX2_REG_EP2PFH 0x12 +#define SX2_REG_EP2PFL 0x13 +#define SX2_REG_EP4PFH 0x14 +#define SX2_REG_EP4PFL 0x15 +#define SX2_REG_EP6PFH 0x16 +#define SX2_REG_EP6PFL 0x17 +#define SX2_REG_EP8PFH 0x18 +#define SX2_REG_EP8PFL 0x19 +#define SX2_REG_EP2ISOINPKTS 0x1A +#define SX2_REG_EP4ISOINPKTS 0x1B +#define SX2_REG_EP6ISOINPKTS 0x1C +#define SX2_REG_EP8ISOINPKTS 0x1D + +/* Flags */ +#define SX2_REG_EP24FLAGS 0x1E +#define SX2_REG_EP68FLAGS 0x1F + +/* INPKTEND/FLUSH */ +#define SX2_REG_INPKTEND 0x20 +#define SX2_REG_FLUSH 0x20 + +/* USB Configuration */ +#define SX2_REG_USBFRAMEH 0x2A +#define SX2_REG_USBFRAMEL 0x2B +#define SX2_REG_MICROFRAME 0x2C +#define SX2_REG_FNADDR 0x2D + +/* Interrupts */ +#define SX2_REG_INTENABLE 0x2E + +/* Descriptor */ +#define SX2_REG_DESC 0x30 + +/* Endpoint 0 */ +#define SX2_REG_EP0BUF 0x31 +#define SX2_REG_SETUP 0x32 +#define SX2_REG_EP0BC 0x33 + +/* Un-indexed Register control */ +#define SX2_REG_UIRC0 0x3A +#define SX2_REG_UIRC1 0x3B +#define SX2_REG_UIRC2 0x3C + +/* Un-indexed Registers in XDATA space */ +#define SX2_REG_FIFOPINPOLAR 0xE609 +#define SX2_REG_TOGCTL 0xE683 +#define SX2_REG_CT1 0xE6FB + +/*************************************************** + * SX2 ADDRESS * + ***************************************************/ +#define SX2_ADDR_BASE 0xf0000000 + +#define SX2_ADDR_IF(x) (*((volatile u8 *)x)) + +/* We have 16bit bus of the chip connected to 32 bit bus of CPU */ + +#define SX2_ADDR_FIFO2 SX2_ADDR_IF (SX2_ADDR_BASE + 0x00) +#define SX2_ADDR_FIFO4 SX2_ADDR_IF (SX2_ADDR_BASE + 0x01) +#define SX2_ADDR_FIFO6 SX2_ADDR_IF (SX2_ADDR_BASE + 0x04) +#define SX2_ADDR_FIFO8 SX2_ADDR_IF (SX2_ADDR_BASE + 0x05) +#define SX2_ADDR_CMD SX2_ADDR_IF (SX2_ADDR_BASE + 0x08) +#define SX2_ADDR_RESERVED1 SX2_ADDR_IF (SX2_ADDR_BASE + 0x09) +#define SX2_ADDR_RESERVED2 SX2_ADDR_IF (SX2_ADDR_BASE + 0x0C) +#define SX2_ADDR_RESERVED3 SX2_ADDR_IF (SX2_ADDR_BASE + 0x0D) + +/*************************************************** + * SX2 COMMANDS * + ***************************************************/ + +#define SX2_CMD_WRITE (0x00) +#define SX2_CMD_READ (0x40) +#define SX2_CMD_ADDR (0x80) + +/*************************************************** + * SX2 MISC * + ***************************************************/ + +#define SX2_ADDR_MASK (0x3f) + +struct sx2_dev { + struct device *dev; + struct sx2_udc_mach_info *mach; + spinlock_t lock; + /* + * EP0 write thread. + */ + void (*wrint)(struct sx2_dev *); + struct usb_buf *wrbuf; + unsigned char *wrptr; + unsigned int wrlen; + + /* + * EP0 statistics. + */ + unsigned long ep0_wr_fifo_errs; + unsigned long ep0_wr_bytes; + unsigned long ep0_wr_packets; + unsigned long ep0_rd_fifo_errs; + unsigned long ep0_rd_bytes; + unsigned long ep0_rd_packets; + unsigned long ep0_stall_sent; + unsigned long ep0_early_irqs; + + /* + * EP1 .. n + */ + struct { + unsigned int buflen; + void *pktcpu; + unsigned int pktlen; + unsigned int pktrem; + + void *cb_data; + void (*cb_func)(void *data, int flag, int size); + + u32 udccs; + unsigned int maxpktsize; + unsigned int configured; + unsigned int host_halt; + unsigned long fifo_errs; + unsigned long bytes; + unsigned long packets; + } ep[4]; +}; + +#endif Deleted: linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-usb2.h =================================================================== --- linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-usb2.h 2007-04-06 22:44:13 UTC (rev 952) +++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-usb2.h 2007-04-09 10:54:38 UTC (rev 953) @@ -1,127 +0,0 @@ -/* - * palmld-usb2.h - * - * Cypress EZUSB SX2 - CY7C68001 External master register definitions - * SX2 is an USB2 controller in PalmOne LifeDrive Handheld Computer - * - * Author: Marek Vasut <mar...@gm...> - * - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * - * - */ -#ifndef _INCLUDE_PALMLD_USB2_H_ - -#define _INCLUDE_PALMLD_USB2_H_ - -#include <asm/arch/palmld-gpio.h> - -/*************************************************** - * SX2 REGISTERS * - ***************************************************/ - -/* General configuration */ -#define PALMLD_USB2_REG_IFCONFIG 0x01 -#define PALMLD_USB2_REG_FLAGSAB 0x02 -#define PALMLD_USB2_REG_FLAGSCD 0x03 -#define PALMLD_USB2_REG_POLAR 0x04 -#define PALMLD_USB2_REG_REVID 0x05 - -/* Endpoint configuration */ -#define PALMLD_USB2_REG_EP2CFG 0x06 -#define PALMLD_USB2_REG_EP4CFG 0x07 -#define PALMLD_USB2_REG_EP6CFG 0x08 -#define PALMLD_USB2_REG_EP8CFG 0x09 -#define PALMLD_USB2_REG_EP2PKTLENH 0x0A -#define PALMLD_USB2_REG_EP2PKTLENL 0x0B -#define PALMLD_USB2_REG_EP4PKTLENH 0x0C -#define PALMLD_USB2_REG_EP4PKTLENL 0x0D -#define PALMLD_USB2_REG_EP6PKTLENH 0x0E -#define PALMLD_USB2_REG_EP6PKTLENL 0x0F -#define PALMLD_USB2_REG_EP8PKTLENH 0x10 -#define PALMLD_USB2_REG_EP8PKTLENL 0x11 -#define PALMLD_USB2_REG_EP2PFH 0x12 -#define PALMLD_USB2_REG_EP2PFL 0x13 -#define PALMLD_USB2_REG_EP4PFH 0x14 -#define PALMLD_USB2_REG_EP4PFL 0x15 -#define PALMLD_USB2_REG_EP6PFH 0x16 -#define PALMLD_USB2_REG_EP6PFL 0x17 -#define PALMLD_USB2_REG_EP8PFH 0x18 -#define PALMLD_USB2_REG_EP8PFL 0x19 -#define PALMLD_USB2_REG_EP2ISOINPKTS 0x1A -#define PALMLD_USB2_REG_EP4ISOINPKTS 0x1B -#define PALMLD_USB2_REG_EP6ISOINPKTS 0x1C -#define PALMLD_USB2_REG_EP8ISOINPKTS 0x1D - -/* Flags */ -#define PALMLD_USB2_REG_EP24FLAGS 0x1E -#define PALMLD_USB2_REG_EP68FLAGS 0x1F - -/* INPKTEND/FLUSH */ -#define PALMLD_USB2_REG_INPKTEND 0x20 -#define PALMLD_USB2_REG_FLUSH 0x20 - -/* USB Configuration */ -#define PALMLD_USB2_REG_USBFRAMEH 0x2A -#define PALMLD_USB2_REG_USBFRAMEL 0x2B -#define PALMLD_USB2_REG_MICROFRAME 0x2C -#define PALMLD_USB2_REG_FNADDR 0x2D - -/* Interrupts */ -#define PALMLD_USB2_REG_INTENABLE 0x2E - -/* Descriptor */ -#define PALMLD_USB2_REG_DESC 0x30 - -/* Endpoint 0 */ -#define PALMLD_USB2_REG_EP0BUF 0x31 -#define PALMLD_USB2_REG_SETUP 0x32 -#define PALMLD_USB2_REG_EP0BC 0x33 - -/* Un-indexed Register control */ -#define PALMLD_USB2_REG_UIRC0 0x3A -#define PALMLD_USB2_REG_UIRC1 0x3B -#define PALMLD_USB2_REG_UIRC2 0x3C - -/* Un-indexed Registers in XDATA space */ -#define PALMLD_USB2_REG_FIFOPINPOLAR 0xE609 -#define PALMLD_USB2_REG_TOGCTL 0xE683 - -/*************************************************** - * SX2 ADDRESS * - ***************************************************/ - -#define PALMLD_USB2_ADDR_BASE PALMLD_USB_VIRT - -#define PALMLD_USB2_ADDR_IF(x) (*((volatile u8 *)x)) - -/* We have 16bit bus of the chip connected to 32 bit bus of CPU */ - -#define PALMLD_USB2_ADDR_FIFO2 PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0x0) -#define PALMLD_USB2_ADDR_FIFO4 PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0x1) -#define PALMLD_USB2_ADDR_FIFO6 PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0x4) -#define PALMLD_USB2_ADDR_FIFO8 PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0x5) -#define PALMLD_USB2_ADDR_CMD PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0x8) -#define PALMLD_USB2_ADDR_RESERVED1 PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0x9) -#define PALMLD_USB2_ADDR_RESERVED2 PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0xc) -#define PALMLD_USB2_ADDR_RESERVED3 PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0xd) - -/*************************************************** - * SX2 COMMANDS * - ***************************************************/ - -#define PALMLD_USB2_CMD_WRITE (0x00) -#define PALMLD_USB2_CMD_READ (0x40) -#define PALMLD_USB2_CMD_ADDR (0x80) - -/*************************************************** - * SX2 MISC * - ***************************************************/ - -#define PALMLD_USB2_ADDR_MASK (0x3f) - -#endif Added: linux4palm/linux/trunk/include/asm-arm/arch-pxa/sx2.h =================================================================== --- linux4palm/linux/trunk/include/asm-arm/arch-pxa/sx2.h (rev 0) +++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/sx2.h 2007-04-09 10:54:38 UTC (rev 953) @@ -0,0 +1,21 @@ +/* + * linux/include/asm-arm/arch-pxa/sx2.h + * + * This supports machine-specific differences in how the Cypress SX2 + * USB Device Controller (UDC) is wired. + * + */ + +struct sx2_udc_mach_info { + u32 virt_base; + + int ready_pin; + int int_pin; + int reset_pin; + int power_pin; + + int sloe_pin; + int slrd_pin; + int slwr_pin; +}; + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2007-04-06 22:44:20
|
Revision: 952 http://svn.sourceforge.net/hackndev/?rev=952&view=rev Author: marex_z71 Date: 2007-04-06 15:44:13 -0700 (Fri, 06 Apr 2007) Log Message: ----------- PalmLD: Fix WRITE function, add example of standard enumeration with master supplied descriptor Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_usb.c Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_usb.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_usb.c 2007-04-06 20:20:59 UTC (rev 951) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_usb.c 2007-04-06 22:44:13 UTC (rev 952) @@ -41,7 +41,7 @@ int palmld_usb2_cmd_write(u8 data) { /* prepare data */ - u8 data1 = ((data & 0xf0)>>3); /* Upper nibble */ + u8 data1 = ((data & 0xf0)>>4); /* Upper nibble */ u8 data2 = (data & 0x0f); /* Lower nibble */ /* initiate write to reg */ @@ -70,31 +70,195 @@ /* ENUMERATE WITH BUILTIN DESCRIPTOR */ /* select register 0x30 - descriptor RAM*/ palmld_usb2_cmd_set_reg(0x30); - printk("SET ADDR to 0x30,GPIO86 %i\n",(GET_GPIO(86)?1:0)); /* write descriptor length */ - palmld_usb2_cmd_write(0x06); + palmld_usb2_cmd_write(0xa0); palmld_usb2_cmd_write(0x00); - printk("WRITE DESR size to 0x30,GPIO86 %i\n",(GET_GPIO(86)?1:0)); /* write descriptor as described in SX2 docs */ - palmld_usb2_cmd_write(0x04); - palmld_usb2_cmd_write(0x0B); + /* Device Descriptor */ + palmld_usb2_cmd_write(18); + palmld_usb2_cmd_write(01); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write(02); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write(64); + palmld_usb2_cmd_write(0x12); + palmld_usb2_cmd_write(0x34); + palmld_usb2_cmd_write(0x56); + palmld_usb2_cmd_write(0x78); + palmld_usb2_cmd_write(0xcd); + palmld_usb2_cmd_write(0xab); + palmld_usb2_cmd_write(01); + palmld_usb2_cmd_write(02); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write(01); + /* Device qualifier */ + palmld_usb2_cmd_write(10); + palmld_usb2_cmd_write(06); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write(02); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write(64); + palmld_usb2_cmd_write(01); + palmld_usb2_cmd_write(00); + /* High Speed Config */ + palmld_usb2_cmd_write(9); + palmld_usb2_cmd_write(02); + palmld_usb2_cmd_write(46); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write(01); + palmld_usb2_cmd_write(01); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write(0x0A); + palmld_usb2_cmd_write(50); + /* Interface descr */ + palmld_usb2_cmd_write(9); + palmld_usb2_cmd_write(04); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write(04); + palmld_usb2_cmd_write(0xFF); + palmld_usb2_cmd_write(0x00); + palmld_usb2_cmd_write(0x00); + palmld_usb2_cmd_write(00); + /* Endpoint descr */ + palmld_usb2_cmd_write(07); + palmld_usb2_cmd_write(05); + palmld_usb2_cmd_write(0x02); + palmld_usb2_cmd_write(02); + palmld_usb2_cmd_write(0x00); + palmld_usb2_cmd_write(0x02); + palmld_usb2_cmd_write(0x00); + /* Endpoint descr */ + palmld_usb2_cmd_write(07); + palmld_usb2_cmd_write(05); palmld_usb2_cmd_write(0x04); + palmld_usb2_cmd_write(02); palmld_usb2_cmd_write(0x00); - palmld_usb2_cmd_write(0x02); palmld_usb2_cmd_write(0x00); - + /* Endpoint descr */ + palmld_usb2_cmd_write(07); + palmld_usb2_cmd_write(05); + palmld_usb2_cmd_write(0x86); + palmld_usb2_cmd_write(02); palmld_usb2_cmd_write(0x00); - palmld_usb2_cmd_write(0x01); - - palmld_usb2_cmd_write(0x01); + palmld_usb2_cmd_write(0x02); palmld_usb2_cmd_write(0x00); - + /* Endpoint descr */ + palmld_usb2_cmd_write(07); + palmld_usb2_cmd_write(05); + palmld_usb2_cmd_write(0x88); + palmld_usb2_cmd_write(02); palmld_usb2_cmd_write(0x00); + palmld_usb2_cmd_write(0x02); palmld_usb2_cmd_write(0x00); + + /* Full Speed Config */ + palmld_usb2_cmd_write(9); + palmld_usb2_cmd_write(02); + palmld_usb2_cmd_write(46); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write(01); + palmld_usb2_cmd_write(01); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write(0x0A); + palmld_usb2_cmd_write(50); + /* Interface descr */ + palmld_usb2_cmd_write(9); + palmld_usb2_cmd_write(04); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write(04); + palmld_usb2_cmd_write(0xFF); + palmld_usb2_cmd_write(0x00); + palmld_usb2_cmd_write(0x00); + palmld_usb2_cmd_write(00); + /* Endpoint descr */ + palmld_usb2_cmd_write(07); + palmld_usb2_cmd_write(05); + palmld_usb2_cmd_write(0x02); + palmld_usb2_cmd_write(02); + palmld_usb2_cmd_write(0x40); + palmld_usb2_cmd_write(0x00); + palmld_usb2_cmd_write(0x00); + /* Endpoint descr */ + palmld_usb2_cmd_write(07); + palmld_usb2_cmd_write(05); + palmld_usb2_cmd_write(0x04); + palmld_usb2_cmd_write(02); + palmld_usb2_cmd_write(0x40); + palmld_usb2_cmd_write(0x00); + palmld_usb2_cmd_write(0x00); + /* Endpoint descr */ + palmld_usb2_cmd_write(07); + palmld_usb2_cmd_write(05); + palmld_usb2_cmd_write(0x86); + palmld_usb2_cmd_write(02); + palmld_usb2_cmd_write(0x40); + palmld_usb2_cmd_write(0x00); + palmld_usb2_cmd_write(0x00); + /* Endpoint descr */ + palmld_usb2_cmd_write(07); + palmld_usb2_cmd_write(05); + palmld_usb2_cmd_write(0x88); + palmld_usb2_cmd_write(02); + palmld_usb2_cmd_write(0x40); + palmld_usb2_cmd_write(0x00); + palmld_usb2_cmd_write(0x00); + /* String descr 0 */ + palmld_usb2_cmd_write(04); + palmld_usb2_cmd_write(03); + palmld_usb2_cmd_write(0x09); + palmld_usb2_cmd_write(0x04); + + /* String descr 1 */ + palmld_usb2_cmd_write(16); + palmld_usb2_cmd_write(03); + palmld_usb2_cmd_write('C'); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write('y'); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write('p'); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write('r'); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write('e'); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write('s'); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write('s'); + palmld_usb2_cmd_write(00); + + /* String descr 1 */ + palmld_usb2_cmd_write(20); + palmld_usb2_cmd_write(3); + palmld_usb2_cmd_write('C'); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write('Y'); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write('7'); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write('C'); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write('6'); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write('8'); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write('0'); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write('0'); + palmld_usb2_cmd_write(00); + palmld_usb2_cmd_write('1'); + palmld_usb2_cmd_write(00); + + /* A LOT OF DEBUGING CRAP */ /* printk("GPIO106 %i\n",(GET_GPIO(106)?1:0)); printk("GPIO106 %i\n",(GET_GPIO(106)?1:0)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2007-04-06 20:21:03
|
Revision: 951 http://svn.sourceforge.net/hackndev/?rev=951&view=rev Author: marex_z71 Date: 2007-04-06 13:20:59 -0700 (Fri, 06 Apr 2007) Log Message: ----------- PalmLD: Basic stone for USB2 driver ... this can enumerate with builtin descriptor Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_usb.c linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-gpio.h linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-init.h linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-usb2.h Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_usb.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_usb.c 2007-04-04 22:59:08 UTC (rev 950) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_usb.c 2007-04-06 20:20:59 UTC (rev 951) @@ -14,98 +14,112 @@ #include <asm/arch/palmld-gpio.h> #include <asm/arch/palmld-usb2.h> -u16 palmld_usb2_cmd_read(int addr) +u16 palmld_usb2_cmd_read(int reg) { - u16 data = PALMLD_USB2_CMD_ADDR | PALMLD_USB2_CMD_READ - | (addr & PALMLD_USB2_ADDR_MASK); + u8 data = PALMLD_USB2_CMD_ADDR | PALMLD_USB2_CMD_READ + | (reg & PALMLD_USB2_ADDR_MASK); + PALMLD_USB2_ADDR_CMD = data; + while((GET_PALMLD_GPIO(USB_READY)?1:0)==0) { + }; +/* printk("REG 0x%02x F2 0x%02x F4 0x%02x\n",reg,PALMLD_USB2_ADDR_FIFO2,PALMLD_USB2_ADDR_FIFO4); + printk("REG 0x%02x F2 0x%02x F4 0x%02x\n",reg,PALMLD_USB2_ADDR_FIFO6,PALMLD_USB2_ADDR_FIFO8); + printk("REG 0x%02x CD 0x%02x\n",reg,PALMLD_USB2_ADDR_CMD); +*/ return 0; +} - PALMLD_USB2_ADDR_FIFO6 = data; - - // ... wait for interrupt ... - udelay(100); - - return PALMLD_USB2_ADDR_FIFO6; +int palmld_usb2_cmd_set_reg(int reg) +{ + /* initiate write to addr */ + printk("SETTING 0x%02x\n",(reg | PALMLD_USB2_CMD_ADDR)); + PALMLD_USB2_ADDR_CMD=(reg | PALMLD_USB2_CMD_ADDR); + /* wait for READY line */ + while((GET_PALMLD_GPIO(USB_READY)?1:0)==0) { + }; + return 0; } -u16 palmld_usb2_dumpregs(void) +int palmld_usb2_cmd_write(u8 data) { - printk ("- CY7C68001 REGISTER DUMP -\n"); + /* prepare data */ + u8 data1 = ((data & 0xf0)>>3); /* Upper nibble */ + u8 data2 = (data & 0x0f); /* Lower nibble */ - printk (">> ADDRESS DUMP\n"); - printk ("FIFO2 %04x\n", PALMLD_USB2_ADDR_FIFO2); - printk ("FIFO4 %04x\n", PALMLD_USB2_ADDR_FIFO4); - printk ("FIFO6 %04x\n", PALMLD_USB2_ADDR_FIFO6); - printk ("FIFO8 %04x\n", PALMLD_USB2_ADDR_FIFO8); - printk ("CMD %04x\n", PALMLD_USB2_ADDR_CMD); - printk ("RESERVED1 %04x\n", PALMLD_USB2_ADDR_RESERVED1); - printk ("RESERVED2 %04x\n", PALMLD_USB2_ADDR_RESERVED2); - printk ("RESERVED3 %04x\n", PALMLD_USB2_ADDR_RESERVED3); + /* initiate write to reg */ + printk("UPPER NIBBLE %02x\n",(data1 | PALMLD_USB2_CMD_WRITE)); + PALMLD_USB2_ADDR_CMD=(data1 | PALMLD_USB2_CMD_WRITE); + /* wait for READY line */ + while((GET_PALMLD_GPIO(USB_READY)?1:0)==0) { + }; - printk ("\n\n>> REGISTER DUMP\n"); - printk ("*** GENERAL CONFIG\n"); - printk ("IFCONFIG %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_IFCONFIG)); - printk ("FLAGSAB %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_FLAGSAB)); - printk ("FLAGSCD %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_FLAGSCD)); - printk ("POLAR %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_POLAR)); - printk ("REVID %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_REVID)); + printk("LOWER NIBBLE %02x\n",(data2 | PALMLD_USB2_CMD_WRITE)); + PALMLD_USB2_ADDR_CMD=(data2 | PALMLD_USB2_CMD_WRITE); + /* wait for READY line */ + while((GET_PALMLD_GPIO(USB_READY)?1:0)==0) { + }; - printk ("\n*** ENDPOINT CONFIG\n"); - printk ("EP2CFG %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP2CFG)); - printk ("EP4CFG %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP4CFG)); - printk ("EP6CFG %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP6CFG)); - printk ("EP8CFG %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP8CFG)); - printk ("EP2PKTLENH %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP2PKTLENH)); - printk ("EP2PKTLENL %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP2PKTLENL)); - printk ("EP4PKTLENH %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP4PKTLENH)); - printk ("EP4PKTLENL %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP4PKTLENL)); - printk ("EP6PKTLENH %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP6PKTLENH)); - printk ("EP6PKTLENL %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP6PKTLENL)); - printk ("EP8PKTLENH %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP8PKTLENH)); - printk ("EP8PKTLENL %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP8PKTLENL)); - printk ("EP2PFH %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP2PFH)); - printk ("EP2PFL %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP2PFL)); - printk ("EP4PFH %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP4PFH)); - printk ("EP4PFL %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP4PFL)); - printk ("EP6PFH %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP6PFH)); - printk ("EP6PFL %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP6PFL)); - printk ("EP8PFH %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP8PFH)); - printk ("EP8PFL %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP8PFL)); - printk ("EP2ISOINPKTS %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP2ISOINPKTS)); - printk ("EP4ISOINPKTS %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP4ISOINPKTS)); - printk ("EP6ISOINPKTS %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP6ISOINPKTS)); - printk ("EP8ISOINPKTS %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP8ISOINPKTS)); - - printk ("\n*** INPKTEND/FLUSH\n"); - printk ("INPKTEND/FLUSH %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_INPKTEND)); + return 0; +} - printk ("\n*** USB CONFIG\n"); - printk ("USBFRAMEH %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_USBFRAMEH)); - printk ("USBFRAMEL %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_USBFRAMEL)); - printk ("MICROFRAME %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_MICROFRAME)); - printk ("FNADDR %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_FNADDR)); - - printk ("\n*** INTERRUPTS\n"); - printk ("INTENABLE %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_INTENABLE)); - - printk ("\n*** DESCRIPTOR\n"); - printk ("DESC %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_DESC)); - - printk ("\n*** ENDPOINT 0\n"); - printk ("EP0BUF %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP0BUF)); - printk ("SETUP %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_SETUP)); - printk ("EP0BC %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP0BC)); - - printk ("\n*** UNINDEXED REG CTRL\n"); - printk ("UIRC0 %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_UIRC0)); - printk ("UIRC1 %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_UIRC1)); - printk ("UIRC2 %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_UIRC2)); +u8 palmld_usb2_test_cmd(void) { + /* RESET THE CHIP */ + SET_GPIO(118,0); + udelay(100); + SET_GPIO(118,1); + udelay(500); - printk ("\n*** UNINDEXED REGS IN XDATA\n"); - printk ("FIFOPINPOLAR %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_FIFOPINPOLAR)); - printk ("TOGCTL %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_TOGCTL)); + /* ENUMERATE WITH BUILTIN DESCRIPTOR */ + /* select register 0x30 - descriptor RAM*/ + palmld_usb2_cmd_set_reg(0x30); + printk("SET ADDR to 0x30,GPIO86 %i\n",(GET_GPIO(86)?1:0)); + /* write descriptor length */ + palmld_usb2_cmd_write(0x06); + palmld_usb2_cmd_write(0x00); + printk("WRITE DESR size to 0x30,GPIO86 %i\n",(GET_GPIO(86)?1:0)); - printk ("\n- END OF DUMP -\n"); + /* write descriptor as described in SX2 docs */ + palmld_usb2_cmd_write(0x04); + palmld_usb2_cmd_write(0x0B); + palmld_usb2_cmd_write(0x04); + palmld_usb2_cmd_write(0x00); + + palmld_usb2_cmd_write(0x02); + palmld_usb2_cmd_write(0x00); + + palmld_usb2_cmd_write(0x00); + palmld_usb2_cmd_write(0x01); + + palmld_usb2_cmd_write(0x01); + palmld_usb2_cmd_write(0x00); + + palmld_usb2_cmd_write(0x00); + palmld_usb2_cmd_write(0x00); + + /* A LOT OF DEBUGING CRAP */ +/* printk("GPIO106 %i\n",(GET_GPIO(106)?1:0)); + printk("GPIO106 %i\n",(GET_GPIO(106)?1:0)); + printk("GPIO106 %i\n",(GET_GPIO(106)?1:0)); + printk("GPIO106 %i\n",(GET_GPIO(106)?1:0)); + printk("GPIO106 %i\n",(GET_GPIO(106)?1:0)); + printk("GPIO106 %i\n",(GET_GPIO(106)?1:0)); + printk("GPIO106 %i\n",(GET_GPIO(106)?1:0)); + printk("GPIO106 %i\n",(GET_GPIO(106)?1:0)); + printk("GPIO106 %i\n",(GET_GPIO(106)?1:0)); + printk("GPIO106 %i\n",(GET_GPIO(106)?1:0)); + printk("GPIO106 %i\n",(GET_GPIO(106)?1:0)); +*/ + + for (;;) { + /* printk("%02x%02x|%02x%02x|%02x%02x|%02x%02x|%i|%i|%i|%i|%i|%i\n", + PALMLD_USB2_ADDR_FIFO2,PALMLD_USB2_ADDR_FIFO4, + PALMLD_USB2_ADDR_FIFO6,PALMLD_USB2_ADDR_FIFO8, + PALMLD_USB2_ADDR_CMD,PALMLD_USB2_ADDR_RESERVED1, + PALMLD_USB2_ADDR_RESERVED2,PALMLD_USB2_ADDR_RESERVED3, + (GET_GPIO(18)?1:0),(GET_GPIO(20)?1:0), + (GET_GPIO(53)?1:0),(GET_GPIO(86)?1:0), + (GET_GPIO(90)?1:0),(GET_GPIO(106)?1:0)); + */} + return 0; } @@ -115,10 +129,9 @@ if(!machine_is_xscale_palmld()) return -ENODEV; - palmld_usb2_dumpregs(); + palmld_usb2_test_cmd(); return -ENODEV; - } static void __exit palmld_usb2_exit(void) Modified: linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-gpio.h =================================================================== --- linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-gpio.h 2007-04-04 22:59:08 UTC (rev 950) +++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-gpio.h 2007-04-06 20:20:59 UTC (rev 951) @@ -21,21 +21,20 @@ /* Palm LifeDrive GPIOs */ -#define GPIO_NR_PALMLD_GPIO_RESET 1 -#define GPIO_NR_PALMLD_USB_DETECT 3 -#define GPIO_NR_PALMLD_POWER_DETECT 4 -#define GPIO_NR_PALMLD_HOTSYNC_BUTTON_N 10 -#define GPIO_NR_PALMLD_POWER_SWITCH 11 -#define GPIO_NR_PALMLD_EARPHONE_DETECT 13 -#define GPIO_NR_PALMLD_SD_DETECT_N 14 /* SD card inserted; RE FE; Input */ -#define GPIO_NR_PALMLD_LOCK_SWITCH 15 /* keypad lock */ -#define GPIO_NR_PALMLD_SCREEN 19 +#define GPIO_NR_PALMLD_GPIO_RESET 1 +#define GPIO_NR_PALMLD_POWER_DETECT 4 +#define GPIO_NR_PALMLD_HOTSYNC_BUTTON_N 10 +#define GPIO_NR_PALMLD_POWER_SWITCH 11 +#define GPIO_NR_PALMLD_EARPHONE_DETECT 13 +#define GPIO_NR_PALMLD_SD_DETECT_N 14 /* SD card inserted; RE FE; Input */ +#define GPIO_NR_PALMLD_LOCK_SWITCH 15 /* keypad lock */ +#define GPIO_NR_PALMLD_SCREEN 19 -#define GPIO_NR_PALMLD_WM9712_IRQ 27 +#define GPIO_NR_PALMLD_WM9712_IRQ 27 -#define GPIO_NR_PALMLD_IR_DISABLE 40 /* IRDA */ -#define GPIO_NR_PALMLD_ICP_RXD 46 -#define GPIO_NR_PALMLD_ICP_TXD 47 +#define GPIO_NR_PALMLD_IR_DISABLE 40 /* IRDA */ +#define GPIO_NR_PALMLD_ICP_RXD 46 +#define GPIO_NR_PALMLD_ICP_TXD 47 #define GPIO_NR_PALMLD_GREEN_LED 52 @@ -74,6 +73,13 @@ #define IRQ_GPIO_PALMLD_WM9712_IRQ IRQ_GPIO(GPIO_NR_PALMLD_WM9712_IRQ) #define IRQ_GPIO_PALMLD_IDE_IRQ IRQ_GPIO(GPIO_NR_PALMLD_IDE_IRQ) +/* USB */ +#define GPIO_NR_PALMLD_USB_DETECT 3 +#define GPIO_NR_PALMLD_USB_READY 86 +#define GPIO_NR_PALMLD_USB_RESET 88 +#define GPIO_NR_PALMLD_USB_INT 106 +#define GPIO_NR_PALMLD_USB_POWER 118 + /* Utility macros */ #define GET_PALMLD_GPIO(gpio) \ (GPLR(GPIO_NR_PALMLD_ ## gpio) & GPIO_bit(GPIO_NR_PALMLD_ ## gpio)) @@ -97,5 +103,13 @@ #define GET_GPIO(gpio) (GPLR(gpio) & GPIO_bit(gpio)) +#define SET_GPIO(gpio, setp) \ +do { \ +if (setp) \ + GPSR(gpio) = GPIO_bit(gpio); \ +else \ + GPCR(gpio) = GPIO_bit(gpio); \ +} while (0) + #endif /* _PALMLD_GPIO_H_ */ Modified: linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-init.h =================================================================== --- linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-init.h 2007-04-04 22:59:08 UTC (rev 950) +++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-init.h 2007-04-06 20:20:59 UTC (rev 951) @@ -22,7 +22,7 @@ // BATTERY #define PALMLD_BAT_MAX_VOLTAGE 4000 // 4.00V current voltage at max charge as from PalmOS -#define PALMLD_BAT_MIN_VOLTAGE 3600 // 3.60V critical voltage as from Zlauncher +#define PALMLD_BAT_MIN_VOLTAGE 3550 // 3.55V critical voltage #define PALMLD_BAT_MAX_CURRENT 0 // unknokn #define PALMLD_BAT_MIN_CURRENT 0 // unknown #define PALMLD_BAT_MAX_CHARGE 1 // unknown Modified: linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-usb2.h =================================================================== --- linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-usb2.h 2007-04-04 22:59:08 UTC (rev 950) +++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-usb2.h 2007-04-06 20:20:59 UTC (rev 951) @@ -97,16 +97,18 @@ #define PALMLD_USB2_ADDR_BASE PALMLD_USB_VIRT -#define PALMLD_USB2_ADDR_IF(x) (*((volatile u16 *)x)) +#define PALMLD_USB2_ADDR_IF(x) (*((volatile u8 *)x)) +/* We have 16bit bus of the chip connected to 32 bit bus of CPU */ + #define PALMLD_USB2_ADDR_FIFO2 PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0x0) -#define PALMLD_USB2_ADDR_FIFO4 PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0x2) +#define PALMLD_USB2_ADDR_FIFO4 PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0x1) #define PALMLD_USB2_ADDR_FIFO6 PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0x4) -#define PALMLD_USB2_ADDR_FIFO8 PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0x6) +#define PALMLD_USB2_ADDR_FIFO8 PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0x5) #define PALMLD_USB2_ADDR_CMD PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0x8) -#define PALMLD_USB2_ADDR_RESERVED1 PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0x10) -#define PALMLD_USB2_ADDR_RESERVED2 PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0x12) -#define PALMLD_USB2_ADDR_RESERVED3 PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0x14) +#define PALMLD_USB2_ADDR_RESERVED1 PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0x9) +#define PALMLD_USB2_ADDR_RESERVED2 PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0xc) +#define PALMLD_USB2_ADDR_RESERVED3 PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0xd) /*************************************************** * SX2 COMMANDS * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |
From: <ke...@us...> - 2007-04-03 21:57:44
|
Revision: 949 http://svn.sourceforge.net/hackndev/?rev=949&view=rev Author: keddar Date: 2007-04-03 14:57:39 -0700 (Tue, 03 Apr 2007) Log Message: ----------- l4p: update from me latest t3 build, support new BFUGarux features and more.. :) Modified Paths: -------------- linux4palm/BFUGarux/init/live-lib Modified: linux4palm/BFUGarux/init/live-lib =================================================================== --- linux4palm/BFUGarux/init/live-lib 2007-03-30 21:01:50 UTC (rev 948) +++ linux4palm/BFUGarux/init/live-lib 2007-04-03 21:57:39 UTC (rev 949) @@ -24,8 +24,10 @@ MMC_MNTNEW="$UNION/mnt/mmc" LINUX2RAM=/linux2ram ### replaced with BFU if found... (DON'T USE /$LINUX2RAM :) CMD_MMC="$MMC_MNT$LINUX2RAM/cmdline" +liveload="1" # initial value LIVE_CHANGES="$MMC_MNT/live_changes.squashfs" + ######### REFLASH PARAMS BIN2FLASH="$MMC_MNT_ROOT/bin2flash" MTD_FREE_MD5="41d2e2c0c0edfccf76fa1c3e38bc1cf2 -" @@ -47,12 +49,12 @@ ## efetchall used for critical part, show info also if SilentBoot is used efetchall() { - echo -e " ${C_WHIT}>> $1${C_OFF}" + echo -e " ${C_WHIT}>> $1${C_OFF}" } ## don't show if SilentBoot is used efetch() { - if [ "$SILENT" = "" ]; then echo -e " ${C_WHIT}>> $1${C_OFF}"; fi + if [ "$SILENT" = "" ]; then echo -e " ${C_WHIT}>> $1${C_OFF}"; fi } einfo() { @@ -63,6 +65,10 @@ echo -e "$WARN $1${C_OFF}" } +ewarnn() { + echo -en "$WARN $1${C_OFF}" +} + eerr() { echo -e "$ERRO $1${C_OFF}" } @@ -94,12 +100,21 @@ einfo "Linux4Palm ${C_BLU}http://www.hackndev.com/${C_OFF}" einfo "Release codename : ${C_RED}${L4P_RELEASE}${C_OFF}" einfo "Version : $L4P_VERSION" - einfo "Kernel : $KERNEL_VER" + einfo "Kernel : $KERNEL_VER" ; einfo "SVN rev: $SVN" einfo "Bootloader: $BOOTL" - einfo "Unofficial rev.: ${C_GRE}$UNOFF${C_OFF}" + einfo "Build rev.: ${C_GRE}$REV${C_OFF}" einfo "Unofficial homepage : http://kedar.palmlinux.cz\n\n" } + +## inserting module - TODO ? dodelat, nebo nechat do_insmod_base tak jak je ?? +do_modprobe() { + if [ "`find /lib/modules/$KERNEL_VER/kernel/ -name $1.ko`" != "" ]; then + efetch $1 + modprobe $1 + fi +} + ## insert base kernel modules do_insmod_base() { ewarn "Loading core modules" @@ -123,14 +138,16 @@ modprobe squashfs fi - efetch "gpioed" - modprobe gpioed - do_die_msg "modprobe gpioed failed" + if [ -e /lib/modules/$KERNEL_VER/kernel/drivers/misc/gpioed.ko ]; then + efetch "gpioed" + modprobe gpioed + #do_die_msg "modprobe gpioed failed" + fi } ## probe modules from modules-???.squashfs, after unionfs is created do_insmod_ext() { - ewarn "Probing some modules from real root" + ewarn "Loading external modules..." modprobe -s -q tsc2101 $DEBUGCMD } @@ -152,7 +169,7 @@ ewarn "Mounting Ramdisk..." RAMSIZE="$BFURAMDiskSize" if [ "$RAMSIZE" = "" ]; then RAMSIZE="`cmdline_value ramsize`"; fi - if [ "$RAMSIZE" = "" ]; then RAMSIZE="80%"; fi + if [ "$RAMSIZE" = "" ]; then RAMSIZE="75%"; fi mount -t tmpfs -o size=$RAMSIZE tmpfs $MEMORY efetch "mounted with max size $RAMSIZE" } @@ -204,13 +221,13 @@ ## initialize usb network interface do_network_init() { - if [ "$usenet" != "0" ]; then - ewarn "Initializing network" - do_usb_power 0 - modprobe -s -q g_ether - do_die_msg "modprobe g_ether failed" - do_usb_power 1 - fi + if [ "$usenet" != "0" ]; then + ewarn "Initializing network" + do_usb_power 0 + modprobe -s -q g_ether + do_die_msg "modprobe g_ether failed" + do_usb_power 1 + fi } ## network configure in text mode - not used for BFUSettings @@ -312,7 +329,7 @@ ## choice default start: -## - if found config cmdline - run old textmode configure +## - if found cmdline 'config' - run old textmode configure ## - if BFUSource is empty - run default configured => SD-GPE-NET192 ## - in other case - run BFUSettings configure do_start_default() { @@ -365,11 +382,13 @@ fi if [ "$via" = "c" ]; then do_mount_nfs - do_chroot_nfs + cd $MEMORY/nfs + do_chroot fi if [ "$via" = "t" ]; then do_mmc_mount - do_chroot_oncard + cd $MMC_MNT + do_chroot fi unset via } @@ -408,21 +427,23 @@ NFS="$BFUAddress" if [ $BFUUseNet = "0" ]; then do_network_def; fi ### replace BFUUseNet=0 do_mount_nfs - do_chroot_nfs + cd $MEMORY/nfs + do_chroot fi #### source is real rootfs on nfs share if [ "$BFUSource" = "3" ]; then do_mmc_mount do_mmc_move ### xxxxx - do_chroot_oncard + cd $MMC_MNT + do_chroot fi } ## get modules from www server, from modlist.txt, or modlist-gpe.txt do_get_modules_www() { $DEBUGCMD - ewarn "Getting module list:"; efetch "$WWW/modlist.txt" + ewarnn "Getting module list:"; efetchall "$WWW/modlist.txt" cd $MEMORY wget "$WWW/modlist.txt" -P $MEMORY if [ -e modlist.txt ]; then @@ -432,7 +453,7 @@ wget "$WWW/modlist-gpe.txt" MODLIST="modlist-gpe.txt" fi - export MOD_STR + export MODLIST do_die MOD_STR="" mkdir -p $COPY2RAM @@ -447,21 +468,29 @@ MOD_STR="$mod $MOD_STR" fi done + + ## add modules coresponded with rev of garux + efetch "modules-$REV.squashfs" + MOD_STR="modules-$REV.squashfs $MOD_STR" + export MOD_STR + MODDIR="$COPY2RAM" + start_from_www="1" - $DEBUGCMD + + $DEBUGCMD } ## get modules from mmc card do_get_modules_mmc() { $DEBUGCMD - ewarn "Getting modules list..." + ewarnn "Getting modlist:" cd $MEMORY MOD_STR="" ## don't try copy modlist from mmc, if found in memory if [ ! -e $MEMORY/modlist-all.txt ]; then - efetch "$MMC_MNT$LINUX2RAM/$MODLIST" + efetchall "$MODLIST" cp "$MMC_MNT$LINUX2RAM/$MODLIST" . do_die fi @@ -482,8 +511,15 @@ MODDIR="$MMC_MNT$LINUX2RAM" fi done + + ## add modules coresponded with rev of garux + efetch "add modules-$REV.squashfs" + MOD_STR="modules-$REV.squashfs $MOD_STR" + export MOD_STR + start_from_mmc="1" + $DEBUGCMD } @@ -602,7 +638,7 @@ cd $MEMORY for mod in $MOD_STR ; do if [ -e $MODDIR/$mod ]; then - efetch "$mod" + efetchall "$mod" mkdir -p $IMAGES/$mod mount -t squashfs -o ro,loop $MODDIR/$mod "$IMAGES/$mod" else @@ -613,43 +649,20 @@ done } -## re-rooted to directory with new root +## chroot to directory with new root do_chroot() { cd $UNION mkdir -p mnt/live umount /sys - if [ ! -e $UNION/dev/console ]; then mknod $UNION/dev/console c 5 1; fi - if [ ! -e $UNION/dev/initctl ]; then mknod $UNION/dev/initctl p; fi - pivot_root . mnt/live - do_bin2flash_check - do_insmod_ext - ewarn "Running init..." - exec /usr/sbin/chroot . /sbin/init 5 <dev/console >dev/console 2>&1 - do_die -} - -do_chroot_nfs() { - cd $MEMORY/nfs - mkdir -p mnt/live - umount /sys - if [ ! -e $MEMORY/nfs/dev/console ]; then mknod $MEMORY/nfs/dev/console c 5 1; fi - if [ ! -e $MEMORY/nfs/dev/initctl ]; then mknod $MEMORY/nfs/dev/initctl p; fi - pivot_root . mnt/live - do_insmod_ext - ewarn "Running init..." - exec /usr/sbin/chroot . /sbin/init 5 <dev/console >dev/console 2>&1 - do_die -} - -do_chroot_oncard() { - cd $MMC_MNT - mkdir -p mnt/live - umount /sys if [ ! -e dev/console ]; then mknod dev/console c 5 1; fi if [ ! -e dev/initctl ]; then mknod dev/initctl p; fi pivot_root . mnt/live + if [ "$start_from_www" = "1" ]; then + do_bin2flash_check + fi do_insmod_ext ewarn "Running init..." + $initwait exec /usr/sbin/chroot . /sbin/init 5 <dev/console >dev/console 2>&1 do_die } @@ -672,7 +685,7 @@ ### einfo "Copying some file from init to real root (/)" ### cp -a /unioncopy/* $UNION 2>/dev/null if [ "$usekbd" != "0" ]; then ### fixme - rewrite for separated copy !? - ewarn "Copying ...resume.d/inputtattach to real root (/)" + efetch "Copying 'unioncopy' to real root (/)" cp -a /unioncopy/* $UNION 2>/dev/null fi fi @@ -682,7 +695,7 @@ ## if found rootcopy (in source dir for modules), recursive copy all to / do_rootcopy() { if [ -e $MMC_MNT$LINUX2RAM/rootcopy ]; then - ewarn "Copying 'rootcopy' to real root (/)" + efetch "Copying 'rootcopy' to real root (/)" cp -a $MMC_MNT$LINUX2RAM/rootcopy/* $UNION 2>/dev/null fi if [ "$start_from_www" = "1" ]; then @@ -700,15 +713,14 @@ ## unpack live_changes.squashfs if found (created if reboot, or manualy run Live_Save icon in GPE) do_load_live_changes() { - if [ "$start_from_mmc" = "1" ]; then - if [ "$liveskip" != "1" ]; then + if [ "$start_from_mmc" = "1" ]; then + if [ "$liveload" = "1" ]; then + ewarnn "Loading live_changes ..." if [ -e $LIVE_CHANGES ]; then - if message_skipped "$WARN Loading live_changes... " 3 "${C_REDY}SKIP${C_OFF}"; then - efetch "unpacking ..." - unsquashfs -f -dest $CHANGES $LIVE_CHANGES >/dev/null - else - efetchall "skiping ..." - fi + efetchall "unpacking ..." + unsquashfs -f -dest $CHANGES $LIVE_CHANGES >/dev/null + else + efetchall "not found ..." fi fi fi @@ -740,23 +752,22 @@ ## set cpufreq to fixed or auto frequency, using cpufreq governors do_cpufreq_scale() { - ewarn "Setting CPU speed..." - efetch "minimal frequency: "`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq`" kHz" - efetch "maximal frequency: "`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq`" kHz" - efetch "speed before is: "`cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed`" kHz" - if [ `cmdline_parameter cpufreq` ]; then - CPUFREQ="`cmdline_value cpufreq`" - efetch "read cpufreq from /proc/cmdline: $CPUFREQ'000' kHz" + if [ "$CPUFREQ" != "none" ]; then + modprobe cpu-pxa + ewarnn "Initializing cpu-freq... " +# efetch "minimal frequency: "`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq`" kHz" +# efetch "maximal frequency: "`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq`" kHz" +# efetch "speed before is: "`cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed`" kHz" + if [ "$CPUFREQ" = "" ]; then CPUFREQ="133"; efetch "set default value from init..."; fi + if [ "$CPUFREQ" != "auto" ]; then + echo $CPUFREQ'000' >/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed + efetchall `cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed`" kHz" + else + GOVERNOR="conservative"; export GOVERNOR ; modprobe -q "cpufreq_$GOVERNOR" + echo "$GOVERNOR" >/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor + efetchall "$GOVERNOR" + fi fi - if [ "$CPUFREQ" = "" ]; then CPUFREQ="133"; efetch "set default value from init..."; fi - if [ "$CPUFREQ" != "auto" ]; then - echo $CPUFREQ'000' >/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed - efetchall "after set is speed: "`cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed`" kHz" - else - GOVERNOR="conservative"; export GOVERNOR ; modprobe -q "cpufreq_$GOVERNOR" - echo "$GOVERNOR" >/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor - efetchall "cpufreq is set to auto ($GOVERNOR)" - fi } ## change cpufreq from text file 'cmdline' in source dir for modules/real root (if found file & cpu=) @@ -799,20 +810,24 @@ if [ `cmdline_parameter www` ]; then WWW="`cmdline_value www`"; else WWW="http://$NET_HOST_IP$LINUX2RAM"; fi if [ `cmdline_parameter lcdbl` ]; then LCDBL="`cmdline_value lcdbl`"; fi if [ `cmdline_parameter fsck` ]; then fsckon="1"; fi - if [ `cmdline_parameter ss` ]; then liveskip="1"; fi + if [ `cmdline_parameter ss` ]; then liveload="0"; fi + if [ `cmdline_parameter iw` ]; then initwait="read enter"; fi + if [ `cmdline_parameter cpufreq` ]; then CPUFREQ="`cmdline_value cpufreq`"; fi fi } ## check parameters from text file 'cmdline' in source dir for modules/real root do_cmdline_check_mmc() { - if [ -e $CMD_MMC ]; then - if [ `cmdline_parameter nokbd $CMD_MMC` ]; then usekbd="0"; fi - if [ `cmdline_parameter debug $CMD_MMC` ]; then DEBUGCMD="debug"; fi - if [ `cmdline_parameter mmcrw $CMD_MMC` ]; then rmode="rw"; fi - if [ `cmdline_parameter copy2ram $CMD_MMC` ]; then copy2ram="1"; fi - if [ `cmdline_parameter lcdbl $CMD_MMC` ]; then LCDBL="`cmdline_value lcdbl $CMD_MMC`"; do_lcdbl_set; fi - if [ `cmdline_parameter skipsaves $CMD_MMC` ]; then liveskip="1"; fi - fi + if [ -e $CMD_MMC ]; then + if [ `cmdline_parameter nokbd $CMD_MMC` ]; then usekbd="0"; fi + if [ `cmdline_parameter debug $CMD_MMC` ]; then DEBUGCMD="debug"; fi + if [ `cmdline_parameter mmcrw $CMD_MMC` ]; then rmode="rw"; fi + if [ `cmdline_parameter copy2ram $CMD_MMC` ]; then copy2ram="1"; fi + if [ `cmdline_parameter lcdbl $CMD_MMC` ]; then LCDBL="`cmdline_value lcdbl $CMD_MMC`"; do_lcdbl_set; fi + if [ `cmdline_parameter skipsaves $CMD_MMC` ]; then liveload="0"; fi + if [ `cmdline_parameter initwait $CMD_MMC` ]; then initwait="read enter"; fi + if [ `cmdline_parameter cpufreq $CMD_MMC` ]; then CPUFREQ="`cmdline_value cpufreq`"; fi + fi } ## import BFUSettings via BFULinuxHelper, and set value from it @@ -835,7 +850,7 @@ SILENT2="2>/dev/null" # <dev/stdout >/dev/null <dev/console >/dev/null fi - if [ "$BFUAddress" != "" ]; then LINUX2RAM="$BFUAddress"; fi + if [ "$BFUAddress" != "" ]; then LINUX2RAM="$BFUAddress"; CMD_MMC="$MMC_MNT$LINUX2RAM/cmdline"; fi if [ "$BFUUseNet" = "0" ]; then usenet="0"; fi if [ "$BFUKeyboard" = "0" ]; then usekbd="0"; fi if [ "$BFUDebug" = "1" ]; then DEBUGCMD="debug"; fi @@ -844,9 +859,10 @@ if [ "$BFUCPUspeed" = "1" ]; then CPUFREQ="133"; fi if [ "$BFUCPUspeed" = "2" ]; then CPUFREQ="266"; fi if [ "$BFUCPUspeed" = "3" ]; then CPUFREQ="399"; fi + if [ "$BFUCPUspeed" = "4" ]; then CPUFREQ="none"; fi if [ "$BFUCopy2RAM" = "1" ]; then copy2ram="1"; fi if [ "$BFUFSCK" = "1" ]; then fsckon="1"; fi - if [ "$BFULive" = "0" ]; then liveskip="1"; fi + if [ "$BFULiveChanges" = "0" ]; then liveload="0"; fi } ## run shell for debuging init, test problebs etc.. need stowaway/dicota keyboard @@ -978,21 +994,8 @@ do_flash_prepare() { if [ "$MTD_NEW" != "skip" ]; then efetchall "prepare for: ${C_YEL}$MTD_NEW${C_OFF} ..." - -## temporary(?) disabled - because MTD_DEV_MD5_AFTER is fixed, and MD5 for 0.1 and 0.2 is present in do_mtdX_setup -# if [ ! -e "$BIN2FLASH/$MTD_NEW.md5" ]; then -# efetch "${C_REDY}NOT FOUND: $MTD_NEW.md5" -# efetch "${C_YEL}create it, ONLY with MD5 number." -# efetch "${C_YEL}because flashing is DANGEROUS..." -# efetch "${C_YEL}without this is ${C_REDW}STOPED${C_OFF}" -# $PREFIX/bin/sleep 10 -# do_mmc_reini -# do_flash_restart -# fi - ## don't create backup if restore ;) if [ "$backup" != "NO" ]; then do_flash_backup; fi - efetchall "copy ${C_YEL}$MTD_NEW${C_OFF} to ${C_YEL}ramdisk${C_OFF}..." if [ -e $PREFIX/memory/$MTD_NEW ]; then $PREFIX/bin/rm $PREFIX/memory/$MTD_NEW; fi $PREFIX/bin/cp $BIN2FLASH/$MTD_NEW $PREFIX/memory This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2007-03-30 21:01:53
|
Revision: 948 http://svn.sourceforge.net/hackndev/?rev=948&view=rev Author: marex_z71 Date: 2007-03-30 14:01:50 -0700 (Fri, 30 Mar 2007) Log Message: ----------- PalmLD: Restart of works on USB2 driver, reg dumping code Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_usb.c Added Paths: ----------- linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-usb2.h Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_usb.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_usb.c 2007-03-29 18:54:56 UTC (rev 947) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_usb.c 2007-03-30 21:01:50 UTC (rev 948) @@ -6,95 +6,128 @@ #include <linux/device.h> #include <linux/platform_device.h> #include <linux/delay.h> -#include <linux/soc-device.h> #include <asm/mach-types.h> #include <asm/hardware.h> -#include <../drivers/pcmcia/soc_common.h> #include <asm/arch/pxa-regs.h> #include <asm/irq.h> #include <asm/arch/palmld-gpio.h> +#include <asm/arch/palmld-usb2.h> -/* -#define GET_GPIO(gpio) \ - (GPLR(gpio) & GPIO_bit(gpio)) -#define SET_GPIO(gpio, setp) \ -do { \ -if (setp) \ - GPSR(gpio) = GPIO_bit(gpio); \ -else \ - GPCR(gpio) = GPIO_bit(gpio); \ -} while (0) +u16 palmld_usb2_cmd_read(int addr) +{ + u16 data = PALMLD_USB2_CMD_ADDR | PALMLD_USB2_CMD_READ + | (addr & PALMLD_USB2_ADDR_MASK); -static int socket_ready; + PALMLD_USB2_ADDR_FIFO6 = data; + + // ... wait for interrupt ... + udelay(100); + + return PALMLD_USB2_ADDR_FIFO6; +} -static struct platform_device palmld_pcmcia_device = { - .name = "pxa2xx-pcmcia", - .id = 0, - .dev = { - .platform_data = &palmld_pcmcia_ops, - .release = palmld_pcmcia_release - } -}; +u16 palmld_usb2_dumpregs(void) +{ + printk ("- CY7C68001 REGISTER DUMP -\n"); -*/ + printk (">> ADDRESS DUMP\n"); + printk ("FIFO2 %04x\n", PALMLD_USB2_ADDR_FIFO2); + printk ("FIFO4 %04x\n", PALMLD_USB2_ADDR_FIFO4); + printk ("FIFO6 %04x\n", PALMLD_USB2_ADDR_FIFO6); + printk ("FIFO8 %04x\n", PALMLD_USB2_ADDR_FIFO8); + printk ("CMD %04x\n", PALMLD_USB2_ADDR_CMD); + printk ("RESERVED1 %04x\n", PALMLD_USB2_ADDR_RESERVED1); + printk ("RESERVED2 %04x\n", PALMLD_USB2_ADDR_RESERVED2); + printk ("RESERVED3 %04x\n", PALMLD_USB2_ADDR_RESERVED3); -#define SX2_BASE PALMLD_USB_VIRT + printk ("\n\n>> REGISTER DUMP\n"); + printk ("*** GENERAL CONFIG\n"); + printk ("IFCONFIG %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_IFCONFIG)); + printk ("FLAGSAB %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_FLAGSAB)); + printk ("FLAGSCD %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_FLAGSCD)); + printk ("POLAR %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_POLAR)); + printk ("REVID %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_REVID)); -#define SX2_IF(x) (*((volatile u16 *)x)) + printk ("\n*** ENDPOINT CONFIG\n"); + printk ("EP2CFG %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP2CFG)); + printk ("EP4CFG %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP4CFG)); + printk ("EP6CFG %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP6CFG)); + printk ("EP8CFG %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP8CFG)); + printk ("EP2PKTLENH %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP2PKTLENH)); + printk ("EP2PKTLENL %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP2PKTLENL)); + printk ("EP4PKTLENH %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP4PKTLENH)); + printk ("EP4PKTLENL %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP4PKTLENL)); + printk ("EP6PKTLENH %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP6PKTLENH)); + printk ("EP6PKTLENL %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP6PKTLENL)); + printk ("EP8PKTLENH %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP8PKTLENH)); + printk ("EP8PKTLENL %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP8PKTLENL)); + printk ("EP2PFH %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP2PFH)); + printk ("EP2PFL %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP2PFL)); + printk ("EP4PFH %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP4PFH)); + printk ("EP4PFL %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP4PFL)); + printk ("EP6PFH %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP6PFH)); + printk ("EP6PFL %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP6PFL)); + printk ("EP8PFH %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP8PFH)); + printk ("EP8PFL %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP8PFL)); + printk ("EP2ISOINPKTS %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP2ISOINPKTS)); + printk ("EP4ISOINPKTS %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP4ISOINPKTS)); + printk ("EP6ISOINPKTS %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP6ISOINPKTS)); + printk ("EP8ISOINPKTS %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP8ISOINPKTS)); + + printk ("\n*** INPKTEND/FLUSH\n"); + printk ("INPKTEND/FLUSH %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_INPKTEND)); -#define SX2_FIFO2 SX2_IF(SX2_BASE + 0x0) -#define SX2_FIFO4 SX2_IF(SX2_BASE + 0x2) -#define SX2_FIFO6 SX2_IF(SX2_BASE + 0x4) -#define SX2_FIFO8 SX2_IF(SX2_BASE + 0x6) -#define SX2_CMD SX2_IF(SX2_BASE + 0x8) + printk ("\n*** USB CONFIG\n"); + printk ("USBFRAMEH %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_USBFRAMEH)); + printk ("USBFRAMEL %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_USBFRAMEL)); + printk ("MICROFRAME %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_MICROFRAME)); + printk ("FNADDR %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_FNADDR)); + + printk ("\n*** INTERRUPTS\n"); + printk ("INTENABLE %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_INTENABLE)); + + printk ("\n*** DESCRIPTOR\n"); + printk ("DESC %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_DESC)); + + printk ("\n*** ENDPOINT 0\n"); + printk ("EP0BUF %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP0BUF)); + printk ("SETUP %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_SETUP)); + printk ("EP0BC %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_EP0BC)); + + printk ("\n*** UNINDEXED REG CTRL\n"); + printk ("UIRC0 %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_UIRC0)); + printk ("UIRC1 %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_UIRC1)); + printk ("UIRC2 %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_UIRC2)); -#define SX2_CMD_READ (0x40) -#define SX2_CMD_ADDR (0x80) + printk ("\n*** UNINDEXED REGS IN XDATA\n"); + printk ("FIFOPINPOLAR %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_FIFOPINPOLAR)); + printk ("TOGCTL %04x\n", palmld_usb2_cmd_read(PALMLD_USB2_REG_TOGCTL)); -#define SX2_ADDR_MASK (0x3f) + printk ("\n- END OF DUMP -\n"); - -#define SX2_REG_REVID (0x05) - -u16 sx2_cmd_read(int addr) -{ - u16 data = SX2_CMD_ADDR | SX2_CMD_READ | (addr & SX2_ADDR_MASK); - SX2_FIFO6 = data; - - // ... wait for interrupt ... - udelay(100); - - return SX2_FIFO6; + return 0; } -static int __init sx2_init(void) +static int __init palmld_usb2_init(void) { printk ("sx2_init()\n"); if(!machine_is_xscale_palmld()) return -ENODEV; - printk ("fifo2 %x\n", SX2_FIFO2); - printk ("fifo4 %x\n", SX2_FIFO4); - printk ("fifo6 %x\n", SX2_FIFO6); - printk ("fifo8 %x\n", SX2_FIFO8); - printk ("cmd %x\n", SX2_CMD); - printk ("res1 %x\n", SX2_IF(SX2_BASE + 10)); - printk ("res2 %x\n", SX2_IF(SX2_BASE + 12)); + palmld_usb2_dumpregs(); + + return -ENODEV; - printk ("Chip revision: %x\n", sx2_cmd_read(SX2_REG_REVID)); - - return -ENODEV; //platform_device_register (&palmld_pcmcia_device); } -static void __exit sx2_exit(void) +static void __exit palmld_usb2_exit(void) { - //platform_device_unregister (&palmld_pcmcia_device); } -module_init(sx2_init); -module_exit(sx2_exit); +module_init(palmld_usb2_init); +module_exit(palmld_usb2_exit); -MODULE_AUTHOR ("Alex Osborne <bob...@gm...>"); -MODULE_DESCRIPTION ("EZ-USB SX2 support for Palm LifeDrive"); +MODULE_AUTHOR ("Marek Vasut <mar...@gm...>"); +MODULE_DESCRIPTION ("USB2 driver for Palm LifeDrive"); MODULE_LICENSE ("GPL"); Added: linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-usb2.h =================================================================== --- linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-usb2.h (rev 0) +++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-usb2.h 2007-03-30 21:01:50 UTC (rev 948) @@ -0,0 +1,125 @@ +/* + * palmld-usb2.h + * + * Cypress EZUSB SX2 - CY7C68001 External master register definitions + * SX2 is an USB2 controller in PalmOne LifeDrive Handheld Computer + * + * Author: Marek Vasut <mar...@gm...> + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * + * + */ +#ifndef _INCLUDE_PALMLD_USB2_H_ + +#define _INCLUDE_PALMLD_USB2_H_ + +#include <asm/arch/palmld-gpio.h> + +/*************************************************** + * SX2 REGISTERS * + ***************************************************/ + +/* General configuration */ +#define PALMLD_USB2_REG_IFCONFIG 0x01 +#define PALMLD_USB2_REG_FLAGSAB 0x02 +#define PALMLD_USB2_REG_FLAGSCD 0x03 +#define PALMLD_USB2_REG_POLAR 0x04 +#define PALMLD_USB2_REG_REVID 0x05 + +/* Endpoint configuration */ +#define PALMLD_USB2_REG_EP2CFG 0x06 +#define PALMLD_USB2_REG_EP4CFG 0x07 +#define PALMLD_USB2_REG_EP6CFG 0x08 +#define PALMLD_USB2_REG_EP8CFG 0x09 +#define PALMLD_USB2_REG_EP2PKTLENH 0x0A +#define PALMLD_USB2_REG_EP2PKTLENL 0x0B +#define PALMLD_USB2_REG_EP4PKTLENH 0x0C +#define PALMLD_USB2_REG_EP4PKTLENL 0x0D +#define PALMLD_USB2_REG_EP6PKTLENH 0x0E +#define PALMLD_USB2_REG_EP6PKTLENL 0x0F +#define PALMLD_USB2_REG_EP8PKTLENH 0x10 +#define PALMLD_USB2_REG_EP8PKTLENL 0x11 +#define PALMLD_USB2_REG_EP2PFH 0x12 +#define PALMLD_USB2_REG_EP2PFL 0x13 +#define PALMLD_USB2_REG_EP4PFH 0x14 +#define PALMLD_USB2_REG_EP4PFL 0x15 +#define PALMLD_USB2_REG_EP6PFH 0x16 +#define PALMLD_USB2_REG_EP6PFL 0x17 +#define PALMLD_USB2_REG_EP8PFH 0x18 +#define PALMLD_USB2_REG_EP8PFL 0x19 +#define PALMLD_USB2_REG_EP2ISOINPKTS 0x1A +#define PALMLD_USB2_REG_EP4ISOINPKTS 0x1B +#define PALMLD_USB2_REG_EP6ISOINPKTS 0x1C +#define PALMLD_USB2_REG_EP8ISOINPKTS 0x1D + +/* Flags */ +#define PALMLD_USB2_REG_EP24FLAGS 0x1E +#define PALMLD_USB2_REG_EP68FLAGS 0x1F + +/* INPKTEND/FLUSH */ +#define PALMLD_USB2_REG_INPKTEND 0x20 +#define PALMLD_USB2_REG_FLUSH 0x20 + +/* USB Configuration */ +#define PALMLD_USB2_REG_USBFRAMEH 0x2A +#define PALMLD_USB2_REG_USBFRAMEL 0x2B +#define PALMLD_USB2_REG_MICROFRAME 0x2C +#define PALMLD_USB2_REG_FNADDR 0x2D + +/* Interrupts */ +#define PALMLD_USB2_REG_INTENABLE 0x2E + +/* Descriptor */ +#define PALMLD_USB2_REG_DESC 0x30 + +/* Endpoint 0 */ +#define PALMLD_USB2_REG_EP0BUF 0x31 +#define PALMLD_USB2_REG_SETUP 0x32 +#define PALMLD_USB2_REG_EP0BC 0x33 + +/* Un-indexed Register control */ +#define PALMLD_USB2_REG_UIRC0 0x3A +#define PALMLD_USB2_REG_UIRC1 0x3B +#define PALMLD_USB2_REG_UIRC2 0x3C + +/* Un-indexed Registers in XDATA space */ +#define PALMLD_USB2_REG_FIFOPINPOLAR 0xE609 +#define PALMLD_USB2_REG_TOGCTL 0xE683 + +/*************************************************** + * SX2 ADDRESS * + ***************************************************/ + +#define PALMLD_USB2_ADDR_BASE PALMLD_USB_VIRT + +#define PALMLD_USB2_ADDR_IF(x) (*((volatile u16 *)x)) + +#define PALMLD_USB2_ADDR_FIFO2 PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0x0) +#define PALMLD_USB2_ADDR_FIFO4 PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0x2) +#define PALMLD_USB2_ADDR_FIFO6 PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0x4) +#define PALMLD_USB2_ADDR_FIFO8 PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0x6) +#define PALMLD_USB2_ADDR_CMD PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0x8) +#define PALMLD_USB2_ADDR_RESERVED1 PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0x10) +#define PALMLD_USB2_ADDR_RESERVED2 PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0x12) +#define PALMLD_USB2_ADDR_RESERVED3 PALMLD_USB2_ADDR_IF (PALMLD_USB2_ADDR_BASE + 0x14) + +/*************************************************** + * SX2 COMMANDS * + ***************************************************/ + +#define PALMLD_USB2_CMD_WRITE (0x00) +#define PALMLD_USB2_CMD_READ (0x40) +#define PALMLD_USB2_CMD_ADDR (0x80) + +/*************************************************** + * SX2 MISC * + ***************************************************/ + +#define PALMLD_USB2_ADDR_MASK (0x3f) + +#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z7...@us...> - 2007-03-29 18:55:04
|
Revision: 947 http://svn.sourceforge.net/hackndev/?rev=947&view=rev Author: z72ka Date: 2007-03-29 11:54:56 -0700 (Thu, 29 Mar 2007) Log Message: ----------- palmz72: enable gpio reset is safety on Z72 ...soory for my latest commit Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_pm.c Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_pm.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_pm.c 2007-03-29 13:53:13 UTC (rev 946) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_pm.c 2007-03-29 18:54:56 UTC (rev 947) @@ -54,7 +54,7 @@ /* disable GPIO reset - DO NOT REMOVE! */ - PCFR = PCFR_GPROD; + PCFR &= PCFR_GPR_EN; return 0; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2007-03-29 13:53:19
|
Revision: 946 http://svn.sourceforge.net/hackndev/?rev=946&view=rev Author: marex_z71 Date: 2007-03-29 06:53:13 -0700 (Thu, 29 Mar 2007) Log Message: ----------- PalmLD: Fix reset while suspended bug Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_pm.c Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_pm.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_pm.c 2007-03-29 11:02:13 UTC (rev 945) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_pm.c 2007-03-29 13:53:13 UTC (rev 946) @@ -67,7 +67,7 @@ SET_PALMLD_GPIO(SCREEN,0); /* disable GPIO reset, palm bootloader will hang us */ - PCFR &= PCFR_GPR_EN; + PCFR &= PCFR_GPROD; return 0; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z7...@us...> - 2007-03-29 11:02:16
|
Revision: 945 http://svn.sourceforge.net/hackndev/?rev=945&view=rev Author: z72ka Date: 2007-03-29 04:02:13 -0700 (Thu, 29 Mar 2007) Log Message: ----------- palmz72: fixed safety acquisition for suspend - now disabling GPIO reset works Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_pm.c Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_pm.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_pm.c 2007-03-29 07:33:00 UTC (rev 944) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_pm.c 2007-03-29 11:02:13 UTC (rev 945) @@ -54,7 +54,7 @@ /* disable GPIO reset - DO NOT REMOVE! */ - PCFR &= PCFR_GPR_EN; + PCFR = PCFR_GPROD; return 0; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z7...@us...> - 2007-03-29 07:33:04
|
Revision: 944 http://svn.sourceforge.net/hackndev/?rev=944&view=rev Author: z72ka Date: 2007-03-29 00:33:00 -0700 (Thu, 29 Mar 2007) Log Message: ----------- palmtx: safety acquisition for suspend (disabling reset during sleep), removing non-existent pcmcia driver from config, clear code Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Kconfig linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Makefile linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_pm.c Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Kconfig =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Kconfig 2007-03-28 18:32:04 UTC (rev 943) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Kconfig 2007-03-29 07:33:00 UTC (rev 944) @@ -4,13 +4,6 @@ help This enables support for Palm TX handheld. -config PALMTX_PCMCIA - tristate "Palm TX PCMCIA driver" - depends on MACH_XSCALE_PALMTX - default y if MACH_XSCALE_PALMTX - help - PCMCIA driver for Palm TX - config PALMTX_DEBUG bool "Debug output for Palm TX" depends on MACH_XSCALE_PALMTX Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Makefile =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Makefile 2007-03-28 18:32:04 UTC (rev 943) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Makefile 2007-03-29 07:33:00 UTC (rev 944) @@ -5,4 +5,4 @@ obj-$(CONFIG_MACH_XSCALE_PALMTX) += palmtx.o obj-$(CONFIG_PALMTX_BATTERY) += palmtx_battery.o obj-$(CONFIG_PM) += palmtx_pm.o -obj-$(CONFIG_PALMTX_PCMCIA) += palmtx_pcmcia.o +#obj-$(CONFIG_PALMTX_PCMCIA) += palmtx_pcmcia.o Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c 2007-03-28 18:32:04 UTC (rev 943) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c 2007-03-29 07:33:00 UTC (rev 944) @@ -49,9 +49,9 @@ #define DEBUG -/** - * SD/MMC card controller - */ +/************************** + * SD/MMC card controller * + **************************/ static int palmtx_mci_init(struct device *dev, irqreturn_t (*palmtx_detect_int)(int, void *), void *data) { @@ -100,7 +100,10 @@ }; -// Keypad driver +/********** + * Keypad * + **********/ + static struct pxa27x_keyboard_platform_data palmtx_kbd_data = { .nr_rows = 4, .nr_cols = 3, @@ -148,7 +151,9 @@ }; -// backlight +/************* + * Backlight * + *************/ static void palmtx_bl_on(void){ SET_GPIO(GPIO_NR_PALMTX_BL_POWER, 1); @@ -179,7 +184,9 @@ }; -// IRDA +/******** + * IRDA * + ********/ static void palmtx_irda_transceiver_mode(struct device *dev, int mode) { @@ -188,17 +195,17 @@ local_irq_save(flags); if (mode & IR_SIRMODE){ - printk (KERN_INFO "palmtx_irda: setting mode to SIR\n"); + printk (KERN_INFO "IrDA: setting mode to SIR\n"); } else if (mode & IR_FIRMODE){ - printk (KERN_INFO "palmtx_irda: setting mode to FIR\n"); + printk (KERN_INFO "IrDA: setting mode to FIR\n"); } if (mode & IR_OFF){ - printk (KERN_INFO "palmtx_irda: turning tranceiver OFF\n"); + printk (KERN_INFO "IrDA: turning OFF\n"); SET_GPIO(GPIO_NR_PALMTX_IR_DISABLE, 1); } else { - printk (KERN_INFO "palmtx_irda: turning tranceiver ON\n"); + printk (KERN_INFO "IrDA: turning ON\n"); SET_GPIO(GPIO_NR_PALMTX_IR_DISABLE, 0); SET_GPIO(GPIO_NR_PALMTX_ICP_TXD_MD, 1); mdelay(30); @@ -214,13 +221,10 @@ .transceiver_mode = palmtx_irda_transceiver_mode, }; - - - - - -// UDC (USB gadget controller) - +/******* + * USB * + *******/ + static int palmtx_udc_is_connected (void){ int ret = !(GET_GPIO(GPIO_NR_PALMTX_USB_DETECT)); if (ret) @@ -258,9 +262,9 @@ -/** - * * AC97 audio controller - * */ +/************************* + * AC97 audio controller * + *************************/ static pxa2xx_audio_ops_t palmtx_audio_ops = { /* @@ -296,7 +300,10 @@ &palmtx_backlight, }; - +/*************** + * framebuffer * + ***************/ + /* * framebuffer settings as from palmos: * @@ -352,8 +359,10 @@ iotable_init(palmtx_io_desc, ARRAY_SIZE(palmtx_io_desc)); } +/**************** + * Init Machine * + ****************/ - static void __init palmtx_init(void) { // disable primary codec interrupt to prevent WM9712 constantly interrupting the CPU Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_pm.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_pm.c 2007-03-28 18:32:04 UTC (rev 943) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_pm.c 2007-03-29 07:33:00 UTC (rev 944) @@ -32,10 +32,9 @@ static int palmtx_suspend(struct device *dev, pm_message_t state) { /* Wake-Up on RTC event, etc. */ - PWER |= PWER_RTC | PWER_WEP1 | PWER_GPIO14 | PWER_GPIO10 | PWER_GPIO13 ; - PRER |= PWER_GPIO14 | PWER_GPIO10 | PWER_GPIO13 ; + PWER |= PWER_RTC | PWER_WEP1 ; - /* Wakeup by keyboard - in progress */ + /* Wakeup by keyboard */ PKWR = 0xe0000; /* Enabled Deep-Sleep mode */ @@ -56,8 +55,8 @@ SET_PALMTX_GPIO(USB_POWER,0); - /* disable GPIO reset - DO NOT REMOVE! */ - PCFR &= PCFR_GPR_EN; + /* disable GPIO reset - DO NOT REMOVE!!!!!!!! Palm totally hangs on reset without disabling GPIO reset during sleep */ + PCFR = PCFR_GPROD; return 0; } @@ -65,7 +64,7 @@ static int palmtx_resume(struct device *dev) { - /* Disabled Deep-Sleep mode ?? */ + /* Disabled Deep-Sleep mode */ PCFR &= PCFR_DS; /* Re-enable GPIO reset */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z7...@us...> - 2007-03-28 18:32:06
|
Revision: 943 http://svn.sourceforge.net/hackndev/?rev=943&view=rev Author: z72ka Date: 2007-03-28 11:32:04 -0700 (Wed, 28 Mar 2007) Log Message: ----------- palmtx: finalize suspend and resume - added powering off/on LCD and BL, USB Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_pm.c Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_pm.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_pm.c 2007-03-28 18:29:58 UTC (rev 942) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_pm.c 2007-03-28 18:32:04 UTC (rev 943) @@ -49,11 +49,11 @@ {} /* Turn off LCD power */ - //SET_PALMZ72_GPIO(LCD_POWER,0); + SET_PALMTX_GPIO(LCD_POWER,0); /* Turn screen off */ - //SET_PALMZ72_GPIO(SCREEN,0); + SET_PALMTX_GPIO(BL_POWER,0); /* Turn off USB power */ - //SET_PALMZ72_GPIO(USB_POWER,0); + SET_PALMTX_GPIO(USB_POWER,0); /* disable GPIO reset - DO NOT REMOVE! */ @@ -75,11 +75,11 @@ /* Here are all of special to resume Palm TX */ /* Turn on LCD power */ - //SET_PALMZ72_GPIO(LCD_POWER,1); + SET_PALMTX_GPIO(LCD_POWER,1); /* Turn screen on */ - //SET_PALMZ72_GPIO(SCREEN,1); + SET_PALMTX_GPIO(BL_POWER,1); /* Turn on USB power */ - //SET_PALMZ72_GPIO(USB_POWER,1); + SET_PALMTX_GPIO(USB_POWER,1); return 0; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z7...@us...> - 2007-03-28 18:29:59
|
Revision: 942 http://svn.sourceforge.net/hackndev/?rev=942&view=rev Author: z72ka Date: 2007-03-28 11:29:58 -0700 (Wed, 28 Mar 2007) Log Message: ----------- palmtx: modified high level of battery to 4,1V and added some utility macros for GPIOs Modified Paths: -------------- linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-gpio.h linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-init.h Modified: linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-gpio.h =================================================================== --- linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-gpio.h 2007-03-28 17:34:13 UTC (rev 941) +++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-gpio.h 2007-03-28 18:29:58 UTC (rev 942) @@ -6,7 +6,7 @@ * Based on palmld-gpio.h by Alex Osborne * * Authors: Cristiano P. <cristianop AT users DOT sourceforge DOT net> - * + * Jan Herman <2h...@se...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -79,4 +79,37 @@ #define IRQ_GPIO_PALMTX_GPIO_RESET IRQ_GPIO(GPIO_NR_PALMTX_GPIO_RESET) + +/* Utility macros */ + +#define GET_PALMTX_GPIO(gpio) \ + (GPLR(GPIO_NR_PALMTX_ ## gpio) & GPIO_bit(GPIO_NR_PALMTX_ ## gpio)) + +#define SET_PALMTX_GPIO(gpio, setp) \ + do { \ + if (setp) \ + GPSR(GPIO_NR_PALMTX_ ## gpio) = GPIO_bit(GPIO_NR_PALMTX_ ## gpio); \ + else \ + GPCR(GPIO_NR_PALMTX_ ## gpio) = GPIO_bit(GPIO_NR_PALMTX_ ## gpio); \ + } while (0) + +#define SET_PALMTX_GPIO_N(gpio, setp) \ + do { \ + if (setp) \ + GPCR(GPIO_NR_PALMTX_ ## gpio) = GPIO_bit(GPIO_NR_PALMTX_ ## gpio); \ + else \ + GPSR(GPIO_NR_PALMTX_ ## gpio) = GPIO_bit(GPIO_NR_PALMTX_ ## gpio); \ + } while (0) + + +#define GET_GPIO(gpio) (GPLR(gpio) & GPIO_bit(gpio)) + +#define SET_GPIO(gpio, setp) \ + do { \ + if (setp) \ + GPSR(gpio) = GPIO_bit(gpio); \ + else \ + GPCR(gpio) = GPIO_bit(gpio); \ + } while (0) + #endif Modified: linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-init.h =================================================================== --- linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-init.h 2007-03-28 17:34:13 UTC (rev 941) +++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-init.h 2007-03-28 18:29:58 UTC (rev 942) @@ -53,7 +53,7 @@ // BATTERY -#define PALMTX_BAT_MAX_VOLTAGE 4000 // 3.99v current voltage at max charge as from Filez +#define PALMTX_BAT_MAX_VOLTAGE 4100 // 3.99v current voltage at max charge as from Filez #define PALMTX_BAT_MIN_VOLTAGE 3600 // 3.60v critical voltage as from FileZ #define PALMTX_BAT_MAX_CURRENT 0 // unknokn #define PALMTX_BAT_MIN_CURRENT 0 // unknown This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z7...@us...> - 2007-03-28 17:34:16
|
Revision: 941 http://svn.sourceforge.net/hackndev/?rev=941&view=rev Author: z72ka Date: 2007-03-28 10:34:13 -0700 (Wed, 28 Mar 2007) Log Message: ----------- palmtx: Modified key power to KEY_F8 for suspending on button in Opie or GPE Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c 2007-03-28 17:33:04 UTC (rev 940) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c 2007-03-28 17:34:13 UTC (rev 941) @@ -106,7 +106,7 @@ .nr_cols = 3, .keycodes = { { /* row 0 */ - KEY_POWER, + KEY_F8, KEY_F9, KEY_ENTER, }, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z7...@us...> - 2007-03-28 17:33:06
|
Revision: 940 http://svn.sourceforge.net/hackndev/?rev=940&view=rev Author: z72ka Date: 2007-03-28 10:33:04 -0700 (Wed, 28 Mar 2007) Log Message: ----------- resuming on keypad (power button) Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_pm.c Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_pm.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_pm.c 2007-03-28 17:32:01 UTC (rev 939) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_pm.c 2007-03-28 17:33:04 UTC (rev 940) @@ -35,9 +35,9 @@ PWER |= PWER_RTC | PWER_WEP1 | PWER_GPIO14 | PWER_GPIO10 | PWER_GPIO13 ; PRER |= PWER_GPIO14 | PWER_GPIO10 | PWER_GPIO13 ; - /* Wakeup by keyboard - in progress */ - PKWR = 0xfffff; - + /* Wakeup by keyboard - in progress */ + PKWR = 0xe0000; + /* Enabled Deep-Sleep mode */ PCFR |= PCFR_DS; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z7...@us...> - 2007-03-28 17:32:10
|
Revision: 939 http://svn.sourceforge.net/hackndev/?rev=939&view=rev Author: z72ka Date: 2007-03-28 10:32:01 -0700 (Wed, 28 Mar 2007) Log Message: ----------- fixed ifdef for PalmLD and PalmTX Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/mach-pxa/pxa27x.c Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/pxa27x.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/pxa27x.c 2007-03-28 11:15:33 UTC (rev 938) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/pxa27x.c 2007-03-28 17:32:01 UTC (rev 939) @@ -138,7 +138,7 @@ { extern void pxa_cpu_standby(void); extern void pxa_cpu_suspend(unsigned int); -#if defined(MACH_XSCALE_PALMLD) || defined(MACH_XSCALE_PALMTX) || defined(CONFIG_MACH_PALMZ72) +#if defined(CONFIG_MACH_XSCALE_PALMLD) || defined(CONFIG_MACH_XSCALE_PALMTX) || defined(CONFIG_MACH_PALMZ72) /* For safety. suspend_mem puts the device in an unresetable state. * On TX one needs to desolder the battery to get out of it. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z7...@us...> - 2007-03-28 11:15:36
|
Revision: 938 http://svn.sourceforge.net/hackndev/?rev=938&view=rev Author: z72ka Date: 2007-03-28 04:15:33 -0700 (Wed, 28 Mar 2007) Log Message: ----------- palmtx: make buildable with 2.6.20 and support fot new features (PM, battery, pxapwm-bl, wm97xx) Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/configs/palmtx_defconfig Modified: linux4palm/linux/trunk/arch/arm/configs/palmtx_defconfig =================================================================== --- linux4palm/linux/trunk/arch/arm/configs/palmtx_defconfig 2007-03-28 11:06:48 UTC (rev 937) +++ linux4palm/linux/trunk/arch/arm/configs/palmtx_defconfig 2007-03-28 11:15:33 UTC (rev 938) @@ -1,56 +1,68 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.17-hnd0 -# Fri Oct 20 20:36:57 2006 +# Linux kernel version: 2.6.20-hnd0 +# Wed Mar 28 10:35:44 2007 # CONFIG_ARM=y +# CONFIG_GENERIC_TIME is not set CONFIG_MMU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_MTD_XIP=y CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # # Code maturity level options # CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 # # General setup # CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y -# CONFIG_POSIX_MQUEUE is not set -# CONFIG_BSD_PROCESS_ACCT is not set -CONFIG_SYSCTL=y +# CONFIG_IPC_NS is not set +CONFIG_POSIX_MQUEUE=y +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set -# CONFIG_MINIMAL_OOPS is not set +CONFIG_SYSFS_DEPRECATED=y # CONFIG_RELAY is not set -CONFIG_INITRAMFS_SOURCE="../initramfs/root" -CONFIG_INITRAMFS_ROOT_UID=0 -CONFIG_INITRAMFS_ROOT_GID=0 +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_EMBEDDED=y CONFIG_UID16=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -# CONFIG_EMBEDDED is not set +CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y -CONFIG_ELF_CORE=y +# CONFIG_ELF_CORE is not set CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_SHMEM=y -CONFIG_USELIB=y -CONFIG_CORE_DUMP=y CONFIG_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 # CONFIG_SLOB is not set @@ -63,19 +75,22 @@ CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set -# CONFIG_KMOD is not set +CONFIG_KMOD=y # # Block layer # +CONFIG_BLOCK=y +# CONFIG_LBD is not set # CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set # # IO Schedulers # CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y +# CONFIG_IOSCHED_DEADLINE is not set CONFIG_IOSCHED_CFQ=y CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_DEADLINE is not set @@ -86,18 +101,28 @@ # # System Type # +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set # CONFIG_ARCH_CLPS7500 is not set # CONFIG_ARCH_CLPS711X is not set # CONFIG_ARCH_CO285 is not set # CONFIG_ARCH_EBSA110 is not set # CONFIG_ARCH_EP93XX is not set # CONFIG_ARCH_FOOTBRIDGE is not set -# CONFIG_ARCH_INTEGRATOR is not set -# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IOP13XX is not set # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP23XX is not set # CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_PNX4008 is not set CONFIG_ARCH_PXA=y # CONFIG_ARCH_RPC is not set # CONFIG_ARCH_SA1100 is not set @@ -105,12 +130,6 @@ # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_LH7A40X is not set # CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_VERSATILE is not set -# CONFIG_ARCH_REALVIEW is not set -# CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_H720X is not set -# CONFIG_ARCH_AAEC2000 is not set -# CONFIG_ARCH_AT91RM9200 is not set # # Intel PXA2xx Implementations @@ -119,12 +138,14 @@ # CONFIG_MACH_LOGICPD_PXA270 is not set # CONFIG_MACH_MAINSTONE is not set # CONFIG_ARCH_PXA_IDP is not set +# CONFIG_TOSHIBA_TMIO_OHCI is not set # CONFIG_ARCH_ESERIES is not set # CONFIG_MACH_A620 is not set # CONFIG_MACH_A716 is not set +# CONFIG_MACH_A730 is not set # CONFIG_ARCH_H1900 is not set # CONFIG_ARCH_H2200 is not set -# CONFIG_ARCH_H3900 is not set +# CONFIG_MACH_H3900 is not set # CONFIG_MACH_H4000 is not set # CONFIG_MACH_H4700 is not set # CONFIG_MACH_HX2750 is not set @@ -136,26 +157,32 @@ # CONFIG_MACH_HTCAPACHE is not set # CONFIG_MACH_BLUEANGEL is not set # CONFIG_MACH_HTCBEETLES is not set +# CONFIG_MACH_HW6900 is not set +# CONFIG_ARCH_AXIMX3 is not set # CONFIG_ARCH_AXIMX5 is not set -# CONFIG_ARCH_AXIMX3 is not set +# CONFIG_MACH_X50 is not set # CONFIG_ARCH_ROVERP1 is not set # CONFIG_ARCH_ROVERP5P is not set # CONFIG_MACH_XSCALE_PALMLD is not set +# CONFIG_MACH_XSCALE_PALMTREO650 is not set +# CONFIG_MACH_XSCALE_TREO680 is not set +# CONFIG_MACH_T700WX is not set # CONFIG_MACH_TUNGE2 is not set # CONFIG_MACH_T3XSCALE is not set # CONFIG_MACH_XSCALE_PALMTT5 is not set CONFIG_MACH_XSCALE_PALMTX=y -CONFIG_PALMTX_AC97=m # CONFIG_PALMTX_PCMCIA is not set # CONFIG_PALMTX_DEBUG is not set +CONFIG_PALMTX_BATTERY=m +CONFIG_PALMTX_PM=y # CONFIG_MACH_PALMZ72 is not set # CONFIG_MACH_OMAP_PALMTC is not set +# CONFIG_MACH_ZIRE31 is not set +CONFIG_GPIOED=m +CONFIG_GPIOEDNG=m # CONFIG_PXA_SHARPSL is not set +# CONFIG_MACH_TRIZEPS4 is not set CONFIG_PXA27x=y -CONFIG_PXA_RTC_EPOCH=1970 -# CONFIG_SA1100_H3100 is not set -# CONFIG_SA1100_H3600 is not set -# CONFIG_SA1100_H3800 is not set # # Linux As Bootloader @@ -171,27 +198,26 @@ CONFIG_CPU_ABRT_EV5T=y CONFIG_CPU_CACHE_VIVT=y CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y # # Processor Features # CONFIG_ARM_THUMB=y +# CONFIG_CPU_DCACHE_DISABLE is not set +CONFIG_IWMMXT=y # CONFIG_ARMBOOT_PROC is not set CONFIG_XSCALE_PMU=y # CONFIG_KEXEC is not set # -# Compaq/iPAQ Platforms -# - -# # Compaq/iPAQ Drivers # # # Compaq/HP iPAQ Drivers # -# CONFIG_IPAQ_HAMCOP is not set # # Bus support @@ -205,10 +231,11 @@ # # Kernel Features # -# CONFIG_PREEMPT is not set -CONFIG_NO_IDLE_HZ=y +CONFIG_PREEMPT=y +# CONFIG_NO_IDLE_HZ is not set CONFIG_HZ=100 -# CONFIG_AEABI is not set +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -218,6 +245,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set CONFIG_ALIGNMENT_TRAP=y # @@ -250,13 +278,16 @@ CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set -# CONFIG_ARTHUR is not set # # Power management options # -# CONFIG_PM is not set -# CONFIG_APM is not set +CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set +# CONFIG_DPM_DEBUG is not set +# CONFIG_PM_SYSFS_DEPRECATED is not set +CONFIG_APM=y # # Networking @@ -267,12 +298,13 @@ # Networking options # # CONFIG_NETDEBUG is not set -CONFIG_PACKET=y +CONFIG_PACKET=m # CONFIG_PACKET_MMAP is not set CONFIG_UNIX=y CONFIG_XFRM=y # CONFIG_XFRM_USER is not set -CONFIG_NET_KEY=y +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_NET_KEY is not set CONFIG_INET=y # CONFIG_IP_MULTICAST is not set # CONFIG_IP_ADVANCED_ROUTER is not set @@ -287,13 +319,19 @@ # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_BIC=y +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set # CONFIG_IPV6 is not set # CONFIG_INET6_XFRM_TUNNEL is not set # CONFIG_INET6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK is not set # CONFIG_NETFILTER is not set # @@ -319,7 +357,6 @@ # CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set -# CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set @@ -333,22 +370,22 @@ # # CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set -CONFIG_IRDA=m +CONFIG_IRDA=y # # IrDA protocols # -CONFIG_IRLAN=m -CONFIG_IRNET=m +# CONFIG_IRLAN is not set +# CONFIG_IRNET is not set CONFIG_IRCOMM=m -CONFIG_IRDA_ULTRA=y +# CONFIG_IRDA_ULTRA is not set # # IrDA options # # CONFIG_IRDA_CACHE_LAST_LSAP is not set # CONFIG_IRDA_FAST_RR is not set -CONFIG_IRDA_DEBUG=y +# CONFIG_IRDA_DEBUG is not set # # Infrared-port device drivers @@ -357,31 +394,45 @@ # # SIR device drivers # -CONFIG_IRTTY_SIR=m +# CONFIG_IRTTY_SIR is not set # # Dongle support # -# CONFIG_DONGLE is not set # # Old SIR device drivers # -CONFIG_IRPORT_SIR=m +# CONFIG_IRPORT_SIR is not set # # Old Serial dongle support # -# CONFIG_DONGLE_OLD is not set # # FIR device drivers # -CONFIG_PXA_FICP=m -# CONFIG_BT is not set -# CONFIG_IEEE80211 is not set +CONFIG_PXA_FICP=y +CONFIG_BT=m +# CONFIG_BT_L2CAP is not set +# CONFIG_BT_SCO is not set # +# Bluetooth device drivers +# +CONFIG_BT_HCIUART=m +# CONFIG_BT_HCIUART_H4 is not set +# CONFIG_BT_HCIUART_BCSP is not set +# CONFIG_BT_HCIVHCI is not set +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_SOFTMAC=m +# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set +CONFIG_WIRELESS_EXT=y + +# # Device Drivers # @@ -390,7 +441,8 @@ # CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y -CONFIG_FW_LOADER=y +# CONFIG_FW_LOADER is not set +# CONFIG_SYS_HYPERVISOR is not set # # Connector - unified userspace <-> kernelspace linker @@ -415,12 +467,13 @@ # Block devices # # CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_CRYPTOLOOP is not set -CONFIG_BLK_DEV_NBD=m +# CONFIG_BLK_DEV_NBD is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 CONFIG_BLK_DEV_INITRD=y # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set @@ -435,8 +488,14 @@ # # CONFIG_RAID_ATTRS is not set # CONFIG_SCSI is not set +# CONFIG_SCSI_NETLINK is not set # +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +# CONFIG_ATA is not set + +# # Multi-device support (RAID and LVM) # # CONFIG_MD is not set @@ -466,11 +525,16 @@ # # PHY device support # +# CONFIG_PHYLIB is not set # # Ethernet (10 or 100Mbit) # -# CONFIG_NET_ETHERNET is not set +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_SMC91X is not set +# CONFIG_DM9000 is not set +# CONFIG_SMC911X is not set # # Ethernet (1000 Mbit) @@ -493,7 +557,7 @@ # Wan interfaces # # CONFIG_WAN is not set -CONFIG_PPP=m +CONFIG_PPP=y # CONFIG_PPP_MULTILINK is not set # CONFIG_PPP_FILTER is not set # CONFIG_PPP_ASYNC is not set @@ -503,6 +567,7 @@ # CONFIG_PPP_MPPE is not set # CONFIG_PPPOE is not set # CONFIG_SLIP is not set +CONFIG_SLHC=y # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set @@ -517,17 +582,17 @@ # Input device support # CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set # # Userland interfaces # -CONFIG_INPUT_MOUSEDEV=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480 +# CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set -# CONFIG_INPUT_TSDEV is not set -CONFIG_INPUT_EVDEV=m +CONFIG_INPUT_TSDEV=y +CONFIG_INPUT_TSDEV_SCREEN_X=320 +CONFIG_INPUT_TSDEV_SCREEN_Y=480 +CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set # @@ -540,19 +605,36 @@ # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_STOWAWAY is not set -CONFIG_KEYBOARD_PXA27x=m -CONFIG_KEYBOARD_PALMIR=m +# CONFIG_GPIO_KEYS is not set +CONFIG_KEYBOARD_PXA27x=y +# CONFIG_KEYBOARD_PALMWK is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set -# CONFIG_INPUT_TOUCHSCREEN is not set -CONFIG_INPUT_MISC=y -# CONFIG_INPUT_UINPUT is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_ADC is not set +# CONFIG_TOUCHSCREEN_ADC_DEBOUNCE is not set +# CONFIG_TOUCHSCREEN_UCB1400 is not set +CONFIG_TOUCHSCREEN_WM97XX=y +# CONFIG_TOUCHSCREEN_WM9705 is not set +CONFIG_TOUCHSCREEN_WM9712=y +# CONFIG_TOUCHSCREEN_WM9713 is not set +# CONFIG_TOUCHSCREEN_WM97XX_PXA is not set +# CONFIG_INPUT_MISC is not set # # Hardware I/O ports # -CONFIG_SERIO=m -CONFIG_SERIO_SERPORT=m +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +# CONFIG_SERIO_LIBPS2 is not set # CONFIG_SERIO_RAW is not set # CONFIG_GAMEPORT is not set @@ -562,6 +644,7 @@ CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set # CONFIG_SERIAL_NONSTANDARD is not set # @@ -575,6 +658,7 @@ CONFIG_SERIAL_PXA=y CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_SERIAL_PXA_COUNT=4 +# CONFIG_SERIAL_PXA_IR is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_UNIX98_PTYS=y @@ -582,57 +666,6 @@ CONFIG_LEGACY_PTY_COUNT=256 # -# I2C support -# -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y - -# -# I2C Algorithms -# -# CONFIG_I2C_ALGOBIT is not set -# CONFIG_I2C_ALGOPCF is not set -# CONFIG_I2C_ALGOPCA is not set -CONFIG_I2C_ALGOPXA=y - -# -# I2C Hardware Bus support -# -# CONFIG_I2C_ELV is not set -CONFIG_I2C_PXA=y -CONFIG_I2C_PXA_SLAVE=y -# CONFIG_I2C_PARPORT_LIGHT is not set -# CONFIG_I2C_STUB is not set -# CONFIG_I2C_PCA_ISA is not set - -# -# Miscellaneous I2C Chip support -# -# CONFIG_SENSORS_DS1337 is not set -# CONFIG_SENSORS_DS1374 is not set -# CONFIG_SENSORS_EEPROM is not set -# CONFIG_I2C_ADCM2650 is not set -# CONFIG_SENSORS_PCF8574 is not set -# CONFIG_SENSORS_PCA9539 is not set -# CONFIG_SENSORS_PCA9535 is not set -# CONFIG_SENSORS_PCF8591 is not set -# CONFIG_SENSORS_MAX6875 is not set -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_I2C_DEBUG_CHIP is not set - -# -# L3 serial bus support -# -# CONFIG_L3 is not set - -# -# Mice -# -# CONFIG_BUSMOUSE is not set - -# # IPMI # # CONFIG_IPMI_HANDLER is not set @@ -641,23 +674,24 @@ # Watchdog Cards # # CONFIG_WATCHDOG is not set -CONFIG_NVRAM=m +CONFIG_HW_RANDOM=m +# CONFIG_NVRAM is not set CONFIG_SA1100_RTC=m # CONFIG_DTLK is not set # CONFIG_R3964 is not set - -# -# Ftape, the floppy tape device driver -# # CONFIG_RAW_DRIVER is not set # # TPM devices # # CONFIG_TCG_TPM is not set -# CONFIG_TELCLOCK is not set # +# I2C support +# +# CONFIG_I2C is not set + +# # SPI support # CONFIG_SPI=y @@ -666,7 +700,7 @@ # # SPI Master Controller Drivers # -CONFIG_SPI_BITBANG=y +# CONFIG_SPI_BITBANG is not set CONFIG_SPI_PXA2XX=y # @@ -681,67 +715,52 @@ # # Hardware Monitoring support # -CONFIG_HWMON=m +# CONFIG_HWMON is not set # CONFIG_HWMON_VID is not set -# CONFIG_SENSORS_ADM1021 is not set -# CONFIG_SENSORS_ADM1025 is not set -# CONFIG_SENSORS_ADM1026 is not set -# CONFIG_SENSORS_ADM1031 is not set -# CONFIG_SENSORS_ADM9240 is not set -# CONFIG_SENSORS_ASB100 is not set -# CONFIG_SENSORS_ATXP1 is not set -# CONFIG_SENSORS_DS1621 is not set -# CONFIG_SENSORS_F71805F is not set -# CONFIG_SENSORS_FSCHER is not set -# CONFIG_SENSORS_FSCPOS is not set -# CONFIG_SENSORS_GL518SM is not set -# CONFIG_SENSORS_GL520SM is not set -# CONFIG_SENSORS_IT87 is not set -# CONFIG_SENSORS_LM63 is not set -# CONFIG_SENSORS_LM75 is not set -# CONFIG_SENSORS_LM77 is not set -# CONFIG_SENSORS_LM78 is not set -# CONFIG_SENSORS_LM80 is not set -# CONFIG_SENSORS_LM83 is not set -# CONFIG_SENSORS_LM85 is not set -# CONFIG_SENSORS_LM87 is not set -# CONFIG_SENSORS_LM90 is not set -# CONFIG_SENSORS_LM92 is not set -# CONFIG_SENSORS_MAX1619 is not set -# CONFIG_SENSORS_PC87360 is not set -# CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_SMSC47B397 is not set -# CONFIG_SENSORS_W83781D is not set -# CONFIG_SENSORS_W83792D is not set -# CONFIG_SENSORS_W83L785TS is not set -# CONFIG_SENSORS_W83627HF is not set -# CONFIG_SENSORS_W83627EHF is not set -# CONFIG_HWMON_DEBUG_CHIP is not set # +# Hardware Monitoring - Battery +# +CONFIG_BATTERY_MONITOR=y +# CONFIG_ADC_BATTERY is not set + +# +# L3 serial bus support +# +# CONFIG_L3 is not set + +# # SoC drivers # # CONFIG_SOC_MQ11XX is not set # CONFIG_SOC_T7L66XB is not set # CONFIG_SOC_TC6387XB is not set # CONFIG_SOC_TC6393XB is not set +# CONFIG_SOC_SAMCOP is not set +# CONFIG_SOC_HAMCOP is not set # CONFIG_HTC_ASIC2 is not set # CONFIG_HTC_ASIC3 is not set +# CONFIG_HTC_ASIC3_DS1WM is not set +# CONFIG_SOC_TSC2200 is not set # # Misc devices # -CONFIG_BATTERY_MONITOR=m +# CONFIG_BATTCHARGE_MONITOR is not set # # Multimedia Capabilities Port drivers # # CONFIG_MCP is not set +# CONFIG_ADC_ADS7846_SSP is not set +# CONFIG_ADC_AD7877 is not set +# CONFIG_TIFM_CORE is not set # # LED devices # -# CONFIG_NEW_LEDS is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y # # LED drivers @@ -750,14 +769,39 @@ # # LED Triggers # +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +# CONFIG_LEDS_TRIGGER_HWTIMER is not set +CONFIG_LEDS_TRIGGER_MMC_CARD=y +# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set +# CONFIG_LEDS_TRIGGER_SHARED is not set # # Multimedia devices # -# CONFIG_VIDEO_DEV is not set +CONFIG_VIDEO_DEV=y +CONFIG_VIDEO_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y CONFIG_VIDEO_V4L2=y # +# Video Capture Adapters +# + +# +# Video Capture Adapters +# +CONFIG_VIDEO_ADV_DEBUG=y +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +# CONFIG_VIDEO_VIVI is not set +# CONFIG_VIDEO_CPIA is not set +# CONFIG_PXA_CAMERA is not set + +# +# Radio Adapters +# + +# # Digital Video Broadcasting Devices # # CONFIG_DVB is not set @@ -765,19 +809,22 @@ # # Graphics support # +CONFIG_FIRMWARE_EDID=y CONFIG_FB=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_MACMODES is not set -CONFIG_FB_FIRMWARE_EDID=y -CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_TILEBLITTING is not set # CONFIG_FB_IMAGEON is not set # CONFIG_FB_S1D13XXX is not set CONFIG_FB_PXA=y -# CONFIG_FB_PXA_PARAMETERS is not set +CONFIG_FB_PXA_PARAMETERS=y +# CONFIG_FB_MBX is not set # CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_VSFB is not set # # Console display driver support @@ -786,43 +833,48 @@ CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set # # Logo configuration # CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_VGA16=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set CONFIG_LOGO_LINUX_CLUT224=y CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_BACKLIGHT_CLASS_DEVICE=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_DEVICE=y +# CONFIG_LCD_CLASS_DEVICE is not set # CONFIG_BACKLIGHT_CORGI is not set -CONFIG_BACKLIGHT_PXAPWM=m -CONFIG_LCD_CLASS_DEVICE=m -CONFIG_LCD_DEVICE=y +CONFIG_BACKLIGHT_PXAPWM=y # # Sound # -CONFIG_SOUND=m +CONFIG_SOUND=y # # Advanced Linux Sound Architecture # -CONFIG_SND=m -CONFIG_SND_TIMER=m -CONFIG_SND_PCM=m -CONFIG_SND_SEQUENCER=m -# CONFIG_SND_SEQ_DUMMY is not set +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +# CONFIG_SND_SEQUENCER is not set CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y CONFIG_SND_PCM_OSS_PLUGINS=y -CONFIG_SND_SEQUENCER_OSS=y # CONFIG_SND_DYNAMIC_MINORS is not set # CONFIG_SND_SUPPORT_OLD_API is not set # CONFIG_SND_VERBOSE_PROCFS is not set @@ -832,10 +884,8 @@ # # Generic devices # -CONFIG_SND_AC97_CODEC=m -CONFIG_SND_AC97_BUS=m +CONFIG_SND_AC97_CODEC=y # CONFIG_SND_DUMMY is not set -# CONFIG_SND_VIRMIDI is not set # CONFIG_SND_MTPAV is not set # CONFIG_SND_SERIAL_U16550 is not set # CONFIG_SND_MPU401 is not set @@ -843,24 +893,27 @@ # # ALSA ARM devices # -# CONFIG_SND_A716 is not set -# CONFIG_SND_H1910 is not set -# CONFIG_SND_H2200 is not set -# CONFIG_SND_H4000 is not set -# CONFIG_SND_HTCMAGICIAN is not set -# CONFIG_SND_HX4700 is not set -# CONFIG_SND_HTCUNIVERSAL is not set -# CONFIG_SND_H5XXX_AK4535 is not set -CONFIG_SND_PXA2xx_I2SOUND=m -CONFIG_SND_PXA2XX_PCM=m -CONFIG_SND_PXA2XX_AC97=m +# CONFIG_SND_PXA2xx_I2SOUND is not set +CONFIG_SND_PXA2XX_PCM=y +CONFIG_SND_PXA2XX_AC97=y # +# SoC audio support +# +# CONFIG_SND_SOC is not set + +# # Open Sound System # # CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=y # +# HID Devices +# +CONFIG_HID=y + +# # USB support # CONFIG_USB_ARCH_HAS_HCD=y @@ -875,17 +928,18 @@ # # USB Gadget Support # -CONFIG_USB_GADGET=m +CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG_FILES is not set CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_NET2280 is not set # CONFIG_USB_GADGET_PXA2XX is not set CONFIG_USB_GADGET_PXA27X=y -CONFIG_USB_PXA27X=m +CONFIG_USB_PXA27X=y # CONFIG_USB_PXA27X_DMA is not set # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_MQ11XX is not set # CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_S3C2410 is not set # CONFIG_USB_GADGET_OMAP is not set # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set @@ -893,11 +947,11 @@ # CONFIG_USB_ZERO is not set CONFIG_USB_ETH=m # CONFIG_USB_ETH_RNDIS is not set -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -# CONFIG_USB_FILE_STORAGE_TEST is not set -CONFIG_USB_G_SERIAL=m -CONFIG_USB_G_CHAR=m +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_CHAR is not set # # MMC/SD Card support @@ -906,16 +960,16 @@ # CONFIG_MMC_DEBUG is not set CONFIG_MMC_BLOCK=y CONFIG_MMC_PXA=y +# CONFIG_MMC_TIFM_SD is not set # CONFIG_MMC_TMIO is not set # CONFIG_MMC_SAMCOP is not set -# CONFIG_MMC_ASIC3 is not set -# CONFIG_MMC_WBSD_PALMT3 is not set # # Real Time Clock # CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=m +CONFIG_RTC_EPOCH=1970 # # RTC interfaces @@ -923,17 +977,19 @@ CONFIG_RTC_INTF_SYSFS=m CONFIG_RTC_INTF_PROC=m CONFIG_RTC_INTF_DEV=m +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set # # RTC drivers # -# CONFIG_RTC_DRV_X1205 is not set -# CONFIG_RTC_DRV_DS1672 is not set -# CONFIG_RTC_DRV_PCF8563 is not set -# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_RS5C348 is not set # CONFIG_RTC_DRV_M48T86 is not set CONFIG_RTC_DRV_SA1100=m # CONFIG_RTC_DRV_TEST is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_V3020 is not set # # File systems @@ -942,18 +998,20 @@ # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set # CONFIG_EXT3_FS is not set +# CONFIG_EXT4DEV_FS is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set # CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set -CONFIG_MINIX_FS=m +# CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set -CONFIG_INOTIFY=y +# CONFIG_INOTIFY is not set # CONFIG_QUOTA is not set CONFIG_DNOTIFY=y -# CONFIG_AUTOFS_FS is not set -# CONFIG_AUTOFS4_FS is not set +CONFIG_AUTOFS_FS=y +CONFIG_AUTOFS4_FS=y # CONFIG_FUSE_FS is not set # @@ -965,9 +1023,9 @@ # # DOS/FAT/NT Filesystems # -CONFIG_FAT_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # CONFIG_NTFS_FS is not set @@ -976,8 +1034,10 @@ # Pseudo filesystems # CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y CONFIG_SYSFS=y CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y # CONFIG_CONFIGFS_FS is not set @@ -986,23 +1046,24 @@ # Miscellaneous filesystems # # CONFIG_ADFS_FS is not set -CONFIG_AFFS_FS=m +# CONFIG_AFFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -CONFIG_CRAMFS=m -CONFIG_SQUASHFS=m +# CONFIG_CRAMFS is not set +CONFIG_SQUASHFS=y CONFIG_SQUASHFS_EMBEDDED=y CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 -CONFIG_SQUASHFS_VMALLOC=y +# CONFIG_SQUASHFS_VMALLOC is not set +# CONFIG_SQUASHFS_LZMA is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set -CONFIG_UNION_FS=m +# CONFIG_UNION_FS is not set # # Network File Systems @@ -1017,8 +1078,7 @@ CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set -CONFIG_SMB_FS=m -# CONFIG_SMB_NLS_DEFAULT is not set +# CONFIG_SMB_FS is not set # CONFIG_CIFS is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set @@ -1049,7 +1109,7 @@ # CONFIG_NLS_CODEPAGE_863 is not set # CONFIG_NLS_CODEPAGE_864 is not set # CONFIG_NLS_CODEPAGE_865 is not set -# CONFIG_NLS_CODEPAGE_866 is not set +CONFIG_NLS_CODEPAGE_866=y # CONFIG_NLS_CODEPAGE_869 is not set # CONFIG_NLS_CODEPAGE_936 is not set # CONFIG_NLS_CODEPAGE_950 is not set @@ -1061,7 +1121,7 @@ # CONFIG_NLS_CODEPAGE_1251 is not set # CONFIG_NLS_ASCII is not set CONFIG_NLS_ISO8859_1=y -# CONFIG_NLS_ISO8859_2 is not set +CONFIG_NLS_ISO8859_2=y # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set # CONFIG_NLS_ISO8859_5 is not set @@ -1071,11 +1131,16 @@ # CONFIG_NLS_ISO8859_13 is not set # CONFIG_NLS_ISO8859_14 is not set # CONFIG_NLS_ISO8859_15 is not set -# CONFIG_NLS_KOI8_R is not set +CONFIG_NLS_KOI8_R=y # CONFIG_NLS_KOI8_U is not set CONFIG_NLS_UTF8=y # +# Distributed Lock Manager +# +# CONFIG_DLM is not set + +# # Profiling support # # CONFIG_PROFILING is not set @@ -1084,14 +1149,16 @@ # Kernel hacking # # CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_MUST_CHECK=y # CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set # CONFIG_SMALLOOPS is not set # CONFIG_DEBUG_KERNEL is not set CONFIG_LOG_BUF_SHIFT=14 -CONFIG_DEBUG_BUGVERBOSE=y -# CONFIG_DEBUG_FS is not set +# CONFIG_DEBUG_BUGVERBOSE is not set CONFIG_FRAME_POINTER=y -# CONFIG_UNWIND_INFO is not set # CONFIG_DEBUG_USER is not set # @@ -1103,7 +1170,39 @@ # # Cryptographic options # -# CONFIG_CRYPTO is not set +CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=m +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_MANAGER=m +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_MD4 is not set +# CONFIG_CRYPTO_MD5 is not set +# CONFIG_CRYPTO_SHA1 is not set +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_GF128MUL is not set +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_CBC=m +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_DES is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_TWOFISH is not set +# CONFIG_CRYPTO_SERPENT is not set +CONFIG_CRYPTO_AES=m +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_TEA is not set +CONFIG_CRYPTO_ARC4=m +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_TEST is not set # # Hardware crypto devices @@ -1112,8 +1211,11 @@ # # Library routines # +CONFIG_BITREVERSE=y CONFIG_CRC_CCITT=y -CONFIG_CRC16=m +# CONFIG_CRC16 is not set CONFIG_CRC32=y -CONFIG_LIBCRC32C=m -CONFIG_ZLIB_INFLATE=m +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_PLIST=y +CONFIG_IOMAP_COPY=y This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z7...@us...> - 2007-03-28 11:06:52
|
Revision: 937 http://svn.sourceforge.net/hackndev/?rev=937&view=rev Author: z72ka Date: 2007-03-28 04:06:48 -0700 (Wed, 28 Mar 2007) Log Message: ----------- palmtx: support for battery monitoring - life time Modified Paths: -------------- linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-init.h Modified: linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-init.h =================================================================== --- linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-init.h 2007-03-28 11:04:10 UTC (rev 936) +++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-init.h 2007-03-28 11:06:48 UTC (rev 937) @@ -4,7 +4,7 @@ * Init values for Palm TX Handheld Computer * * Authors: Cristiano P. <cristianop AT users DOT sourceforge DOT net> - * + * Jan Herman <2h...@se...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -59,6 +59,7 @@ #define PALMTX_BAT_MIN_CURRENT 0 // unknown #define PALMTX_BAT_MAX_CHARGE 1 // unknown #define PALMTX_BAT_MIN_CHARGE 1 // unknown +#define PALMTX_MAX_LIFE_MINS 360 // on-life in minutes #define PALMTX_BAT_MEASURE_DELAY (HZ * 1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z7...@us...> - 2007-03-28 11:04:15
|
Revision: 936 http://svn.sourceforge.net/hackndev/?rev=936&view=rev Author: z72ka Date: 2007-03-28 04:04:10 -0700 (Wed, 28 Mar 2007) Log Message: ----------- palmtx: Added: Battery monitoring support, power management support (developing stage), removed old machine dependent drivers and used new universal drivers for: touchscreen, sound and backlight Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Kconfig linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Makefile linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c Added Paths: ----------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_battery.c linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_pm.c Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Kconfig =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Kconfig 2007-03-25 01:00:02 UTC (rev 935) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Kconfig 2007-03-28 11:04:10 UTC (rev 936) @@ -3,26 +3,7 @@ select PXA27x help This enables support for Palm TX handheld. - Note: this is in a very early stage. -config PALMTX_AC97 - tristate "Palm TX AC97 driver" - depends on MACH_XSCALE_PALMTX - default y if MACH_XSCALE_PALMTX - help - AC97 codec for Palm TX. - Enable support for WM9712 touchscreen and battery for - the Palm TX PDA - -config PALMTX_LCD - tristate "Palm TX LCD driver" - select LCD_CLASS_DEVICE - depends on MACH_XSCALE_PALMTX - default y if MACH_XSCALE_PALMTX - help - LCD driver for Palm TX. - Enable support for switching the Palm TX LCD on/off - config PALMTX_PCMCIA tristate "Palm TX PCMCIA driver" depends on MACH_XSCALE_PALMTX @@ -36,4 +17,20 @@ default n help Enable core debug output for Palm TX modules. + +config PALMTX_BATTERY + tristate "Palm TX Battery support" + select TOUCHSCREEN_WM97XX + depends on MACH_XSCALE_PALMTX + default m + help + Enable support for Palm TX battery to APM. + ATM use it only as module, otherwise it hangs. + +config PALMTX_PM + tristate "Palm TX Power Management support" + depends on MACH_XSCALE_PALMTX + default y if MACH_PALMTX + help + Enable support for suspend/resume the Palm TX PDA. Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Makefile =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Makefile 2007-03-25 01:00:02 UTC (rev 935) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Makefile 2007-03-28 11:04:10 UTC (rev 936) @@ -2,8 +2,7 @@ ## Palm TX Linux kernel Makefile # # -obj-$(CONFIG_MACH_XSCALE_PALMTX) += palmtx.o -obj-$(CONFIG_PALMTX_AC97) += palmld_ac97.o -obj-$(CONFIG_PALMTX_LCD) += palmtx_lcd.o -obj-$(CONFIG_PM) += palmtx_pm.o -#obj-$(CONFIG_PALMTX_PCMCIA) += palmtx_pcmcia.o +obj-$(CONFIG_MACH_XSCALE_PALMTX) += palmtx.o +obj-$(CONFIG_PALMTX_BATTERY) += palmtx_battery.o +obj-$(CONFIG_PM) += palmtx_pm.o +obj-$(CONFIG_PALMTX_PCMCIA) += palmtx_pcmcia.o Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c 2007-03-25 01:00:02 UTC (rev 935) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c 2007-03-28 11:04:10 UTC (rev 936) @@ -7,8 +7,8 @@ * * Authors: Alex Osborne <bob...@gm...> * Cristiano P. <cristianop AT users DOT sourceforge DOT net> (adapted for Palm TX) + * Jan Herman <2h...@se...> * - * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. @@ -151,16 +151,12 @@ // backlight static void palmtx_bl_on(void){ - //printk("palmtx: turning backlight on\n"); SET_GPIO(GPIO_NR_PALMTX_BL_POWER, 1); - //printk("GPIO_NR_PALMTX_BL_POWER: %d\n",GET_GPIO(GPIO_NR_PALMTX_BL_POWER)); mdelay(50); } static void palmtx_bl_off(void){ - //printk("palmtx: turning backlight off\n"); SET_GPIO(GPIO_NR_PALMTX_BL_POWER, 0); - //printk("GPIO_NR_PALMTX_BL_POWER: %d\n",GET_GPIO(GPIO_NR_PALMTX_BL_POWER)); mdelay(50); } @@ -182,15 +178,7 @@ }, }; -// LCD -static struct platform_device palmtx_lcd = { - .name = "palmtx-lcd", -}; - - - - // IRDA static void palmtx_irda_transceiver_mode(struct device *dev, int mode) @@ -289,11 +277,23 @@ .dev = { .platform_data = &palmtx_audio_ops }, }; +/******************** + * Power Management * + ********************/ + +struct platform_device palmtx_pm = { + .name = "palmtx-pm", + .id = -1, + .dev = { + .platform_data = NULL, + }, +}; + static struct platform_device *devices[] __initdata = { &palmtx_keypad, &palmtx_ac97, + &palmtx_pm, &palmtx_backlight, - &palmtx_lcd, }; @@ -323,7 +323,6 @@ .hsync_len = 4, // HSW + 1 (HSW=3) .vsync_len = 1, // VSW + 1 (VSW=0) - // .sync = FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, }, }; @@ -332,8 +331,6 @@ .num_modes = ARRAY_SIZE(palmtx_lcd_modes), .lccr0 = PALMTX_INIT_LCD_LLC0, .lccr3 = PALMTX_INIT_LCD_LLC3, - - //.pxafb_backlight_power = palmtx_backlight_power, .pxafb_backlight_power = NULL, }; @@ -375,8 +372,6 @@ pxa_set_ficp_info ( &palmtx_ficp_platform_data ); platform_add_devices( devices, ARRAY_SIZE(devices) ); - - //stuart_device.dev.platform_data = &palmtx_pxa_irda_funcs; } Added: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_battery.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_battery.c (rev 0) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_battery.c 2007-03-28 11:04:10 UTC (rev 936) @@ -0,0 +1,249 @@ +/************************************************************************ + * linux/arch/arm/mach-pxa/palmztx/palmtx_battery.c * + * Battery driver for Palm TX * + * * + * Author: Jan Herman <2h...@se...> * + * * + * Based on code for Palm Zire 72 by * + * * + * Authors: Jan Herman <2h...@se...> * + * Sergey Lapin <sl...@ha...> * + * * + ************************************************************************/ + + +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/init.h> +#include <linux/interrupt.h> +#include <linux/input.h> +#include <linux/device.h> +#include <linux/workqueue.h> +#include <linux/battery.h> + +#include <asm/apm.h> +#include <asm/delay.h> +#include <asm/mach-types.h> +#include <asm/mach/arch.h> +#include <asm/mach/map.h> +#include <asm/arch/hardware.h> +#include <asm/arch/pxa-regs.h> +#include <asm/arch/irqs.h> + +#include <sound/driver.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/initval.h> +#include <linux/wm97xx.h> +#include <asm/arch/palmtx-gpio.h> +#include <asm/arch/palmtx-init.h> + + +struct palmtx_battery_dev +{ + struct wm97xx * wm; + int battery_registered; + int current_voltage; + int previous_voltage; + u32 last_battery_update; +}; + +struct palmtx_battery_dev bat; + +#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE) +/* original APM hook */ +static void (*apm_get_power_status_orig)(struct apm_power_info *info); +#endif + +int palmtx_battery_min_voltage(struct battery *b) +{ + return PALMTX_BAT_MIN_VOLTAGE; +} + + +int palmtx_battery_max_voltage(struct battery *b) +{ + return PALMTX_BAT_MAX_VOLTAGE; /* mV */ +} + +/* + This formula is based on battery life of my battery 1100mAh. Original battery in Zire72 is Li-On 920mAh + V_batt = ADCSEL_BMON * 1,889 + 767,8 [mV] +*/ + +int palmtx_battery_get_voltage(struct battery *b) +{ + if (bat.battery_registered){ + bat.previous_voltage = bat.current_voltage; + bat.current_voltage = wm97xx_read_aux_adc(bat.wm, WM97XX_AUX_ID3); + bat.last_battery_update = jiffies; + return bat.current_voltage * 1889/1000 + 7678/10; + } + else{ + printk("palmtx_battery: cannot get voltage -> battery driver unregistered\n"); + return 0; + } +} + + +int palmtx_battery_get_status(struct battery *b) +{ + int ac_connected = GET_GPIO(GPIO_NR_PALMTX_POWER_DETECT); + int usb_connected = !GET_GPIO(GPIO_NR_PALMTX_USB_DETECT); + + if (bat.current_voltage <= 0) + return BATTERY_STATUS_UNKNOWN; + + if (ac_connected || usb_connected){ + if ( ( bat.current_voltage > bat.previous_voltage ) || (bat.current_voltage <= PALMTX_BAT_MAX_VOLTAGE) ) + return BATTERY_STATUS_CHARGING; + return BATTERY_STATUS_NOT_CHARGING; + } + else + return BATTERY_STATUS_DISCHARGING; +} + +struct battery palmtx_battery = { + .name = "palmtx_battery", + .id = "battery0", + .get_min_voltage = palmtx_battery_min_voltage, + .get_max_voltage = palmtx_battery_max_voltage, + .get_voltage = palmtx_battery_get_voltage, + .get_status = palmtx_battery_get_status, +}; + +static int palmtx_wm97xx_probe(struct device *dev) +{ + struct wm97xx *wm = dev->driver_data; + bat.wm = wm; + return 0; +} + +static int palmtx_wm97xx_remove(struct device *dev) +{ + return 0; +} + +static void +palmtx_wm97xx_shutdown(struct device *dev) +{ +#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE) + apm_get_power_status = apm_get_power_status_orig; +#endif +} + +static int +palmtx_wm97xx_suspend(struct device *dev, pm_message_t state) +{ + return 0; +} + +static int +palmtx_wm97xx_resume(struct device *dev) +{ + return 0; +} + + +static struct device_driver palmtx_wm97xx_driver = { + .name = "wm97xx-touchscreen", + .bus = &wm97xx_bus_type, + .owner = THIS_MODULE, + .probe = palmtx_wm97xx_probe, + .remove = palmtx_wm97xx_remove, + .suspend = palmtx_wm97xx_suspend, + .resume = palmtx_wm97xx_resume, + .shutdown = palmtx_wm97xx_shutdown +}; + +static int palmtx_ac_is_connected (void){ + /* when charger is plugged in, then status is ONLINE */ + int ret = ((GET_GPIO(GPIO_NR_PALMTX_POWER_DETECT)));; + if (ret) + ret = 1; + else + ret = 0; + + return ret; +} + +#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE) + +/* APM status query callback implementation */ +static void palmtx_apm_get_power_status(struct apm_power_info *info) +{ + int min, max, curr, percent; + + curr = palmtx_battery_get_voltage(&palmtx_battery); + min = palmtx_battery_min_voltage(&palmtx_battery); + max = palmtx_battery_max_voltage(&palmtx_battery); + + curr = curr - min; + if (curr < 0) curr = 0; + max = max - min; + + percent = curr*100/max; + + info->battery_life = percent; + + info->ac_line_status = palmtx_ac_is_connected() ? APM_AC_ONLINE : APM_AC_OFFLINE; + + if (info->ac_line_status) { + info->battery_status = APM_BATTERY_STATUS_CHARGING; + } else { + if (percent > 50) + info->battery_status = APM_BATTERY_STATUS_HIGH; + else if (percent < 5) + info->battery_status = APM_BATTERY_STATUS_CRITICAL; + else + info->battery_status = APM_BATTERY_STATUS_LOW; + } + + info->time = percent * PALMTX_MAX_LIFE_MINS/100; + info->units = APM_UNITS_MINS; +} +#endif +static int __init palmtx_wm97xx_init(void) +{ +#ifndef MODULE + int ret; +#endif + + /* register battery to APM layer */ + bat.battery_registered = 0; + + if(battery_class_register(&palmtx_battery)) { + printk(KERN_ERR "palmtx_ac97_probe: could not register battery class\n"); + } + else { + bat.battery_registered = 1; + printk("Battery registered\n"); + } +#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE) + apm_get_power_status_orig = apm_get_power_status; + apm_get_power_status = palmtx_apm_get_power_status; +#endif +#ifndef MODULE + /* If we're in kernel, we could accidentally be run before wm97xx + and thus have panic */ + if((ret = bus_register(&wm97xx_bus_type)) < 0) + return ret; +#endif + return driver_register(&palmtx_wm97xx_driver); +} + +static void __exit palmtx_wm97xx_exit(void) +{ +/* TODO - recover APM callback to original state */ + battery_class_unregister(&palmtx_battery); + driver_unregister(&palmtx_wm97xx_driver); +} + +module_init(palmtx_wm97xx_init); +module_exit(palmtx_wm97xx_exit); + +/* Module information */ +MODULE_AUTHOR("Jan Herman <2h...@se...>"); +MODULE_DESCRIPTION("wm97xx battery driver for Palm TX"); +MODULE_LICENSE("GPL"); Added: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_pm.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_pm.c (rev 0) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_pm.c 2007-03-28 11:04:10 UTC (rev 936) @@ -0,0 +1,136 @@ +/************************************************************************ + * Palm TX suspend/resume support * + * Author: Jan Herman <2h...@se...> * + * * + * Based on code from PalmOne Zire 72 PM by: * + * Jan Herman <2h...@se...> * + * Sergey Lapin <sla...@gm...> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License version 2 as * + * published by the Free Software Foundation. * + * * + ************************************************************************/ + +#include <linux/kernel.h> +#include <linux/device.h> +#include <linux/pm.h> +#include <linux/fb.h> +#include <linux/platform_device.h> +#include <asm/mach-types.h> +#include <asm/hardware.h> + +#include <asm/arch/pm.h> +#include <asm/arch/pxa-pm_ll.h> +#include <asm/arch/hardware.h> +#include <asm/arch/pxa-regs.h> + +#include <asm/arch/palmtx-gpio.h> +#include <asm/arch/pxa27x_keyboard.h> + +#ifdef CONFIG_PM +static int palmtx_suspend(struct device *dev, pm_message_t state) +{ + /* Wake-Up on RTC event, etc. */ + PWER |= PWER_RTC | PWER_WEP1 | PWER_GPIO14 | PWER_GPIO10 | PWER_GPIO13 ; + PRER |= PWER_GPIO14 | PWER_GPIO10 | PWER_GPIO13 ; + + /* Wakeup by keyboard - in progress */ + PKWR = 0xfffff; + + /* Enabled Deep-Sleep mode */ + PCFR |= PCFR_DS; + + /* Low power mode */ + PCFR |= PCFR_OPDE; + + /* 3.6.8.1 */ + while(!(OSCC & OSCC_OOK)) + {} + + /* Turn off LCD power */ + //SET_PALMZ72_GPIO(LCD_POWER,0); + /* Turn screen off */ + //SET_PALMZ72_GPIO(SCREEN,0); + /* Turn off USB power */ + //SET_PALMZ72_GPIO(USB_POWER,0); + + + /* disable GPIO reset - DO NOT REMOVE! */ + PCFR &= PCFR_GPR_EN; + + return 0; +} + +static int palmtx_resume(struct device *dev) +{ + + /* Disabled Deep-Sleep mode ?? */ + PCFR &= PCFR_DS; + + /* Re-enable GPIO reset */ + PCFR |= PCFR_GPR_EN; /* !! DO NOT REMOVE !! THIS IS NECCESARY FOR ENABLE PALM RESET !! */ + + + /* Here are all of special to resume Palm TX */ + + /* Turn on LCD power */ + //SET_PALMZ72_GPIO(LCD_POWER,1); + /* Turn screen on */ + //SET_PALMZ72_GPIO(SCREEN,1); + /* Turn on USB power */ + //SET_PALMZ72_GPIO(USB_POWER,1); + + return 0; +} +#else +#define palmtx_suspend NULL +#define palmtx_resume NULL +#endif + +static void palmtx_pxa_ll_pm_suspend(unsigned long resume_addr) +{ + /* For future */ + return; +} + +static void palmtx_pxa_ll_pm_resume(void) +{ + /* For future */ +} + +struct pxa_ll_pm_ops palmtx_ll_pm_ops = { + .suspend = palmtx_pxa_ll_pm_suspend, + .resume = palmtx_pxa_ll_pm_resume, +}; + +static int palmtx_pm_probe(struct device *dev) +{ + printk(KERN_NOTICE "Palm TX power management driver registered\n"); + return 0; +} + +struct device_driver palmtx_pm_driver = { + .name = "palmtx-pm", + .bus = &platform_bus_type, + .probe = palmtx_pm_probe, + .suspend = palmtx_suspend, + .resume = palmtx_resume, +}; + +static int __init palmtx_pm_init(void) +{ + return driver_register(&palmtx_pm_driver); +} + +static void __exit palmtx_pm_exit(void) +{ + driver_unregister(&palmtx_pm_driver); +} + +module_init(palmtx_pm_init); +module_exit(palmtx_pm_exit); + +MODULE_AUTHOR("Jan Herman <2h...@se...>"); +MODULE_DESCRIPTION("Palm TX power management driver"); +MODULE_LICENSE("GPL"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sle...@us...> - 2007-03-25 01:00:07
|
Revision: 935 http://svn.sourceforge.net/hackndev/?rev=935&view=rev Author: sleep_walker Date: 2007-03-24 18:00:02 -0700 (Sat, 24 Mar 2007) Log Message: ----------- l4p: BFUGarux - Silent boot option move and Live_changes feature fix Modified Paths: -------------- linux4palm/BFUGarux/BFUSettings-alone.c linux4palm/BFUGarux/BFUSettings.Rsrc linux4palm/BFUGarux/BFUSettings.Rsrc.h Modified: linux4palm/BFUGarux/BFUSettings-alone.c =================================================================== --- linux4palm/BFUGarux/BFUSettings-alone.c 2007-03-25 00:37:41 UTC (rev 934) +++ linux4palm/BFUGarux/BFUSettings-alone.c 2007-03-25 01:00:02 UTC (rev 935) @@ -767,8 +767,9 @@ case BFUSave2CardBox: BFUSettingsValues.save2card = CtlGetValue(getObjectPtr(pForm,BFUSave2CardBox)); break; - - + case BFUSilentBootBox: + BFUSettingsValues.silentBoot = CtlGetValue(getObjectPtr(pForm,BFUSilentBootBox)); + break; case BFUCardReadonlyBox: BFUSettingsValues.cardRO = CtlGetValue(getObjectPtr(pForm,BFUCardReadonlyBox)); break; @@ -777,7 +778,11 @@ break; case BFUCopy2RAMBox: BFUSettingsValues.copy2ram = CtlGetValue(getObjectPtr(pForm,BFUCopy2RAMBox)); + break; + case BFULiveChangesBox: + BFUSettingsValues.live_changes = CtlGetValue(getObjectPtr(pForm,BFULiveChangesBox)); break; + } break; @@ -850,11 +855,6 @@ case BFUSave2CardBox: BFUSettingsValues.save2card = CtlGetValue(getObjectPtr(pForm,BFUSave2CardBox)); break; - - - case BFUSilentBootBox: - BFUSettingsValues.silentBoot = CtlGetValue(getObjectPtr(pForm,BFUSilentBootBox)); - break; case BFUKeyboardSupportBox: BFUSettingsValues.keyboard = CtlGetValue(getObjectPtr(pForm,BFUKeyboardSupportBox)); break; @@ -1254,8 +1254,6 @@ static void BFUToolsFormInit (FormPtr pForm) { CtlSetValue(getObjectPtr(pForm,BFUSave2CardBox),BFUSettingsValues.save2card); - - CtlSetValue(getObjectPtr(pForm,BFUSilentBootBox),BFUSettingsValues.silentBoot); CtlSetValue(getObjectPtr(pForm,BFUKeyboardSupportBox),BFUSettingsValues.keyboard); CtlSetValue(getObjectPtr(pForm,BFUReflashBox),BFUSettingsValues.reflash); CtlSetValue(getObjectPtr(pForm,BFURunFSCKBox),BFUSettingsValues.fsck); @@ -1265,11 +1263,13 @@ static void BFUAdvancedFormInit (FormPtr pForm) { + CtlSetValue(getObjectPtr(pForm,BFUSilentBootBox),BFUSettingsValues.silentBoot); CtlSetValue(getObjectPtr(pForm,BFUSave2CardBox),BFUSettingsValues.save2card); BFUSetTriggerState(pForm,BFUCPUSpeedTrigger,BFUCPUSpeedList,BFUSettingsValues.CPUspeed); CtlSetValue(getObjectPtr(pForm,BFUCardReadonlyBox),BFUSettingsValues.cardRO); CtlSetValue(getObjectPtr(pForm,BFUDebugModeBox),BFUSettingsValues.debug); CtlSetValue(getObjectPtr(pForm,BFUCopy2RAMBox),BFUSettingsValues.copy2ram); + CtlSetValue(getObjectPtr(pForm,BFULiveChangesBox),BFUSettingsValues.live_changes); BFUSetFieldText(pForm,BFURAMdiskSizeField,BFUSettingsValues.RAMdiskSize,BFURAMdiskMaxLength); } Modified: linux4palm/BFUGarux/BFUSettings.Rsrc =================================================================== --- linux4palm/BFUGarux/BFUSettings.Rsrc 2007-03-25 00:37:41 UTC (rev 934) +++ linux4palm/BFUGarux/BFUSettings.Rsrc 2007-03-25 01:00:02 UTC (rev 935) @@ -100,10 +100,9 @@ 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 - CHECKBOX "Silent boot" ID BFUSilentBootBox AT (9 31 60 15) USABLE RIGHTANCHOR GROUP 0 - CHECKBOX "Keyboard support" ID BFUKeyboardSupportBox AT (9 46 91 15) USABLE RIGHTANCHOR GROUP 0 - CHECKBOX "SmallROM reflash (dangerous!)" ID BFUReflashBox AT (9 61 145 15) USABLE RIGHTANCHOR GROUP 0 - CHECKBOX "Run fsck for card" ID BFURunFSCKBox AT (9 76 145 15) USABLE RIGHTANCHOR GROUP 0 + CHECKBOX "Keyboard support" ID BFUKeyboardSupportBox AT (9 31 91 15) USABLE RIGHTANCHOR GROUP 0 + CHECKBOX "SmallROM reflash (dangerous!)" ID BFUReflashBox AT (9 46 145 15) USABLE RIGHTANCHOR GROUP 0 + CHECKBOX "Run fsck for card" ID BFURunFSCKBox AT (9 61 145 15) USABLE RIGHTANCHOR GROUP 0 END @@ -127,10 +126,11 @@ POPUPLIST ID BFUCPUSpeedTrigger BFUCPUSpeedList LABEL "RAMdisk size:" ID 8351 AT (9 48) USABLE FONT 1 FIELD ID BFURAMdiskSizeField AT (90 48 30 15) USABLE LEFTALIGN EDITABLE UNDERLINED SINGLELINE MAXCHARS 6 - CHECKBOX "SD/MMC read-only" ID BFUCardReadonlyBox AT (9 63 96 15) USABLE LEFTANCHOR GROUP 0 - CHECKBOX "Copy modules to RAM" ID BFUCopy2RAMBox AT (9 78 110 15) USABLE LEFTANCHOR GROUP 0 - CHECKBOX "Debug" ID BFUDebugModeBox AT (9 93 42 15) USABLE RIGHTANCHOR GROUP 0 - CHECKBOX "Merge live_changes" ID BFULiveChangesBox AT (9 108 110 15) USABLE RIGHTANCHOR GROUP 0 + CHECKBOX "Silent boot" ID BFUSilentBootBox AT (9 63 60 15) USABLE RIGHTANCHOR GROUP 0 + CHECKBOX "SD/MMC read-only" ID BFUCardReadonlyBox AT (9 78 96 15) USABLE LEFTANCHOR GROUP 0 + CHECKBOX "Copy modules to RAM" ID BFUCopy2RAMBox AT (9 93 110 15) USABLE LEFTANCHOR GROUP 0 + CHECKBOX "Debug" ID BFUDebugModeBox AT (9 108 42 15) USABLE RIGHTANCHOR GROUP 0 + CHECKBOX "Merge live_changes" ID BFULiveChangesBox AT (9 123 110 15) USABLE RIGHTANCHOR GROUP 0 END // --------------- Resources of type 'tSTR' --------------- Modified: linux4palm/BFUGarux/BFUSettings.Rsrc.h =================================================================== --- linux4palm/BFUGarux/BFUSettings.Rsrc.h 2007-03-25 00:37:41 UTC (rev 934) +++ linux4palm/BFUGarux/BFUSettings.Rsrc.h 2007-03-25 01:00:02 UTC (rev 935) @@ -14,7 +14,7 @@ #define BFUToolsForm 8300 //"BFUSettings - Tools" -#define BFUSilentBootBox 8301 + #define BFUKeyboardSupportBox 8303 #define BFUReflashBox 8304 #define BFURunFSCKBox 8305 @@ -27,6 +27,7 @@ #define BFUCardReadonlyBox 8404 #define BFUDebugModeBox 8405 #define BFULiveChangesBox 8406 +#define BFUSilentBootBox 8407 #define BFUNetForm 8100 //"BFUSettings - Network" #define BFUUseNetBox 8101 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sle...@us...> - 2007-03-25 00:37:48
|
Revision: 934 http://svn.sourceforge.net/hackndev/?rev=934&view=rev Author: sleep_walker Date: 2007-03-24 17:37:41 -0700 (Sat, 24 Mar 2007) Log Message: ----------- l4p: added live_changes support into BFUGarux Modified Paths: -------------- linux4palm/BFUGarux/BFULinuxHelper.c linux4palm/BFUGarux/BFUSettings-alone.c linux4palm/BFUGarux/BFUSettings.Rsrc linux4palm/BFUGarux/BFUSettings.Rsrc.h Modified: linux4palm/BFUGarux/BFULinuxHelper.c =================================================================== --- linux4palm/BFUGarux/BFULinuxHelper.c 2007-03-25 00:14:46 UTC (rev 933) +++ linux4palm/BFUGarux/BFULinuxHelper.c 2007-03-25 00:37:41 UTC (rev 934) @@ -106,6 +106,8 @@ optint >>= 2; printf("BFUUseNet=%d\n",useNet = (optint & 1)); optint >>= 1; + printf("BFULiveChanges=%d\n",optint & 1); + optint >>= 1; printf("BFUDebug=%ld\n",optint & 1); optint >>= 1; printf("BFUSilentBoot=%ld\n",optint & 1); Modified: linux4palm/BFUGarux/BFUSettings-alone.c =================================================================== --- linux4palm/BFUGarux/BFUSettings-alone.c 2007-03-25 00:14:46 UTC (rev 933) +++ linux4palm/BFUGarux/BFUSettings-alone.c 2007-03-25 00:37:41 UTC (rev 934) @@ -43,6 +43,7 @@ UInt8 copy2ram; Char RAMdiskSize[BFURAMdiskMaxLength]; UInt8 save2card; + UInt8 live_changes; } BFUSettingsType; static Boolean BFUCopySettingsStruct(BFUSettingsType *source,BFUSettingsType *dest); @@ -142,6 +143,7 @@ dest->fsck = source->fsck; dest->modules = source->modules; dest->modlist = source->modlist; + dest->live_changes = source->live_changes; return true; } @@ -199,6 +201,8 @@ options = options << 1; options |= BFUSettingsValues.debug; options = options << 1; + options |= BFUSettingsValues.live_changes; + options = options << 1; options |= BFUSettingsValues.net; options = options << 2; options |= BFUSettingsValues.fs; Modified: linux4palm/BFUGarux/BFUSettings.Rsrc =================================================================== --- linux4palm/BFUGarux/BFUSettings.Rsrc 2007-03-25 00:14:46 UTC (rev 933) +++ linux4palm/BFUGarux/BFUSettings.Rsrc 2007-03-25 00:37:41 UTC (rev 934) @@ -1,248 +1,249 @@ -#include "BFUSettings.Rsrc.h" -// --------------- Resources of type 'NFNT' --------------- -// --------------- Resources of type 'Talt' --------------- -// --------------- Resources of type 'tFRM' --------------- -FORM ID BFUGlobalForm AT (0 0 160 160) - 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 - 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 - LABEL "Address or path:" ID 8031 AT (9 69) USABLE FONT 1 - FIELD ID BFUAddressField AT (9 88 140 16) USABLE LEFTALIGN EDITABLE UNDERLINED SINGLELINE MAXCHARS 64 - POPUPTRIGGER "Filesystem" ID BFUFileSystemPopup AT (90 50 60 15) USABLE LEFTANCHOR - LIST "vfat" "ext2" "ext3" ID BFUFileSystemList AT (90 50 60 33) NONUSABLE DISABLED - POPUPLIST ID BFUFileSystemPopup BFUFileSystemList - LABEL "Device:" ID 8032 AT (9 110) USABLE FONT 1 - FIELD ID BFUDeviceField AT (54 110 77 15) USABLE LEFTALIGN EDITABLE UNDERLINED SINGLELINE MAXCHARS 16 - BUTTON "OK" ID BFUOKButton AT (5 140 30 15) USABLE RIGHTANCHOR FRAME - BUTTON "Save" ID BFUSaveButton AT (41 140 30 15) USABLE RIGHTANCHOR FRAME - BUTTON "Cancel" ID BFUCancelButton AT (126 140 30 15) USABLE RIGHTANCHOR FRAME - POPUPTRIGGER "Global" ID BFUPartTrigger AT (56 15 41 15) USABLE LEFTANCHOR - LIST "Global" "Network" "Modules" "Tools" "Advanced" ID BFUPartList AT (56 15 60 55) NONUSABLE DISABLED - 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 -END - -FORM ID BFUNetForm AT (0 0 160 160) - FRAME MODAL NOSAVEBEHIND USABLE - HELPID 8602 DEFAULTBTNID BFUOKButton -BEGIN - TITLE "BFUSettings - Network" - BUTTON "OK" ID BFUOKButton AT (5 140 30 15) USABLE RIGHTANCHOR FRAME - BUTTON "Save" ID BFUSaveButton AT (41 140 30 15) USABLE RIGHTANCHOR FRAME - BUTTON "Cancel" ID BFUCancelButton AT (126 140 30 15) USABLE RIGHTANCHOR FRAME - POPUPTRIGGER "Network" ID BFUPartTrigger AT (56 15 51 15) USABLE LEFTANCHOR - LIST "Global" "Network" "Modules" "Tools" "Advanced" ID BFUPartList AT (56 15 60 55) NONUSABLE DISABLED - 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 - LABEL "IP address of Palm:" ID 8130 AT (9 50) USABLE FONT 1 - CHECKBOX "Use network" ID BFUUseNetBox AT (9 31 67 15) USABLE RIGHTANCHOR GROUP 0 - FIELD ID BFUPalmIPField0 AT (9 61 15 15) USABLE EDITABLE UNDERLINED MULTIPLELINES NUMERIC MAXCHARS 3 - LABEL "." ID 8131 AT (26 62) USABLE FONT 1 - FIELD ID BFUPalmIPField1 AT (30 61 15 15) USABLE EDITABLE UNDERLINED MULTIPLELINES NUMERIC MAXCHARS 3 - LABEL "." ID 8132 AT (47 62) USABLE FONT 1 - FIELD ID BFUPalmIPField2 AT (52 61 15 15) USABLE EDITABLE UNDERLINED MULTIPLELINES NUMERIC MAXCHARS 3 - LABEL "." ID 8133 AT (70 62) USABLE FONT 1 - FIELD ID BFUPalmIPField3 AT (75 61 15 15) USABLE EDITABLE UNDERLINED MULTIPLELINES NUMERIC MAXCHARS 3 - LABEL "IP of PC:" ID 8137 AT (9 76) USABLE FONT 1 - FIELD ID BFUPCIPField0 AT (9 89 15 15) USABLE EDITABLE UNDERLINED MULTIPLELINES NUMERIC MAXCHARS 3 - FIELD ID BFUPCIPField1 AT (30 89 15 15) USABLE EDITABLE UNDERLINED MULTIPLELINES NUMERIC MAXCHARS 3 - FIELD ID BFUPCIPField2 AT (52 89 15 15) USABLE EDITABLE UNDERLINED MULTIPLELINES NUMERIC MAXCHARS 3 - FIELD ID BFUPCIPField3 AT (75 89 15 15) USABLE EDITABLE UNDERLINED MULTIPLELINES NUMERIC MAXCHARS 3 - LABEL "." ID 8134 AT (26 90) USABLE FONT 1 - LABEL "." ID 8135 AT (47 90) USABLE FONT 1 - LABEL "." ID 8136 AT (70 90) USABLE FONT 1 - LABEL "Mask:" ID 8138 AT (9 103) USABLE FONT 1 - FIELD ID BFUMaskField0 AT (9 115 15 15) USABLE EDITABLE UNDERLINED MULTIPLELINES NUMERIC MAXCHARS 3 - FIELD ID BFUMaskField1 AT (30 115 15 15) USABLE EDITABLE UNDERLINED MULTIPLELINES NUMERIC MAXCHARS 3 - FIELD ID BFUMaskField2 AT (52 115 15 15) USABLE EDITABLE UNDERLINED MULTIPLELINES NUMERIC MAXCHARS 3 - FIELD ID BFUMaskField3 AT (75 115 15 15) USABLE EDITABLE UNDERLINED MULTIPLELINES NUMERIC MAXCHARS 3 - LABEL "." ID 8139 AT (26 116) USABLE FONT 1 - LABEL "." ID 8140 AT (47 116) USABLE FONT 1 - LABEL "." ID 8141 AT (70 116) USABLE FONT 1 -END - -FORM ID BFUModulesForm AT (0 0 160 160) - FRAME MODAL NOSAVEBEHIND USABLE - HELPID 8603 DEFAULTBTNID BFUOKButton -BEGIN - TITLE "BFUSettings - Modules" - BUTTON "OK" ID BFUOKButton AT (5 140 30 15) USABLE RIGHTANCHOR FRAME - BUTTON "Save" ID BFUSaveButton AT (41 140 30 15) USABLE RIGHTANCHOR FRAME - BUTTON "Cancel" ID BFUCancelButton AT (126 140 30 15) USABLE RIGHTANCHOR FRAME - POPUPTRIGGER "Modules" ID BFUPartTrigger AT (56 15 50 15) USABLE LEFTANCHOR - LIST "Global" "Network" "Modules" "Tools" "Advanced" ID BFUPartList AT (56 15 60 55) NONUSABLE DISABLED - 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 - 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 - HELPID 8604 DEFAULTBTNID BFUOKButton -BEGIN - TITLE "BFUSettings - Tools" - BUTTON "OK" ID BFUOKButton AT (5 140 30 15) USABLE RIGHTANCHOR FRAME - BUTTON "Save" ID BFUSaveButton AT (41 140 30 15) USABLE RIGHTANCHOR FRAME - BUTTON "Cancel" ID BFUCancelButton AT (126 140 30 15) USABLE RIGHTANCHOR FRAME - POPUPTRIGGER "Tools" ID BFUPartTrigger AT (56 15 50 15) USABLE LEFTANCHOR - LIST "Global" "Network" "Modules" "Tools" "Advanced" ID BFUPartList AT (56 15 60 55) NONUSABLE DISABLED - 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 - CHECKBOX "Silent boot" ID BFUSilentBootBox AT (9 31 60 15) USABLE RIGHTANCHOR GROUP 0 - CHECKBOX "Keyboard support" ID BFUKeyboardSupportBox AT (9 46 91 15) USABLE RIGHTANCHOR GROUP 0 - CHECKBOX "SmallROM reflash (dangerous!)" ID BFUReflashBox AT (9 61 145 15) USABLE RIGHTANCHOR GROUP 0 - CHECKBOX "Run fsck for card" ID BFURunFSCKBox AT (9 76 145 15) USABLE RIGHTANCHOR GROUP 0 - -END - - -FORM ID BFUAdvancedForm AT (0 0 160 160) - FRAME MODAL NOSAVEBEHIND USABLE - HELPID 8605 DEFAULTBTNID BFUOKButton -BEGIN - TITLE "BFUSettings - Advanced" - BUTTON "OK" ID BFUOKButton AT (5 140 30 15) USABLE RIGHTANCHOR FRAME - BUTTON "Save" ID BFUSaveButton AT (41 140 30 15) USABLE RIGHTANCHOR FRAME - BUTTON "Cancel" ID BFUCancelButton AT (126 140 30 15) USABLE RIGHTANCHOR FRAME - POPUPTRIGGER "Advanced" ID BFUPartTrigger AT (56 15 55 15) USABLE LEFTANCHOR - LIST "Global" "Network" "Modules" "Tools" "Advanced" ID BFUPartList AT (56 15 60 55) NONUSABLE DISABLED - 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 - LABEL "CPU Frequency:" ID 8350 AT (9 33) USABLE FONT 1 - LIST "Auto" "133 MHz" "266 MHz" "400 MHz" "None" ID BFUCPUSpeedList AT (90 31 39 55) NONUSABLE DISABLED - POPUPTRIGGER "Auto" ID BFUCPUSpeedTrigger AT (90 31 55 15) USABLE LEFTANCHOR - POPUPLIST ID BFUCPUSpeedTrigger BFUCPUSpeedList - LABEL "RAMdisk size:" ID 8351 AT (9 48) USABLE FONT 1 - FIELD ID BFURAMdiskSizeField AT (90 48 30 15) USABLE LEFTALIGN EDITABLE UNDERLINED SINGLELINE MAXCHARS 6 - CHECKBOX "SD/MMC read-only" ID BFUCardReadonlyBox AT (9 63 96 15) USABLE LEFTANCHOR GROUP 0 - CHECKBOX "Copy modules to RAM" ID BFUCopy2RAMBox AT (9 78 110 15) USABLE LEFTANCHOR GROUP 0 - CHECKBOX "Debug" ID BFUDebugModeBox AT (9 93 42 15) USABLE RIGHTANCHOR GROUP 0 -END - -// --------------- Resources of type 'tSTR' --------------- -STRING ID 8601 "BFUSettings - Global\n" \ - "(Bootloader for users)\n\n" \ - "This window is dedicated to set source of real root or modules.\n\n" \ - "Source:\n" \ - "Here you can select method.\n" \ - "Possible choices:\n" \ - "\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" \ - "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" \ - "Device:\n" \ - "Here you should specify device which are modules loaded from.\n\n" \ - "OK\n" \ - "Prepare settings to be sent and leave BFUSettings\n\n" \ - "Save\n" \ - "Save preferences for next use.\n\n" \ - "To card\n" \ - "If disabled, preferences are saved just to RAM database. If enabled it will " \ - "replace previously found preferences on card or save it on first volume\n\n" \ - "Cancel\n" \ - "Exit and no BFUSettings will be used.\n\n" \ - "Set:\n" \ - "Switches to other part of settings - network, modules, tools and advanced.\n\n" - -STRING ID 8602 "BFUSettings - Network\n" \ - "(Bootloader for users)\n\n" \ - "This window is dedicated to set network properties.\n\n" \ - "Use network:\n" \ - "Enable or disable network set up during boot. It is required for HTTP or NFS way of boot.\n\n" \ - "OK\n" \ - "Prepare settings to be sent and leave BFUSettings\n\n" \ - "Save\n" \ - "Save preferences for next use.\n\n" \ - "To card\n" \ - "If disabled, preferences are saved just to RAM database. If enabled it will " \ - "replace previously found preferences on card or save it on first volume\n\n" \ - "Cancel\n" \ - "Exit and no BFUSettings will be used.\n\n" \ - "Set:\n" \ - "Switches to other part of settings - global, modules, tools and advanced.\n\n" - -STRING ID 8603 "BFUSettings - Modules\n" \ - "(Bootloader for users)\n\n" \ - "This window is dedicated to select modules to be loaded.\n\n" \ - "For now, only possible is select your modlist*.txt.\n\n" \ - "NOTE: used only if start from Card, if start from WWW create modlist.txt and put in same dir on WWW as modules.\n\n" \ - "OK\n" \ - "Prepare settings to be sent and leave BFUSettings\n\n" \ - "Save\n" \ - "Save preferences for next use.\n\n" \ - "To card\n" \ - "If disabled, preferences are saved just to RAM database. If enabled it will " \ - "replace previously found preferences on card or save it on first volume\n\n" \ - "Cancel\n" \ - "Exit and no BFUSettings will be used.\n\n" \ - "Set:\n" \ - "Switches to other part of settings - global, network, tools and advanced.\n\n" - -STRING ID 8604 "BFUSettings - Tools\n" \ - "(Bootloader for users)\n\n" \ - "This window is dedicated to enable useful things.\n\n" \ - "Silent boot:\n" \ - "This will produce no output during boot.\n\n" \ - "Keyboard:\n" \ - "This enable running external keyboard handling program. Currently Stowaway (PPK) and compatible supported.\n\n" \ - "SmallROM reflash:\n" \ - "This will reflash your SmallROM for suspend/resume support. Read more before enabling that...\n\n" \ - "Run fsck for card:\n" \ - "This will run dosfsck on first partition of card. Usefull for checking errors after bad unmount...\n\n" \ - "OK\n" \ - "Prepare settings to be sent and leave BFUSettings\n\n" \ - "Save\n" \ - "Save preferences for next use.\n\n" \ - "To card\n" \ - "If disabled, preferences are saved just to RAM database. If enabled it will " \ - "replace previously found preferences on card or save it on first volume\n\n" \ - "Cancel\n" \ - "Exit and no BFUSettings will be used.\n\n" \ - "Set:\n" \ - "Switches to other part of settings - global, network, modules and advanced.\n\n" - - -STRING ID 8605 "BFUSettings - Advanced\n" \ - "(Bootloader for users)\n\n" \ - "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" \ - "RAMdisk size:\n" \ - "You can specify MAXIMUM size of RAM will be used for RAMdisk.\n\n" \ - "SD/MMC read-only:\n" \ - "With this option you can mount card as read only (if it is mounted).\n\n" \ - "Copy modules to RAM:\n" \ - "This will copy modules first to RAM, and mount from memory.\n\n" \ - "NOTE: Don't forget set RAMdisk size MINIMAL as total size of all your used modules.\n\n" \ - "Debug:\n" \ - "This option will switch to shell in some important part of initscript.\n" \ - "Usefull for developers.\n" \ - "NOTE: need Stowaway compatible keyboard.\n\n" \ - "OK\n" \ - "Prepare settings to be sent and leave BFUSettings\n\n" \ - "Save\n" \ - "Save preferences for next use.\n\n" \ - "To card\n" \ - "If disabled, preferences are saved just to RAM database. If enabled it will " \ - "replace previously found preferences on card or save it on first volume\n\n" \ - "Cancel\n" \ - "Exit and no BFUSettings will be used.\n\n" \ - "Set:\n" \ - "Switches to other part of settings - global, network, modules and tools.\n\n" +#include "BFUSettings.Rsrc.h" +// --------------- Resources of type 'NFNT' --------------- +// --------------- Resources of type 'Talt' --------------- +// --------------- Resources of type 'tFRM' --------------- +FORM ID BFUGlobalForm AT (0 0 160 160) + 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 + 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 + LABEL "Address or path:" ID 8031 AT (9 69) USABLE FONT 1 + FIELD ID BFUAddressField AT (9 88 140 16) USABLE LEFTALIGN EDITABLE UNDERLINED SINGLELINE MAXCHARS 64 + POPUPTRIGGER "Filesystem" ID BFUFileSystemPopup AT (90 50 60 15) USABLE LEFTANCHOR + LIST "vfat" "ext2" "ext3" ID BFUFileSystemList AT (90 50 60 33) NONUSABLE DISABLED + POPUPLIST ID BFUFileSystemPopup BFUFileSystemList + LABEL "Device:" ID 8032 AT (9 110) USABLE FONT 1 + FIELD ID BFUDeviceField AT (54 110 77 15) USABLE LEFTALIGN EDITABLE UNDERLINED SINGLELINE MAXCHARS 16 + BUTTON "OK" ID BFUOKButton AT (5 140 30 15) USABLE RIGHTANCHOR FRAME + BUTTON "Save" ID BFUSaveButton AT (41 140 30 15) USABLE RIGHTANCHOR FRAME + BUTTON "Cancel" ID BFUCancelButton AT (126 140 30 15) USABLE RIGHTANCHOR FRAME + POPUPTRIGGER "Global" ID BFUPartTrigger AT (56 15 41 15) USABLE LEFTANCHOR + LIST "Global" "Network" "Modules" "Tools" "Advanced" ID BFUPartList AT (56 15 60 55) NONUSABLE DISABLED + 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 +END + +FORM ID BFUNetForm AT (0 0 160 160) + FRAME MODAL NOSAVEBEHIND USABLE + HELPID 8602 DEFAULTBTNID BFUOKButton +BEGIN + TITLE "BFUSettings - Network" + BUTTON "OK" ID BFUOKButton AT (5 140 30 15) USABLE RIGHTANCHOR FRAME + BUTTON "Save" ID BFUSaveButton AT (41 140 30 15) USABLE RIGHTANCHOR FRAME + BUTTON "Cancel" ID BFUCancelButton AT (126 140 30 15) USABLE RIGHTANCHOR FRAME + POPUPTRIGGER "Network" ID BFUPartTrigger AT (56 15 51 15) USABLE LEFTANCHOR + LIST "Global" "Network" "Modules" "Tools" "Advanced" ID BFUPartList AT (56 15 60 55) NONUSABLE DISABLED + 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 + LABEL "IP address of Palm:" ID 8130 AT (9 50) USABLE FONT 1 + CHECKBOX "Use network" ID BFUUseNetBox AT (9 31 67 15) USABLE RIGHTANCHOR GROUP 0 + FIELD ID BFUPalmIPField0 AT (9 61 15 15) USABLE EDITABLE UNDERLINED MULTIPLELINES NUMERIC MAXCHARS 3 + LABEL "." ID 8131 AT (26 62) USABLE FONT 1 + FIELD ID BFUPalmIPField1 AT (30 61 15 15) USABLE EDITABLE UNDERLINED MULTIPLELINES NUMERIC MAXCHARS 3 + LABEL "." ID 8132 AT (47 62) USABLE FONT 1 + FIELD ID BFUPalmIPField2 AT (52 61 15 15) USABLE EDITABLE UNDERLINED MULTIPLELINES NUMERIC MAXCHARS 3 + LABEL "." ID 8133 AT (70 62) USABLE FONT 1 + FIELD ID BFUPalmIPField3 AT (75 61 15 15) USABLE EDITABLE UNDERLINED MULTIPLELINES NUMERIC MAXCHARS 3 + LABEL "IP of PC:" ID 8137 AT (9 76) USABLE FONT 1 + FIELD ID BFUPCIPField0 AT (9 89 15 15) USABLE EDITABLE UNDERLINED MULTIPLELINES NUMERIC MAXCHARS 3 + FIELD ID BFUPCIPField1 AT (30 89 15 15) USABLE EDITABLE UNDERLINED MULTIPLELINES NUMERIC MAXCHARS 3 + FIELD ID BFUPCIPField2 AT (52 89 15 15) USABLE EDITABLE UNDERLINED MULTIPLELINES NUMERIC MAXCHARS 3 + FIELD ID BFUPCIPField3 AT (75 89 15 15) USABLE EDITABLE UNDERLINED MULTIPLELINES NUMERIC MAXCHARS 3 + LABEL "." ID 8134 AT (26 90) USABLE FONT 1 + LABEL "." ID 8135 AT (47 90) USABLE FONT 1 + LABEL "." ID 8136 AT (70 90) USABLE FONT 1 + LABEL "Mask:" ID 8138 AT (9 103) USABLE FONT 1 + FIELD ID BFUMaskField0 AT (9 115 15 15) USABLE EDITABLE UNDERLINED MULTIPLELINES NUMERIC MAXCHARS 3 + FIELD ID BFUMaskField1 AT (30 115 15 15) USABLE EDITABLE UNDERLINED MULTIPLELINES NUMERIC MAXCHARS 3 + FIELD ID BFUMaskField2 AT (52 115 15 15) USABLE EDITABLE UNDERLINED MULTIPLELINES NUMERIC MAXCHARS 3 + FIELD ID BFUMaskField3 AT (75 115 15 15) USABLE EDITABLE UNDERLINED MULTIPLELINES NUMERIC MAXCHARS 3 + LABEL "." ID 8139 AT (26 116) USABLE FONT 1 + LABEL "." ID 8140 AT (47 116) USABLE FONT 1 + LABEL "." ID 8141 AT (70 116) USABLE FONT 1 +END + +FORM ID BFUModulesForm AT (0 0 160 160) + FRAME MODAL NOSAVEBEHIND USABLE + HELPID 8603 DEFAULTBTNID BFUOKButton +BEGIN + TITLE "BFUSettings - Modules" + BUTTON "OK" ID BFUOKButton AT (5 140 30 15) USABLE RIGHTANCHOR FRAME + BUTTON "Save" ID BFUSaveButton AT (41 140 30 15) USABLE RIGHTANCHOR FRAME + BUTTON "Cancel" ID BFUCancelButton AT (126 140 30 15) USABLE RIGHTANCHOR FRAME + POPUPTRIGGER "Modules" ID BFUPartTrigger AT (56 15 50 15) USABLE LEFTANCHOR + LIST "Global" "Network" "Modules" "Tools" "Advanced" ID BFUPartList AT (56 15 60 55) NONUSABLE DISABLED + 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 + 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 + HELPID 8604 DEFAULTBTNID BFUOKButton +BEGIN + TITLE "BFUSettings - Tools" + BUTTON "OK" ID BFUOKButton AT (5 140 30 15) USABLE RIGHTANCHOR FRAME + BUTTON "Save" ID BFUSaveButton AT (41 140 30 15) USABLE RIGHTANCHOR FRAME + BUTTON "Cancel" ID BFUCancelButton AT (126 140 30 15) USABLE RIGHTANCHOR FRAME + POPUPTRIGGER "Tools" ID BFUPartTrigger AT (56 15 50 15) USABLE LEFTANCHOR + LIST "Global" "Network" "Modules" "Tools" "Advanced" ID BFUPartList AT (56 15 60 55) NONUSABLE DISABLED + 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 + CHECKBOX "Silent boot" ID BFUSilentBootBox AT (9 31 60 15) USABLE RIGHTANCHOR GROUP 0 + CHECKBOX "Keyboard support" ID BFUKeyboardSupportBox AT (9 46 91 15) USABLE RIGHTANCHOR GROUP 0 + CHECKBOX "SmallROM reflash (dangerous!)" ID BFUReflashBox AT (9 61 145 15) USABLE RIGHTANCHOR GROUP 0 + CHECKBOX "Run fsck for card" ID BFURunFSCKBox AT (9 76 145 15) USABLE RIGHTANCHOR GROUP 0 + +END + + +FORM ID BFUAdvancedForm AT (0 0 160 160) + FRAME MODAL NOSAVEBEHIND USABLE + HELPID 8605 DEFAULTBTNID BFUOKButton +BEGIN + TITLE "BFUSettings - Advanced" + BUTTON "OK" ID BFUOKButton AT (5 140 30 15) USABLE RIGHTANCHOR FRAME + BUTTON "Save" ID BFUSaveButton AT (41 140 30 15) USABLE RIGHTANCHOR FRAME + BUTTON "Cancel" ID BFUCancelButton AT (126 140 30 15) USABLE RIGHTANCHOR FRAME + POPUPTRIGGER "Advanced" ID BFUPartTrigger AT (56 15 55 15) USABLE LEFTANCHOR + LIST "Global" "Network" "Modules" "Tools" "Advanced" ID BFUPartList AT (56 15 60 55) NONUSABLE DISABLED + 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 + LABEL "CPU Frequency:" ID 8350 AT (9 33) USABLE FONT 1 + LIST "Auto" "133 MHz" "266 MHz" "400 MHz" "None" ID BFUCPUSpeedList AT (90 31 39 55) NONUSABLE DISABLED + POPUPTRIGGER "Auto" ID BFUCPUSpeedTrigger AT (90 31 55 15) USABLE LEFTANCHOR + POPUPLIST ID BFUCPUSpeedTrigger BFUCPUSpeedList + LABEL "RAMdisk size:" ID 8351 AT (9 48) USABLE FONT 1 + FIELD ID BFURAMdiskSizeField AT (90 48 30 15) USABLE LEFTALIGN EDITABLE UNDERLINED SINGLELINE MAXCHARS 6 + CHECKBOX "SD/MMC read-only" ID BFUCardReadonlyBox AT (9 63 96 15) USABLE LEFTANCHOR GROUP 0 + CHECKBOX "Copy modules to RAM" ID BFUCopy2RAMBox AT (9 78 110 15) USABLE LEFTANCHOR GROUP 0 + CHECKBOX "Debug" ID BFUDebugModeBox AT (9 93 42 15) USABLE RIGHTANCHOR GROUP 0 + CHECKBOX "Merge live_changes" ID BFULiveChangesBox AT (9 108 110 15) USABLE RIGHTANCHOR GROUP 0 +END + +// --------------- Resources of type 'tSTR' --------------- +STRING ID 8601 "BFUSettings - Global\n" \ + "(Bootloader for users)\n\n" \ + "This window is dedicated to set source of real root or modules.\n\n" \ + "Source:\n" \ + "Here you can select method.\n" \ + "Possible choices:\n" \ + "\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" \ + "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" \ + "Device:\n" \ + "Here you should specify device which are modules loaded from.\n\n" \ + "OK\n" \ + "Prepare settings to be sent and leave BFUSettings\n\n" \ + "Save\n" \ + "Save preferences for next use.\n\n" \ + "To card\n" \ + "If disabled, preferences are saved just to RAM database. If enabled it will " \ + "replace previously found preferences on card or save it on first volume\n\n" \ + "Cancel\n" \ + "Exit and no BFUSettings will be used.\n\n" \ + "Set:\n" \ + "Switches to other part of settings - network, modules, tools and advanced.\n\n" + +STRING ID 8602 "BFUSettings - Network\n" \ + "(Bootloader for users)\n\n" \ + "This window is dedicated to set network properties.\n\n" \ + "Use network:\n" \ + "Enable or disable network set up during boot. It is required for HTTP or NFS way of boot.\n\n" \ + "OK\n" \ + "Prepare settings to be sent and leave BFUSettings\n\n" \ + "Save\n" \ + "Save preferences for next use.\n\n" \ + "To card\n" \ + "If disabled, preferences are saved just to RAM database. If enabled it will " \ + "replace previously found preferences on card or save it on first volume\n\n" \ + "Cancel\n" \ + "Exit and no BFUSettings will be used.\n\n" \ + "Set:\n" \ + "Switches to other part of settings - global, modules, tools and advanced.\n\n" + +STRING ID 8603 "BFUSettings - Modules\n" \ + "(Bootloader for users)\n\n" \ + "This window is dedicated to select modules to be loaded.\n\n" \ + "For now, only possible is select your modlist*.txt.\n\n" \ + "NOTE: used only if start from Card, if start from WWW create modlist.txt and put in same dir on WWW as modules.\n\n" \ + "OK\n" \ + "Prepare settings to be sent and leave BFUSettings\n\n" \ + "Save\n" \ + "Save preferences for next use.\n\n" \ + "To card\n" \ + "If disabled, preferences are saved just to RAM database. If enabled it will " \ + "replace previously found preferences on card or save it on first volume\n\n" \ + "Cancel\n" \ + "Exit and no BFUSettings will be used.\n\n" \ + "Set:\n" \ + "Switches to other part of settings - global, network, tools and advanced.\n\n" + +STRING ID 8604 "BFUSettings - Tools\n" \ + "(Bootloader for users)\n\n" \ + "This window is dedicated to enable useful things.\n\n" \ + "Silent boot:\n" \ + "This will produce no output during boot.\n\n" \ + "Keyboard:\n" \ + "This enable running external keyboard handling program. Currently Stowaway (PPK) and compatible supported.\n\n" \ + "SmallROM reflash:\n" \ + "This will reflash your SmallROM for suspend/resume support. Read more before enabling that...\n\n" \ + "Run fsck for card:\n" \ + "This will run dosfsck on first partition of card. Usefull for checking errors after bad unmount...\n\n" \ + "OK\n" \ + "Prepare settings to be sent and leave BFUSettings\n\n" \ + "Save\n" \ + "Save preferences for next use.\n\n" \ + "To card\n" \ + "If disabled, preferences are saved just to RAM database. If enabled it will " \ + "replace previously found preferences on card or save it on first volume\n\n" \ + "Cancel\n" \ + "Exit and no BFUSettings will be used.\n\n" \ + "Set:\n" \ + "Switches to other part of settings - global, network, modules and advanced.\n\n" + + +STRING ID 8605 "BFUSettings - Advanced\n" \ + "(Bootloader for users)\n\n" \ + "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" \ + "RAMdisk size:\n" \ + "You can specify MAXIMUM size of RAM will be used for RAMdisk.\n\n" \ + "SD/MMC read-only:\n" \ + "With this option you can mount card as read only (if it is mounted).\n\n" \ + "Copy modules to RAM:\n" \ + "This will copy modules first to RAM, and mount from memory.\n\n" \ + "NOTE: Don't forget set RAMdisk size MINIMAL as total size of all your used modules.\n\n" \ + "Debug:\n" \ + "This option will switch to shell in some important part of initscript.\n" \ + "Usefull for developers.\n" \ + "NOTE: need Stowaway compatible keyboard.\n\n" \ + "OK\n" \ + "Prepare settings to be sent and leave BFUSettings\n\n" \ + "Save\n" \ + "Save preferences for next use.\n\n" \ + "To card\n" \ + "If disabled, preferences are saved just to RAM database. If enabled it will " \ + "replace previously found preferences on card or save it on first volume\n\n" \ + "Cancel\n" \ + "Exit and no BFUSettings will be used.\n\n" \ + "Set:\n" \ + "Switches to other part of settings - global, network, modules and tools.\n\n" Modified: linux4palm/BFUGarux/BFUSettings.Rsrc.h =================================================================== --- linux4palm/BFUGarux/BFUSettings.Rsrc.h 2007-03-25 00:14:46 UTC (rev 933) +++ linux4palm/BFUGarux/BFUSettings.Rsrc.h 2007-03-25 00:37:41 UTC (rev 934) @@ -26,6 +26,7 @@ #define BFUCopy2RAMBox 8403 #define BFUCardReadonlyBox 8404 #define BFUDebugModeBox 8405 +#define BFULiveChangesBox 8406 #define BFUNetForm 8100 //"BFUSettings - Network" #define BFUUseNetBox 8101 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sle...@us...> - 2007-03-25 00:14:55
|
Revision: 933 http://svn.sourceforge.net/hackndev/?rev=933&view=rev Author: sleep_walker Date: 2007-03-24 17:14:46 -0700 (Sat, 24 Mar 2007) Log Message: ----------- l4p: BFUGarux modlist behaviour change Modified Paths: -------------- linux4palm/BFUGarux/BFUSettings-alone.c linux4palm/BFUGarux/BFUSettings.Rsrc Modified: linux4palm/BFUGarux/BFUSettings-alone.c =================================================================== --- linux4palm/BFUGarux/BFUSettings-alone.c 2007-03-24 20:02:12 UTC (rev 932) +++ linux4palm/BFUGarux/BFUSettings-alone.c 2007-03-25 00:14:46 UTC (rev 933) @@ -1684,11 +1684,12 @@ #endif } -static Boolean BFUPush2ModList(const Char *name) +static Boolean BFUPush2ModList(const Char *whole_name) { - Char *ptr; + Char *ptr, name[BFUDefaultFileNameSize]; Err err; - + int i = StrLen(whole_name)-StrLen("modlist-")-StrLen(".txt"); + #ifdef MODULES_VERBOSE_DEBUG BFUdoDie("Entering BFUPush2ModList()",0); #endif @@ -1712,6 +1713,8 @@ msize=1; modListHandle=MemHandleNew(BFUDefaultFileNameSize); } + StrNCopy(name,whole_name+StrLen("modlist-"),i); + name[i]='\0'; ptr = MemHandleLock(modListHandle); StrNCopy(ptr+mlength,name, BFUDefaultFileNameSize); mlength += StrLen(name)+1; @@ -1726,16 +1729,16 @@ static Boolean BFUIsModList(const Char *name) { - Char mod[8];//length of "modlist" + Char mod[9];//length of "modlist-" UInt8 l; #ifdef MODULES_VERBOSE_DEBUG BFUdoDie("entering BFUIsModList()",0); #endif - if ((l=StrLen(name))>11) + if ((l=StrLen(name))>13) { - StrNCopy(mod,name,7); //copy "modlist" from beginning - mod[7]='\0'; - if (!StrCaselessCompare(".txt",name+l-4) && !StrCaselessCompare("modlist",mod)) + StrNCopy(mod,name,8); //copy "modlist-" from beginning + mod[8]='\0'; + if (!StrCaselessCompare(".txt",name+l-4) && !StrCaselessCompare("modlist-",mod)) return true; } return false; @@ -1859,7 +1862,7 @@ FormPtr pForm=FrmGetActiveForm(); Char **pptr = MemHandleLock(modPtrHandle); - LstNewList ((void **)&pForm, BFUModList, 72, 29,85, 44,stdFont, 4,BFUModListTrigger); + LstNewList ((void **)&pForm, BFUModList, 52, 29,105, 121,stdFont, 11,BFUModListTrigger); LstSetListChoices(getObjectPtr(pForm,BFUModList),pptr,msize); MemHandleUnlock(modListHandle); MemHandleUnlock(modPtrHandle); Modified: linux4palm/BFUGarux/BFUSettings.Rsrc =================================================================== --- linux4palm/BFUGarux/BFUSettings.Rsrc 2007-03-24 20:02:12 UTC (rev 932) +++ linux4palm/BFUGarux/BFUSettings.Rsrc 2007-03-25 00:14:46 UTC (rev 933) @@ -82,8 +82,8 @@ 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 - LABEL "Modules list:" ID 8210 AT (9 31) USABLE FONT 1 - POPUPTRIGGER "Custom" ID BFUModListTrigger AT (72 29 47 15) USABLE LEFTANCHOR + 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sle...@us...> - 2007-03-24 20:02:15
|
Revision: 932 http://svn.sourceforge.net/hackndev/?rev=932&view=rev Author: sleep_walker Date: 2007-03-24 13:02:12 -0700 (Sat, 24 Mar 2007) Log Message: ----------- l4p: add no CPUfreq support to remove SD card speed problem Modified Paths: -------------- linux4palm/BFUGarux/BFULinuxHelper.c linux4palm/BFUGarux/BFUSettings-alone.c linux4palm/BFUGarux/BFUSettings.Rsrc Modified: linux4palm/BFUGarux/BFULinuxHelper.c =================================================================== --- linux4palm/BFUGarux/BFULinuxHelper.c 2007-03-22 17:00:31 UTC (rev 931) +++ linux4palm/BFUGarux/BFULinuxHelper.c 2007-03-24 20:02:12 UTC (rev 932) @@ -110,8 +110,8 @@ optint >>= 1; printf("BFUSilentBoot=%ld\n",optint & 1); optint >>= 1; - printf("BFUCPUspeed=%ld\n",optint & 3); - optint >>= 2; + printf("BFUCPUspeed=%ld\n",optint & 7); + optint >>= 3; printf("BFUCardRO=%ld\n",optint & 1); optint >>=1; printf("BFUKeyboard=%ld\n",optint & 1); Modified: linux4palm/BFUGarux/BFUSettings-alone.c =================================================================== --- linux4palm/BFUGarux/BFUSettings-alone.c 2007-03-22 17:00:31 UTC (rev 931) +++ linux4palm/BFUGarux/BFUSettings-alone.c 2007-03-24 20:02:12 UTC (rev 932) @@ -191,8 +191,8 @@ options |= BFUSettingsValues.keyboard; options = options << 1; options |= BFUSettingsValues.cardRO; - options = options << 2; -//CPUspeed has 4 possibilities + options = options << 3; +//CPUspeed has 5 possibilities options |= BFUSettingsValues.CPUspeed; options = options << 1; options |= BFUSettingsValues.silentBoot; Modified: linux4palm/BFUGarux/BFUSettings.Rsrc =================================================================== --- linux4palm/BFUGarux/BFUSettings.Rsrc 2007-03-22 17:00:31 UTC (rev 931) +++ linux4palm/BFUGarux/BFUSettings.Rsrc 2007-03-24 20:02:12 UTC (rev 932) @@ -122,7 +122,7 @@ LABEL "Set:" ID 8035 AT (9 16) USABLE FONT 1 CHECKBOX "To card" ID BFUSave2CardBox AT (74 140 47 15) USABLE LEFTANCHOR GROUP 0 LABEL "CPU Frequency:" ID 8350 AT (9 33) USABLE FONT 1 - LIST "Auto" "133 MHz" "266 MHz" "400 MHz" ID BFUCPUSpeedList AT (90 31 39 44) NONUSABLE DISABLED + LIST "Auto" "133 MHz" "266 MHz" "400 MHz" "None" ID BFUCPUSpeedList AT (90 31 39 55) NONUSABLE DISABLED POPUPTRIGGER "Auto" ID BFUCPUSpeedTrigger AT (90 31 55 15) USABLE LEFTANCHOR POPUPLIST ID BFUCPUSpeedTrigger BFUCPUSpeedList LABEL "RAMdisk size:" ID 8351 AT (9 48) USABLE FONT 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z7...@us...> - 2007-03-22 17:00:46
|
Revision: 931 http://svn.sourceforge.net/hackndev/?rev=931&view=rev Author: z72ka Date: 2007-03-22 10:00:31 -0700 (Thu, 22 Mar 2007) Log Message: ----------- palmz72: Reverting keypad assign to right assign.. Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72.c Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72.c 2007-03-20 16:43:17 UTC (rev 930) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72.c 2007-03-22 17:00:31 UTC (rev 931) @@ -153,15 +153,15 @@ KEY_F12, /* Media */ }, { /* row 2 */ - KEY_LEFT, /* D-PAD UP */ + KEY_UP, /* D-PAD UP */ 0, /* unused */ - KEY_RIGHT, /* D-PAD DOWN */ + KEY_DOWN, /* D-PAD DOWN */ }, { /* row 3 */ - KEY_UP, /* D-PAD RIGHT */ + KEY_RIGHT, /* D-PAD RIGHT */ 0, /* unused */ - KEY_DOWN, /* D-PAD LEFT */ + KEY_LEFT, /* D-PAD LEFT */ }, }, .gpio_modes = { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |