You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
(38) |
Apr
(39) |
May
(1) |
Jun
|
Jul
|
Aug
(5) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(36) |
Feb
(3) |
Mar
(7) |
Apr
|
May
(1) |
Jun
(9) |
Jul
(23) |
Aug
(5) |
Sep
(2) |
Oct
(2) |
Nov
(11) |
Dec
|
2008 |
Jan
|
Feb
(4) |
Mar
(5) |
Apr
(5) |
May
|
Jun
|
Jul
(5) |
Aug
(16) |
Sep
(6) |
Oct
|
Nov
|
Dec
(10) |
2009 |
Jan
(4) |
Feb
(17) |
Mar
(6) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
From: <sen...@us...> - 2008-08-12 23:59:30
|
Revision: 322 http://open2x.svn.sourceforge.net/open2x/?rev=322&view=rev Author: senquack Date: 2008-08-12 23:59:38 +0000 (Tue, 12 Aug 2008) Log Message: ----------- Adding missing file mmsp2_ADC.c Modified Paths: -------------- trunk/kernel/linux-open2x-2.4.26_FW2-3/.config Added Paths: ----------- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/mmsp2_ADC.c Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/.config =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/.config 2008-08-09 14:36:41 UTC (rev 321) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/.config 2008-08-12 23:59:38 UTC (rev 322) @@ -135,7 +135,7 @@ # CONFIG_MACH_MMSP2_DTK3 is not set CONFIG_MACH_MMSP2_DTK4=y CONFIG_MACH_GP2X=y -# CONFIG_MACH_GP2XF200 is not set +CONFIG_MACH_GP2XF200=y # CONFIG_MACH_GP2X_DEBUG is not set # CONFIG_MACH_GP2X_SVIDEO_NTSC is not set # CONFIG_MACH_GP2X_SVIDEO_PAL is not set @@ -200,7 +200,7 @@ # CONFIG_BINFMT_MISC is not set # CONFIG_PM is not set # CONFIG_ARTHUR is not set -CONFIG_CMDLINE="root=/dev/mtdblock4 rw" +CONFIG_CMDLINE="root=/dev/mtdblock3 rw" CONFIG_ALIGNMENT_TRAP=y # @@ -283,7 +283,7 @@ CONFIG_MTD_NAND=y # CONFIG_MTD_NAND_VERIFY_WRITE is not set # CONFIG_MTD_NAND_BONFS is not set -# CONFIG_MTD_OPEN2X_SINGLE_PARTITION is not set +CONFIG_MTD_OPEN2X_SINGLE_PARTITION=y # CONFIG_OPEN2X_IGNORE_BB_ERASE is not set # CONFIG_MTD_NAND_SPIA is not set # CONFIG_MTD_NAND_TOTO is not set @@ -491,8 +491,8 @@ CONFIG_MMSP2_VPP=y CONFIG_MMSP2_ISP=y CONFIG_MMSP2_KEY=y -CONFIG_MMSP_GPX_BATT=y -# CONFIG_MMSP_GP2X_ADC is not set +# CONFIG_MMSP_GPX_BATT is not set +CONFIG_MMSP_GP2X_ADC=y # # L3 serial bus support @@ -757,7 +757,7 @@ # Native Language Support # CONFIG_NLS_DEFAULT="UTF8" -# CONFIG_NLS_CODEPAGE_437 is not set +CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -780,7 +780,7 @@ # CONFIG_NLS_ISO8859_8 is not set # CONFIG_NLS_CODEPAGE_1250 is not set # CONFIG_NLS_CODEPAGE_1251 is not set -# CONFIG_NLS_ISO8859_1 is not set +CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set @@ -868,6 +868,8 @@ CONFIG_SOUND_MP2520F_AC97=y # CONFIG_SOUND_TVMIXER is not set # CONFIG_SOUND_AD1980 is not set +CONFIG_SOUND_WM97XX=y +CONFIG_SOUND_WM97XX=y # # Multimedia Capabilities Port drivers @@ -994,7 +996,7 @@ # CONFIG_MMCSD=y # CONFIG_MMCSD_DEBUG is not set -# CONFIG_OPEN2X_SD_AUTOMOUNT is not set +CONFIG_OPEN2X_SD_AUTOMOUNT=y CONFIG_MMCSD_DISK=y CONFIG_MMCSD_SLOT=y Added: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/mmsp2_ADC.c =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/mmsp2_ADC.c (rev 0) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/mmsp2_ADC.c 2008-08-12 23:59:38 UTC (rev 322) @@ -0,0 +1,471 @@ +/* + * drivers/char/mmsp2_ADC.c + * + * Copyright (C) 2007 Gamepark Holdings, Inc. (www.gp2x.com) + * Hyun <hyu...@gp...> + */ + +#include <linux/config.h> +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/version.h> +#include <linux/init.h> +#include <linux/fs.h> +#include <linux/sched.h> +#include <asm/uaccess.h> +#include <asm/hardware.h> +#include <asm/irq.h> +#include <asm/arch/proto_gpio.h> +#include <asm/arch/mmsp20.h> +#include <asm/io.h> +#include <asm/delay.h> +#include <asm/ioctl.h> +#include <asm/unistd.h> +#include <linux/interrupt.h> +#include <linux/wait.h> +#include <linux/ioport.h> +#include <linux/slab.h> // kmalloc() +#include <linux/poll.h> // poll +#include <linux/types.h> +#include <linux/compiler.h> +#include <linux/miscdevice.h> + +#define TPC_MAN_READ_U1 3 +#define TPC_BUSY 1 +#define TPC_IDLE 0 +#define ADCCLK (1<<13) + +/****** IOCTL COMMAND ************/ +/* Select ADC */ +#define BATT_MODE 0 +#define REMOCON_MODE 1 +#define BATT_REMOCON_MODE 2 + +/* Gp2x running mode*/ +#define MENU_MODE 10 +#define MP3_MODE 11 +#define TEXT_VIEW_MODE 12 +#define IMAGE_VIEW_MODE 13 +#define MP3_TEXT_MODE 14 +#define MP3_IMAGE_MODE 15 +#define MOVIE_MODE 16 +#define GAME_MODE 17 +#define CALL_REMOCON 20 + +/* ********** ISOUND EARPHONE REMOCON */ +#define NONE_REMOCON 0 +#define EQ 1 +#define VOLUME_UP 2 +#define VOLUME_DOWN 3 +#define PLAY_PAUSE 4 +#define REW 5 +#define FF 6 +#define NEXT_SKIP 7 +#define REMOVE_REMOCON 8 + + +#define DECT_RECOMON_MIN 0x315 /* 2.6V_min */ +#define DECT_RECOMON_MAX 0x350 /* 2.6V_max */ + +#define ZONE_LIMIT 0x2EA +#define VOLUME_UP_LIMIT 0x2C5//0x2BA /* 0x2CA~ 0x2d9 */ +#define VOLUME_UP_MAX_LIMIT 0x2DC //0x2E3 /* 0x2CA~ 0x2d9 */ + +#define VOLUME_DOWN_LIMIT 0x267 /* 0x26E ~ 0x27F */ +#define VOLUME_DOWN_MAX_LIMIT 0x27B /* 0x26E ~ 0x27F */ + +#define EQ_LIMIT 0x1FA /* 0x1fA ~ 0x20A */ +#define EQ_MAX_LIMIT 0x20D /* 0x1fA ~ 0x20A */ + +#define FF_LIMIT 0x193 /* 0x195 ~ 0x1a0 */ +#define FF_MAX_LIMIT 0x1A6 /* 0x195 ~ 0x1a0 */ + +#define PLAY_PAUSE_LIMIT 0x130 /* 0x130 ~ 0x140 */ +#define PLAY_PAUSE_MAX_LIMIT 0x140 /* 0x130 ~ 0x140 */ + +#define REW_LIMIT 0xd5 //0xCC /* 0xd5 ~ 0xC5 */ +#define REW_MAX_LIMIT 0xE5 //0xEA /* 0xd5 ~ 0xC5 */ + +#define NEXT_SKIP_LIMIT 0x6A /* 0x75 ~ 0x85 */ +#define NEXT_SKIP_MAX_LIMIT 0x8A /* 0x75 ~ 0x85 */ + +#define CHK_REMCOCON_LOW_LIMIT 0x60 +#define CHK_REMCOCON_HIGH_LIMIT 0x350 + +/* **** POWER SUPPLY 3V ~ 2V RANGE menu mode ***** + input 3V:0x3b5 ~~~ 0x3bf + input 2.8V:0x365 ~~~ 0x36f + input 2.4V:0x31b ~~~ 0x31E + input 2V:2B0 ~~~ 0x2af +************************************************** */ +#define BATT_HIGH_LIMIT 0x340 +#define BATT_MID_LIMIT 0x2D0 //0x2B0 +#define BATT_LOW_LIMIT 0x260 //0x260 + +#define BATT_LEVEL_HIGH 0 +#define BATT_LEVEL_MID 1 +#define BATT_LEVEL_LOW 2 +#define BATT_LEVEL_EMPTY 3 +#define BATT_LEVEL_OLD_STATUS 4 + +static unsigned char PosAdc=0; +static unsigned char inc_val=0; +static unsigned char calRemoconFlag; + +typedef struct { + unsigned short batt; + unsigned short remocon; +} MMSP2ADC; + +static unsigned short +TPC_SwitchConvert(unsigned long SW) +{ + unsigned short value; + value = 0; + + if( (SW & TPC_XP_SW) == TPC_XP_SW ) value = (unsigned char)(value & ~(TPC_XP_SW)); + else value = (unsigned char)(TPC_XP_SW); + + if( (SW & TPC_YP_SW) == TPC_YP_SW ) value = (unsigned char)(value & ~(TPC_YP_SW)); + else value = (unsigned char)(value | TPC_YP_SW); + + if( (SW & TPC_XM_SW) == TPC_XM_SW ) value = (unsigned char)(value | TPC_XM_SW); + else value = (unsigned char)(value & ~(TPC_XM_SW)); + + if( (SW & TPC_YM_SW) == TPC_YM_SW ) value = (unsigned char)(value | TPC_YM_SW); + else value = (unsigned char)(value & ~(TPC_YM_SW)); + + if( (SW & TPC_PU_SW) == TPC_PU_SW ) value = (unsigned char)(value & ~(TPC_PU_SW)); + else value = (unsigned char)(value | TPC_PU_SW); + + return value; +} + +static void +TPC_SetDefaultSW(unsigned long SW) +{ + TPC_U1_VALUE = (unsigned short)(TPC_SwitchConvert(SW) << 11); +} + +static void +TPC_Run(void) +{ + unsigned short Mask = (1<<15) | (1<<14) | (1<<4); + TPC_CNTL = (unsigned short)( TPC_CNTL | Mask ); +} + +static void +TPC_Stop(void) +{ + TPC_CNTL = 0 ; +} + +static int +TPC_IsTouchBusy(void) +{ + int IsBusy; + if( TPC_CNTL & 1 ) IsBusy = 1; + else IsBusy = 0; + return IsBusy; +} + +static void +TPC_SetChannelEnb(unsigned long ChannelEnb) +{ + TPC_CNTL = (unsigned short)(((unsigned long)TPC_CNTL & ~(0x1E00)) | ChannelEnb); +} + +static void +TPC_SetADCClock(unsigned long APSV) +{ + TPC_CLK_CNTL = (unsigned short)( (TPC_CLK_CNTL & 0xff00UL) | APSV ); +} + +static void +TPC_SetADCParam +( + unsigned long BandGapTime, + unsigned long CaptureIdleTime, + unsigned long SwitchSetupTime, + unsigned long DecimationRatio, + unsigned long ADCConversionTime +) +{ + TPC_TIME_PARM1 = (unsigned short)((DecimationRatio<<8) | SwitchSetupTime); + TPC_TIME_PARM2 = (unsigned short)((BandGapTime<<8) | CaptureIdleTime); + TPC_TIME_PARM3 = (unsigned short)(ADCConversionTime); +} + +static void +TPC_InitHardware (void) +{ + // All Power Down + TPC_CNTL = ~(1<<6); + // off all switches + TPC_SetDefaultSW(0); /* u1 buffer switch all off */ + TPC_SetADCClock( 255 ); + TPC_SetADCParam ( 0, // BandGapTime + 127, // CaptureIdleTime + 127, // SwitchSetupTime + 5, // DecimationRatio + 4 ); // ADCConversionTime +} + +void +TPC_SetU1In +( + unsigned long U1Channel, + unsigned long Thres, + int IsGreat +) +{ + TPC_CH_SEL = (unsigned long)(( TPC_CH_SEL & ~(0x0007UL<<9) ) | (U1Channel<<9)); + TPC_COMP_U1 = (unsigned long)(((unsigned long)IsGreat<<10) | Thres); +} + +void +TPC_SetU1ADC(unsigned long ADCChannelNum) +{ + unsigned long ChSel; + ChSel = TPC_CH_SEL; + ChSel = (unsigned short)(ChSel & ~(0x7 << 9)); + TPC_CH_SEL = (unsigned short)(ChSel | (ADCChannelNum << 9)); +} + +static void +InitTouch (void) +{ + TPC_InitHardware(); + + TPC_SetADCClock( 255 ); + + TPC_SetADCParam ( 0, // BandGapTime + 255, // CaptureIdleTime + 255, // SwitchSetupTime + 5, // DecimationRatio + 4 ); // ADCConversionTime + + TPC_SetDefaultSW ( TPC_PU_SW | TPC_YM_SW ); +} + + +static unsigned short +TPC_ManReadChannel(void) +{ + unsigned short ReadValue; + + TPC_Run(); + + do { } while( ( TPC_CNTL & 1 ) == (unsigned short)TPC_BUSY ); + + ReadValue = (unsigned short)(TPC_U1_VALUE & 0x3ff); + + TPC_SetChannelEnb(0); + TPC_Stop(); + + return ReadValue; +} + + +static unsigned short +TPC_GetStaticADCOut(unsigned long ChannelNum) +{ + unsigned short ADCOut; + TPC_Stop(); + TPC_SetU1ADC ( ChannelNum ); + udelay(5); + TPC_SetChannelEnb( TPC_U1_CH_EN ); + udelay(5); + TPC_Run(); + + while ( !TPC_IsTouchBusy() ); + while ( TPC_IsTouchBusy() ); + + ADCOut = TPC_ManReadChannel(); + + return ADCOut; +} + +int mmsp2ADC_open(struct inode *inode, struct file *filp) +{ + MOD_INC_USE_COUNT; + calRemoconFlag = 0; + return (0); /* success */ +} + +int mmsp2ADC_release(struct inode *inode, struct file *filp) +{ + MOD_DEC_USE_COUNT; + return (0); +} + +static ssize_t mmsp2ADC_read(struct file *filp, char *Putbuf, size_t length, loff_t *f_pos) +{ + MMSP2ADC adcVal; + unsigned short tempval; + unsigned char cmode,cmode_old; + int cnt=0,ccnt=0; + + TPC_SetDefaultSW( 0 ); + udelay(20); //5 + + switch(PosAdc) + { + case BATT_MODE: + case BATT_REMOCON_MODE: + tempval = TPC_GetStaticADCOut( 0 ) + inc_val; + + if( tempval > BATT_HIGH_LIMIT) cmode_old = BATT_LEVEL_HIGH; + else if( tempval > BATT_MID_LIMIT) cmode_old = BATT_LEVEL_MID; + else if( tempval > BATT_LOW_LIMIT) cmode_old = BATT_LEVEL_LOW; + else cmode_old = BATT_LEVEL_EMPTY; + + while(cnt++ < 10) + { + TPC_SetDefaultSW( 0 ); + udelay(20); + tempval = TPC_GetStaticADCOut( 0 ) + inc_val; + + if( tempval > BATT_HIGH_LIMIT) cmode = BATT_LEVEL_HIGH; + else if( tempval > BATT_MID_LIMIT) cmode = BATT_LEVEL_MID; + else if( tempval > BATT_LOW_LIMIT) cmode = BATT_LEVEL_LOW; + else cmode = BATT_LEVEL_EMPTY; + + if(ccnt == 4){ + adcVal.batt = cmode; + break; + } + else + { + if(cmode == cmode_old) ccnt++; + else ccnt=0; + } + + adcVal.batt = BATT_LEVEL_OLD_STATUS; + cmode_old = cmode; + } + if (PosAdc == BATT_MODE) break; + case REMOCON_MODE: +#ifdef CONFIG_MACH_GP2XF200 + if(calRemoconFlag) + { + tempval = TPC_GetStaticADCOut( 1 ); + if( (tempval < CHK_REMCOCON_LOW_LIMIT) || (tempval > CHK_REMCOCON_HIGH_LIMIT) ) + { + printk("Remove remocon\n"); + calRemoconFlag=0; + adcVal.remocon = REMOVE_REMOCON; + } + else if(tempval > ZONE_LIMIT ) adcVal.remocon = NONE_REMOCON; + else if( (tempval > VOLUME_UP_LIMIT) && (tempval < VOLUME_UP_MAX_LIMIT) ) adcVal.remocon = VOLUME_UP; + else if( (tempval > VOLUME_DOWN_LIMIT)&&(tempval < VOLUME_DOWN_MAX_LIMIT) ) adcVal.remocon = VOLUME_DOWN; + else if( (tempval > EQ_LIMIT) && (tempval < EQ_MAX_LIMIT) ) adcVal.remocon = EQ; + else if( (tempval > FF_LIMIT) && (tempval < FF_MAX_LIMIT) ) adcVal.remocon = FF; + else if( (tempval > PLAY_PAUSE_LIMIT) && (tempval < PLAY_PAUSE_MAX_LIMIT) ) adcVal.remocon = PLAY_PAUSE; + else if( (tempval > REW_LIMIT) && (tempval < REW_MAX_LIMIT) ) adcVal.remocon = REW; + else if( (tempval > NEXT_SKIP_LIMIT) && (tempval < NEXT_SKIP_MAX_LIMIT) ) adcVal.remocon = NEXT_SKIP; + else adcVal.remocon = NONE_REMOCON; + } else +#endif + adcVal.remocon = REMOVE_REMOCON;; + break; + } + + TPC_SetDefaultSW ( TPC_PU_SW ); + + if(copy_to_user(Putbuf, &adcVal, sizeof(MMSP2ADC))) + { + return -EFAULT; + } + + return sizeof(MMSP2ADC); +} + +int mmsp2ADC_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,unsigned long arg) +{ + unsigned short tempval; + int calRemoconCnt=10; + int chkcnt=0,noIncnt=0; + + + switch(arg) + { + case BATT_MODE: + PosAdc=BATT_MODE; + break; + case REMOCON_MODE: + PosAdc=REMOCON_MODE; + break; + case BATT_REMOCON_MODE: + PosAdc=BATT_REMOCON_MODE; + break; + case MOVIE_MODE: + inc_val=0x22; + break; + case GAME_MODE: + inc_val=0x10; + break; + case CALL_REMOCON: +#ifndef CONFIG_MACH_GP2XF200 + return 0; /* Not support is f100 */ +#endif + if(!calRemoconFlag){ /* Only Mp3 mode */ + while(calRemoconCnt--){ + TPC_SetDefaultSW(0); + udelay(20); + tempval = TPC_GetStaticADCOut( 1 ); + if( (tempval > DECT_RECOMON_MIN) && (tempval < DECT_RECOMON_MAX) ){ + if(chkcnt==5){ + printk("insert ear remocon\n"); + calRemoconFlag=1; + return 1; + } + chkcnt++; + } + else chkcnt=0; + + udelay(20); + } + + }else{ + return 1; + } + } + return 0; +} + +static struct file_operations mmsp2ADC_fops = { + owner: THIS_MODULE, + open: mmsp2ADC_open, + read: mmsp2ADC_read, + ioctl: mmsp2ADC_ioctl, + release: mmsp2ADC_release, +}; + +static struct miscdevice mmsp2ADC = { + MMSP2ADC_MINOR, "mmsp2adc", &mmsp2ADC_fops +}; + +static int __init mmsp2ADC_init(void) +{ + int i; + PosAdc = BATT_MODE; + TPC_SetDefaultSW(0); + InitTouch(); + TPC_Run(); + TPC_SetDefaultSW(TPC_PU_SW); + TPC_SetU1In ( TPC_ADC_CH_0, 0x2A0, 0 ); + + misc_register(& mmsp2ADC); + return 0; +} + +static void __exit mmsp2ADC_exit(void) +{ + TPC_INTR = 0; + TPC_CNTL = (1<<6); + misc_deregister(&mmsp2ADC); +} + +module_init(mmsp2ADC_init); +module_exit(mmsp2ADC_exit); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sen...@us...> - 2008-08-09 14:36:35
|
Revision: 321 http://open2x.svn.sourceforge.net/open2x/?rev=321&view=rev Author: senquack Date: 2008-08-09 14:36:41 +0000 (Sat, 09 Aug 2008) Log Message: ----------- Raised default pre-scaled mixer level 10% Modified Paths: -------------- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/block/genhd.c trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/mem.c trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/sound/ac97_codec.c trunk/kernel/linux-open2x-2.4.26_FW2-3/init/main.c Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/block/genhd.c =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/block/genhd.c 2008-08-09 11:35:19 UTC (rev 320) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/block/genhd.c 2008-08-09 14:36:41 UTC (rev 321) @@ -246,13 +246,13 @@ { //senquack - text too long for GP2X // PROGRESS(9,"setting up block devices"); - PROGRESS(12,"block devices"); + PROGRESS(12,"Block devices"); blk_dev_init(); sti(); #ifdef CONFIG_NET //senquqack - shortening text // PROGRESS(26, "setting up network devices"); - PROGRESS(26, "network devices"); + PROGRESS(26, "Network devices"); net_dev_init(); #endif #ifdef CONFIG_ATM Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/mem.c =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/mem.c 2008-08-09 11:35:19 UTC (rev 320) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/mem.c 2008-08-09 14:36:41 UTC (rev 321) @@ -742,7 +742,7 @@ { //senquack - fixing for GP2X // PROGRESS(6,"setting up character devices"); - PROGRESS(6,"char devices"); + PROGRESS(6,"Char devices"); if (devfs_register_chrdev(MEM_MAJOR,"mem",&memory_fops)) printk("unable to get major %d for memory devs\n", MEM_MAJOR); memory_devfs_register(); Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/sound/ac97_codec.c =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/sound/ac97_codec.c 2008-08-09 11:35:19 UTC (rev 320) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/sound/ac97_codec.c 2008-08-09 14:36:41 UTC (rev 321) @@ -445,8 +445,11 @@ // arbitrary figure. g_volume_scale defaults to 100, meaning 100%, but 115 // places our eventual figures into a more reasonable level for the amps in // gp2x's - left = (left * g_volume_scale) / 115; - right = (right * g_volume_scale) / 115; + //senquack - 115 proved to be too quiet for some apps like Supertux +// left = (left * g_volume_scale) / 115; +// right = (right * g_volume_scale) / 115; + left = (left * g_volume_scale) / 105; + right = (right * g_volume_scale) / 105; if (left > 100) { left = 100; Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/init/main.c =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/init/main.c 2008-08-09 11:35:19 UTC (rev 320) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/init/main.c 2008-08-09 14:36:41 UTC (rev 321) @@ -609,7 +609,7 @@ //senquack - modifying for GP2X // PROGRESS(50, "Starting init"); - PROGRESS(65, "loading userspace"); + PROGRESS(65, "Loading userspace"); #ifdef CONFIG_LPP //senquack - there is a bug somewhere that blanks the progress bar when /proc/progress // is written to (though I can see it display at a wrong offset when I write to it This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <or...@us...> - 2008-08-09 11:36:53
|
Revision: 320 http://open2x.svn.sourceforge.net/open2x/?rev=320&view=rev Author: orkie Date: 2008-08-09 11:35:19 +0000 (Sat, 09 Aug 2008) Log Message: ----------- Updating libs-new to SDL-1.2.13, this is now the most up to date set of Open2x libs Modified Paths: -------------- trunk/libs-new/libxml2/libxml2-2.6.31/xstc/Makefile trunk/libs-new/sdl/sdl/Makefile.mk trunk/libs-new/tremor/tremor-19102007/Makefile.in trunk/libs-new/tremor/tremor-19102007/aclocal.m4 trunk/libs-new/tremor/tremor-19102007/autom4te.cache/requests trunk/libs-new/tremor/tremor-19102007/configure trunk/libs-new/zlib/zlib-1.2.3/Makefile trunk/libs-new/zlib/zlib-1.2.3/zconf.h Added Paths: ----------- trunk/libs-new/sdl/sdl/1.2.13.mk trunk/libs-new/sdl/sdl/SDL-1.2.13/ trunk/libs-new/sdl/sdl/SDL-1.2.13/BUGS trunk/libs-new/sdl/sdl/SDL-1.2.13/Borland.html trunk/libs-new/sdl/sdl/SDL-1.2.13/Borland.zip trunk/libs-new/sdl/sdl/SDL-1.2.13/COPYING trunk/libs-new/sdl/sdl/SDL-1.2.13/CREDITS trunk/libs-new/sdl/sdl/SDL-1.2.13/CWprojects.sea.bin trunk/libs-new/sdl/sdl/SDL-1.2.13/INSTALL trunk/libs-new/sdl/sdl/SDL-1.2.13/MPWmake.sea.bin trunk/libs-new/sdl/sdl/SDL-1.2.13/Makefile.dc trunk/libs-new/sdl/sdl/SDL-1.2.13/Makefile.in trunk/libs-new/sdl/sdl/SDL-1.2.13/Makefile.minimal trunk/libs-new/sdl/sdl/SDL-1.2.13/README trunk/libs-new/sdl/sdl/SDL-1.2.13/README-SDL.txt trunk/libs-new/sdl/sdl/SDL-1.2.13/README.AmigaOS trunk/libs-new/sdl/sdl/SDL-1.2.13/README.BeOS trunk/libs-new/sdl/sdl/SDL-1.2.13/README.CVS trunk/libs-new/sdl/sdl/SDL-1.2.13/README.DC trunk/libs-new/sdl/sdl/SDL-1.2.13/README.MacOS trunk/libs-new/sdl/sdl/SDL-1.2.13/README.MacOSX trunk/libs-new/sdl/sdl/SDL-1.2.13/README.MiNT trunk/libs-new/sdl/sdl/SDL-1.2.13/README.NDS trunk/libs-new/sdl/sdl/SDL-1.2.13/README.NanoX trunk/libs-new/sdl/sdl/SDL-1.2.13/README.OS2 trunk/libs-new/sdl/sdl/SDL-1.2.13/README.PicoGUI trunk/libs-new/sdl/sdl/SDL-1.2.13/README.Porting trunk/libs-new/sdl/sdl/SDL-1.2.13/README.QNX trunk/libs-new/sdl/sdl/SDL-1.2.13/README.Qtopia trunk/libs-new/sdl/sdl/SDL-1.2.13/README.RISCOS trunk/libs-new/sdl/sdl/SDL-1.2.13/README.SVN trunk/libs-new/sdl/sdl/SDL-1.2.13/README.Symbian trunk/libs-new/sdl/sdl/SDL-1.2.13/README.Watcom trunk/libs-new/sdl/sdl/SDL-1.2.13/README.WinCE trunk/libs-new/sdl/sdl/SDL-1.2.13/README.wscons trunk/libs-new/sdl/sdl/SDL-1.2.13/SDL.qpg.in trunk/libs-new/sdl/sdl/SDL-1.2.13/SDL.spec trunk/libs-new/sdl/sdl/SDL-1.2.13/SDL.spec.in trunk/libs-new/sdl/sdl/SDL-1.2.13/TODO trunk/libs-new/sdl/sdl/SDL-1.2.13/VisualC.html trunk/libs-new/sdl/sdl/SDL-1.2.13/VisualC.zip trunk/libs-new/sdl/sdl/SDL-1.2.13/VisualCE.zip trunk/libs-new/sdl/sdl/SDL-1.2.13/Watcom-OS2.zip trunk/libs-new/sdl/sdl/SDL-1.2.13/Watcom-Win32.zip trunk/libs-new/sdl/sdl/SDL-1.2.13/WhatsNew trunk/libs-new/sdl/sdl/SDL-1.2.13/Xcode.tar.gz trunk/libs-new/sdl/sdl/SDL-1.2.13/acinclude.m4 trunk/libs-new/sdl/sdl/SDL-1.2.13/aclocal.m4 trunk/libs-new/sdl/sdl/SDL-1.2.13/autogen.sh trunk/libs-new/sdl/sdl/SDL-1.2.13/build-scripts/ trunk/libs-new/sdl/sdl/SDL-1.2.13/build-scripts/config.guess trunk/libs-new/sdl/sdl/SDL-1.2.13/build-scripts/config.sub trunk/libs-new/sdl/sdl/SDL-1.2.13/build-scripts/fatbuild.sh trunk/libs-new/sdl/sdl/SDL-1.2.13/build-scripts/install-sh trunk/libs-new/sdl/sdl/SDL-1.2.13/build-scripts/ltmain.sh trunk/libs-new/sdl/sdl/SDL-1.2.13/build-scripts/makedep.sh trunk/libs-new/sdl/sdl/SDL-1.2.13/build-scripts/mkinstalldirs trunk/libs-new/sdl/sdl/SDL-1.2.13/build-scripts/strip_fPIC.sh trunk/libs-new/sdl/sdl/SDL-1.2.13/configure trunk/libs-new/sdl/sdl/SDL-1.2.13/configure.in trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/ trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/ trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/audio.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/cdrom.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/event.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/eventfunctions.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/eventstructures.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/general.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/guide.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/guideaboutsdldoc.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/guideaudioexamples.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/guidebasicsinit.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/guidecdromexamples.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/guidecredits.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/guideeventexamples.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/guideexamples.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/guideinput.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/guideinputkeyboard.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/guidepreface.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/guidethebasics.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/guidetimeexamples.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/guidevideo.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/guidevideoopengl.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/index.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/joystick.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/reference.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlactiveevent.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdladdtimer.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlaudiocvt.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlaudiospec.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlblitsurface.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlbuildaudiocvt.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcd.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcdclose.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcdeject.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcdname.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcdnumdrives.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcdopen.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcdpause.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcdplay.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcdplaytracks.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcdresume.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcdstatus.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcdstop.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcdtrack.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcloseaudio.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcolor.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcondbroadcast.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcondsignal.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcondwait.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcondwaittimeout.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlconvertaudio.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlconvertsurface.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcreatecond.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcreatecursor.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcreatemutex.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcreatergbsurface.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcreatergbsurfacefrom.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcreatesemaphore.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcreatethread.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlcreateyuvoverlay.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdldelay.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdldestroycond.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdldestroymutex.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdldestroysemaphore.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdldisplayformat.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdldisplayformatalpha.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdldisplayyuvoverlay.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlenablekeyrepeat.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlenableunicode.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlenvvars.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlevent.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdleventstate.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlexposeevent.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlfillrect.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlflip.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlfreecursor.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlfreesurface.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlfreewav.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlfreeyuvoverlay.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlgetappstate.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlgetaudiostatus.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlgetcliprect.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlgetcursor.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlgeterror.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlgeteventfilter.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlgetgammaramp.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlgetkeyname.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlgetkeystate.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlgetmodstate.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlgetmousestate.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlgetrelativemousestate.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlgetrgb.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlgetrgba.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlgetthreadid.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlgetticks.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlgetvideoinfo.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlgetvideosurface.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlglattr.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlglgetattribute.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlglgetprocaddress.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlglloadlibrary.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlglsetattribute.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlglswapbuffers.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlinit.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlinitsubsystem.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdljoyaxisevent.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdljoyballevent.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdljoybuttonevent.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdljoyhatevent.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdljoystickclose.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdljoystickeventstate.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdljoystickgetaxis.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdljoystickgetball.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdljoystickgetbutton.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdljoystickgethat.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdljoystickindex.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdljoystickname.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdljoysticknumaxes.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdljoysticknumballs.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdljoysticknumbuttons.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdljoysticknumhats.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdljoystickopen.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdljoystickopened.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdljoystickupdate.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlkey.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlkeyboardevent.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlkeysym.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlkillthread.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdllistmodes.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlloadbmp.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlloadwav.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdllockaudio.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdllocksurface.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdllockyuvoverlay.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlmaprgb.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlmaprgba.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlmixaudio.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlmousebuttonevent.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlmousemotionevent.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlmutexp.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlmutexv.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlnumjoysticks.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlopenaudio.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdloverlay.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlpalette.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlpauseaudio.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlpeepevents.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlpixelformat.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlpollevent.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlpumpevents.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlpushevent.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlquit.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlquitevent.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlquitsubsystem.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlrect.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlremovetimer.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlresizeevent.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlsavebmp.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlsempost.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlsemtrywait.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlsemvalue.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlsemwait.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlsemwaittimeout.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlsetalpha.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlsetcliprect.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlsetcolorkey.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlsetcolors.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlsetcursor.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlseteventfilter.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlsetgamma.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlsetgammaramp.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlsetmodstate.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlsetpalette.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlsettimer.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlsetvideomode.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlshowcursor.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlsurface.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlsyswmevent.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlthreadid.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlunlockaudio.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlunlocksurface.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlunlockyuvoverlay.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlupdaterect.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlupdaterects.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdluserevent.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlvideodrivername.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlvideoinfo.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlvideomodeok.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlwaitevent.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlwaitthread.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlwarpmouse.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlwasinit.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlwmgetcaption.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlwmgrabinput.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlwmiconifywindow.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlwmsetcaption.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlwmseticon.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/sdlwmtogglefullscreen.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/thread.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/time.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/video.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/html/wm.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/images/ trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/images/rainbow.gif trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/index.html trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/ trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDLKey.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_ActiveEvent.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_AddTimer.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_AudioCVT.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_AudioSpec.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_BlitSurface.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_BuildAudioCVT.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_CD.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_CDClose.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_CDEject.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_CDName.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_CDNumDrives.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_CDOpen.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_CDPause.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_CDPlay.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_CDPlayTracks.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_CDResume.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_CDStatus.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_CDStop.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_CDtrack.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_CloseAudio.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_Color.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_CondBroadcast.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_CondSignal.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_CondWait.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_CondWaitTimeout.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_ConvertAudio.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_ConvertSurface.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_CreateCond.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_CreateCursor.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_CreateMutex.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_CreateRGBSurface.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_CreateRGBSurfaceFrom.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_CreateSemaphore.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_CreateThread.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_CreateYUVOverlay.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_Delay.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_DestroyCond.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_DestroyMutex.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_DestroySemaphore.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_DisplayFormat.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_DisplayFormatAlpha.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_DisplayYUVOverlay.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_EnableKeyRepeat.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_EnableUNICODE.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_Event.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_EventState.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_ExposeEvent.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_FillRect.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_Flip.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_FreeCursor.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_FreeSurface.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_FreeWAV.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_FreeYUVOverlay.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_GL_GetAttribute.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_GL_GetProcAddress.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_GL_LoadLibrary.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_GL_SetAttribute.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_GL_SwapBuffers.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_GLattr.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_GetAppState.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_GetAudioStatus.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_GetClipRect.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_GetCursor.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_GetError.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_GetEventFilter.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_GetGamma.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_GetGammaRamp.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_GetKeyName.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_GetKeyState.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_GetModState.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_GetMouseState.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_GetRGB.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_GetRGBA.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_GetRelativeMouseState.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_GetThreadID.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_GetTicks.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_GetVideoInfo.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_GetVideoSurface.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_Init.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_InitSubSystem.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_JoyAxisEvent.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_JoyBallEvent.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_JoyButtonEvent.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_JoyHatEvent.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_JoystickClose.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_JoystickEventState.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_JoystickGetAxis.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_JoystickGetBall.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_JoystickGetButton.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_JoystickGetHat.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_JoystickIndex.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_JoystickName.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_JoystickNumAxes.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_JoystickNumBalls.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_JoystickNumButtons.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_JoystickNumHats.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_JoystickOpen.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_JoystickOpened.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_JoystickUpdate.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_KeyboardEvent.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_KillThread.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_ListModes.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_LoadBMP.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_LoadWAV.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_LockAudio.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_LockSurface.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_LockYUVOverlay.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_MapRGB.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_MapRGBA.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_MixAudio.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_MouseButtonEvent.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_MouseMotionEvent.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_NumJoysticks.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_OpenAudio.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_Overlay.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_Palette.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_PauseAudio.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_PeepEvents.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_PixelFormat.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_PollEvent.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_PumpEvents.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_PushEvent.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_Quit.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_QuitEvent.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_QuitSubSystem.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_RWFromFile.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_Rect.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_RemoveTimer.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_ResizeEvent.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_SaveBMP.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_SemPost.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_SemTryWait.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_SemValue.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_SemWait.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_SemWaitTimeout.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_SetAlpha.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_SetClipRect.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_SetColorKey.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_SetColors.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_SetCursor.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_SetEventFilter.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_SetGamma.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_SetGammaRamp.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_SetModState.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_SetPalette.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_SetTimer.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_SetVideoMode.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_ShowCursor.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_Surface.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_SysWMEvent.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_ThreadID.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_UnlockAudio.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_UnlockSurface.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_UnlockYUVOverlay.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_UpdateRect.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_UpdateRects.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_UserEvent.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_VideoDriverName.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_VideoInfo.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_VideoModeOK.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_WM_GetCaption.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_WM_GrabInput.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_WM_IconifyWindow.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_WM_SetCaption.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_WM_SetIcon.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_WM_ToggleFullScreen.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_WaitEvent.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_WaitThread.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_WarpMouse.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_WasInit.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_keysym.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_mutexP.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs/man3/SDL_mutexV.3 trunk/libs-new/sdl/sdl/SDL-1.2.13/docs.html trunk/libs-new/sdl/sdl/SDL-1.2.13/include/ trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_active.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_audio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_byteorder.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_cdrom.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_config.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_config.h.default trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_config.h.in trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_config_dreamcast.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_config_macos.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_config_macosx.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_config_minimal.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_config_nds.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_config_os2.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_config_symbian.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_config_win32.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_copying.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_cpuinfo.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_endian.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_error.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_events.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_getenv.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_joystick.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_keyboard.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_keysym.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_loadso.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_main.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_mouse.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_mutex.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_name.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_opengl.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_platform.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_quit.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_rwops.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_stdinc.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_syswm.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_thread.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_timer.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_types.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_version.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/SDL_video.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/begin_code.h trunk/libs-new/sdl/sdl/SDL-1.2.13/include/close_code.h trunk/libs-new/sdl/sdl/SDL-1.2.13/sdl-config.in trunk/libs-new/sdl/sdl/SDL-1.2.13/sdl.m4 trunk/libs-new/sdl/sdl/SDL-1.2.13/sdl.pc trunk/libs-new/sdl/sdl/SDL-1.2.13/sdl.pc.in trunk/libs-new/sdl/sdl/SDL-1.2.13/src/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/SDL.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/SDL_error.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/SDL_error_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/SDL_fatal.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/SDL_fatal.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/SDL_audio.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/SDL_audio_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/SDL_audiocvt.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/SDL_audiodev.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/SDL_audiodev_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/SDL_audiomem.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/SDL_mixer.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/SDL_mixer_MMX.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/SDL_mixer_MMX.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/SDL_mixer_MMX_VC.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/SDL_mixer_MMX_VC.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/SDL_mixer_m68k.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/SDL_mixer_m68k.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/SDL_sysaudio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/SDL_wave.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/SDL_wave.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/alsa/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/alsa/SDL_alsa_audio.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/alsa/SDL_alsa_audio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/arts/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/arts/SDL_artsaudio.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/arts/SDL_artsaudio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/baudio/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/baudio/SDL_beaudio.cc trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/baudio/SDL_beaudio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/bsd/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/bsd/SDL_bsdaudio.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/bsd/SDL_bsdaudio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/dart/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/dart/SDL_dart.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/dart/SDL_dart.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/dc/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/dc/SDL_dcaudio.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/dc/SDL_dcaudio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/dc/aica.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/dc/aica.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/disk/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/disk/SDL_diskaudio.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/disk/SDL_diskaudio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/dma/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/dma/SDL_dmaaudio.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/dma/SDL_dmaaudio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/dmedia/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/dmedia/SDL_irixaudio.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/dmedia/SDL_irixaudio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/dsp/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/dsp/SDL_dspaudio.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/dsp/SDL_dspaudio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/dummy/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/dummy/SDL_dummyaudio.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/dummy/SDL_dummyaudio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/esd/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/esd/SDL_esdaudio.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/esd/SDL_esdaudio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/macosx/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/macosx/SDL_coreaudio.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/macosx/SDL_coreaudio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/macrom/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/macrom/SDL_romaudio.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/macrom/SDL_romaudio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/mint/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/mint/SDL_mintaudio.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/mint/SDL_mintaudio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/mint/SDL_mintaudio_dma8.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/mint/SDL_mintaudio_dma8.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/mint/SDL_mintaudio_gsxb.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/mint/SDL_mintaudio_gsxb.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/mint/SDL_mintaudio_it.S trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/mint/SDL_mintaudio_mcsn.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/mint/SDL_mintaudio_mcsn.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/mint/SDL_mintaudio_stfa.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/mint/SDL_mintaudio_stfa.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/mint/SDL_mintaudio_xbios.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/mme/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/mme/SDL_mmeaudio.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/mme/SDL_mmeaudio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/nas/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/nas/SDL_nasaudio.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/nas/SDL_nasaudio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/nds/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/nds/SDL_ndsaudio.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/nds/SDL_ndsaudio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/nds/sound9.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/nds/soundcommon.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/nto/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/nto/SDL_nto_audio.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/nto/SDL_nto_audio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/paudio/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/paudio/SDL_paudio.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/paudio/SDL_paudio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/pulse/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/pulse/SDL_pulseaudio.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/pulse/SDL_pulseaudio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/sun/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/sun/SDL_sunaudio.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/sun/SDL_sunaudio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/symbian/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/symbian/SDL_epocaudio.cpp trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/symbian/SDL_epocaudio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/symbian/streamplayer.cpp trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/symbian/streamplayer.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/ums/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/ums/SDL_umsaudio.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/ums/SDL_umsaudio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/windib/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/windib/SDL_dibaudio.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/windib/SDL_dibaudio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/windx5/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/windx5/SDL_dx5audio.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/windx5/SDL_dx5audio.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/audio/windx5/directx.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/SDL_cdrom.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/SDL_syscdrom.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/aix/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/aix/SDL_syscdrom.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/beos/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/beos/SDL_syscdrom.cc trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/bsdi/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/bsdi/SDL_syscdrom.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/dc/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/dc/SDL_syscdrom.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/dummy/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/dummy/SDL_syscdrom.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/freebsd/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/freebsd/SDL_syscdrom.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/linux/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/linux/SDL_syscdrom.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/macos/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/macos/SDL_syscdrom.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/macos/SDL_syscdrom_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/macosx/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/macosx/AudioFilePlayer.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/macosx/AudioFilePlayer.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/macosx/AudioFileReaderThread.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/macosx/CDPlayer.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/macosx/CDPlayer.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/macosx/SDLOSXCAGuard.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/macosx/SDLOSXCAGuard.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/macosx/SDL_syscdrom.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/macosx/SDL_syscdrom_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/mint/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/mint/SDL_syscdrom.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/openbsd/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/openbsd/SDL_syscdrom.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/os2/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/os2/SDL_syscdrom.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/osf/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/osf/SDL_syscdrom.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/qnx/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/qnx/SDL_syscdrom.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/win32/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cdrom/win32/SDL_syscdrom.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cpuinfo/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/cpuinfo/SDL_cpuinfo.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/events/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/events/SDL_active.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/events/SDL_events.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/events/SDL_events_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/events/SDL_expose.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/events/SDL_keyboard.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/events/SDL_mouse.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/events/SDL_quit.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/events/SDL_resize.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/events/SDL_sysevents.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/file/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/file/SDL_rwops.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/hermes/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/hermes/COPYING.LIB trunk/libs-new/sdl/sdl/SDL-1.2.13/src/hermes/HeadMMX.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/hermes/HeadX86.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/hermes/README trunk/libs-new/sdl/sdl/SDL-1.2.13/src/hermes/common.inc trunk/libs-new/sdl/sdl/SDL-1.2.13/src/hermes/mmx_main.asm trunk/libs-new/sdl/sdl/SDL-1.2.13/src/hermes/mmxp2_32.asm trunk/libs-new/sdl/sdl/SDL-1.2.13/src/hermes/x86_main.asm trunk/libs-new/sdl/sdl/SDL-1.2.13/src/hermes/x86p_16.asm trunk/libs-new/sdl/sdl/SDL-1.2.13/src/hermes/x86p_32.asm trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/SDL_joystick.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/SDL_joystick_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/SDL_sysjoystick.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/beos/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/beos/SDL_bejoystick.cc trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/bsd/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/bsd/SDL_sysjoystick.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/darwin/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/darwin/10.3.9-FIX/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/darwin/10.3.9-FIX/IOHIDLib.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/darwin/SDL_sysjoystick.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/dc/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/dc/SDL_sysjoystick.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/dummy/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/dummy/SDL_sysjoystick.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/linux/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/linux/SDL_sysjoystick.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/macos/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/macos/SDL_sysjoystick.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/mint/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/mint/SDL_sysjoystick.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/nds/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/nds/SDL_sysjoystick.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/os2/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/os2/SDL_sysjoystick.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/os2/joyos2.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/riscos/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/riscos/SDL_sysjoystick.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/win32/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/joystick/win32/SDL_mmjoystick.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/loadso/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/loadso/beos/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/loadso/beos/SDL_sysloadso.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/loadso/dlopen/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/loadso/dlopen/SDL_sysloadso.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/loadso/dummy/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/loadso/dummy/SDL_sysloadso.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/loadso/macos/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/loadso/macos/SDL_sysloadso.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/loadso/macosx/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/loadso/macosx/SDL_dlcompat.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/loadso/mint/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/loadso/mint/SDL_sysloadso.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/loadso/os2/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/loadso/os2/SDL_sysloadso.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/loadso/win32/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/loadso/win32/SDL_sysloadso.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/beos/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/beos/SDL_BeApp.cc trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/beos/SDL_BeApp.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/dummy/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/dummy/SDL_dummy_main.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/macos/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/macos/SDL.r trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/macos/SDL.shlib.r trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/macos/SDL_main.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/macos/SIZE.r trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/macos/exports/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/macos/exports/Makefile trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/macos/exports/SDL.x trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/macos/exports/gendef.pl trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/macosx/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/macosx/Info.plist.in trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/macosx/SDLMain.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/macosx/SDLMain.m trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/macosx/SDLMain.nib/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/macosx/SDLMain.nib/classes.nib trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/macosx/SDLMain.nib/info.nib trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/macosx/SDLMain.nib/objects.nib trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/macosx/info.nib trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/qtopia/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/qtopia/SDL_qtopia_main.cc trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/symbian/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/symbian/EKA1/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/symbian/EKA1/SDL_main.cpp trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/symbian/EKA2/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/symbian/EKA2/SDL_main.cpp trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/symbian/EKA2/sdlexe.cpp trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/symbian/EKA2/sdllib.cpp trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/symbian/EKA2/vectorbuffer.cpp trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/symbian/EKA2/vectorbuffer.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/win32/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/win32/SDL_win32_main.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/main/win32/version.rc trunk/libs-new/sdl/sdl/SDL-1.2.13/src/stdlib/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/stdlib/SDL_getenv.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/stdlib/SDL_iconv.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/stdlib/SDL_malloc.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/stdlib/SDL_qsort.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/stdlib/SDL_stdlib.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/stdlib/SDL_string.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/SDL_systhread.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/SDL_thread.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/SDL_thread_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/beos/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/beos/SDL_syssem.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/beos/SDL_systhread.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/beos/SDL_systhread_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/dc/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/dc/SDL_syscond.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/dc/SDL_syscond_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/dc/SDL_sysmutex.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/dc/SDL_sysmutex_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/dc/SDL_syssem.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/dc/SDL_syssem_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/dc/SDL_systhread.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/dc/SDL_systhread_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/generic/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/generic/SDL_syscond.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/generic/SDL_sysmutex.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/generic/SDL_sysmutex_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/generic/SDL_syssem.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/generic/SDL_systhread.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/generic/SDL_systhread_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/irix/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/irix/SDL_syssem.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/irix/SDL_systhread.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/irix/SDL_systhread_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/os2/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/os2/SDL_syscond.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/os2/SDL_syscond_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/os2/SDL_sysmutex.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/os2/SDL_syssem.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/os2/SDL_systhread.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/os2/SDL_systhread_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/pth/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/pth/SDL_syscond.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/pth/SDL_sysmutex.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/pth/SDL_sysmutex_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/pth/SDL_systhread.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/pth/SDL_systhread_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/pthread/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/pthread/SDL_syscond.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/pthread/SDL_sysmutex.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/pthread/SDL_sysmutex_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/pthread/SDL_syssem.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/pthread/SDL_systhread.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/pthread/SDL_systhread_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/riscos/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/riscos/SDL_syscond.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/riscos/SDL_sysmutex.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/riscos/SDL_sysmutex_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/riscos/SDL_syssem.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/riscos/SDL_systhread.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/riscos/SDL_systhread_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/symbian/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/symbian/SDL_sysmutex.cpp trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/symbian/SDL_syssem.cpp trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/symbian/SDL_systhread.cpp trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/symbian/SDL_systhread_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/win32/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/win32/SDL_sysmutex.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/win32/SDL_syssem.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/win32/SDL_systhread.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/win32/SDL_systhread_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/win32/win_ce_semaphore.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/thread/win32/win_ce_semaphore.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/SDL_systimer.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/SDL_timer.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/SDL_timer_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/beos/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/beos/SDL_systimer.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/dc/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/dc/SDL_systimer.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/dummy/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/dummy/SDL_systimer.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/macos/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/macos/FastTimes.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/macos/FastTimes.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/macos/SDL_MPWtimer.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/macos/SDL_systimer.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/mint/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/mint/SDL_systimer.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/mint/SDL_vbltimer.S trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/mint/SDL_vbltimer_s.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/nds/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/nds/SDL_systimer.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/os2/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/os2/SDL_systimer.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/riscos/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/riscos/SDL_systimer.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/symbian/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/symbian/SDL_systimer.cpp trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/unix/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/unix/SDL_systimer.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/win32/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/win32/SDL_systimer.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/wince/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/timer/wince/SDL_systimer.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/ARM_blit1to2.S trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/SDL_RLEaccel.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/SDL_RLEaccel_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/SDL_blit.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/SDL_blit.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/SDL_blit_0.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/SDL_blit_1.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/SDL_blit_A.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/SDL_blit_N.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/SDL_bmp.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/SDL_cursor.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/SDL_cursor_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/SDL_gamma.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/SDL_glfuncs.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/SDL_leaks.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/SDL_pixels.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/SDL_pixels_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/SDL_stretch.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/SDL_stretch_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/SDL_surface.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/SDL_sysvideo.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/SDL_video.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/SDL_yuv.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/SDL_yuv_mmx.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/SDL_yuv_sw.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/SDL_yuv_sw_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/SDL_yuvfuncs.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/README trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/XME/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/XME/xme.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/Xinerama/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/Xinerama/Xinerama.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/Xv/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/Xv/Xv.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/Xv/Xvlibint.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/Xxf86dga/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/Xxf86dga/XF86DGA.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/Xxf86dga/XF86DGA2.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/Xxf86vm/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/Xxf86vm/XF86VMode.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/extensions/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/extensions/Xext.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/extensions/Xinerama.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/extensions/Xv.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/extensions/Xvlib.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/extensions/Xvproto.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/extensions/extutil.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/extensions/panoramiXext.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/extensions/panoramiXproto.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/extensions/xf86dga.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/extensions/xf86dga1.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/extensions/xf86dga1str.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/extensions/xf86dgastr.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/extensions/xf86vmode.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/extensions/xf86vmstr.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/Xext/extensions/xme.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/aalib/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/aalib/SDL_aaevents.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/aalib/SDL_aaevents_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/aalib/SDL_aamouse.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/aalib/SDL_aamouse_c.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/aalib/SDL_aavideo.c trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/aalib/SDL_aavideo.h trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/ataricommon/ trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/ataricommon/SDL_ataric2p.S trunk/libs-new/sdl/sdl/SDL-1.2.13/src/video/ataricommon/SDL_ataric2p_s... [truncated message content] |
From: <sen...@us...> - 2008-08-06 14:24:52
|
Revision: 319 http://open2x.svn.sourceforge.net/open2x/?rev=319&view=rev Author: senquack Date: 2008-08-06 14:24:54 +0000 (Wed, 06 Aug 2008) Log Message: ----------- Modified Paths: -------------- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/block/genhd.c trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/mem.c trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/parport/init.c trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/sound/ac97_codec.c trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/video/fbprogress.c trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/video/fbprogress.h trunk/kernel/linux-open2x-2.4.26_FW2-3/include/linux/linux_logo.h trunk/kernel/linux-open2x-2.4.26_FW2-3/init/do_mounts.c trunk/kernel/linux-open2x-2.4.26_FW2-3/init/main.c Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/block/genhd.c =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/block/genhd.c 2008-08-05 23:03:26 UTC (rev 318) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/block/genhd.c 2008-08-06 14:24:54 UTC (rev 319) @@ -244,19 +244,25 @@ int __init device_init(void) { - PROGRESS(9,"setting up block devices"); + //senquack - text too long for GP2X +// PROGRESS(9,"setting up block devices"); + PROGRESS(12,"block devices"); blk_dev_init(); sti(); #ifdef CONFIG_NET - PROGRESS(26, "setting up network devices"); + //senquqack - shortening text +// PROGRESS(26, "setting up network devices"); + PROGRESS(26, "network devices"); net_dev_init(); #endif #ifdef CONFIG_ATM - PROGRESS(28, "setting up ATM"); + // senquack +// PROGRESS(28, "setting up ATM"); (void) atmdev_init(); #endif #ifdef CONFIG_VT - PROGRESS(29, "setting up console"); + //senquack +// PROGRESS(29, "setting up console"); console_map_init(); #endif return 0; Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/mem.c =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/mem.c 2008-08-05 23:03:26 UTC (rev 318) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/mem.c 2008-08-06 14:24:54 UTC (rev 319) @@ -740,7 +740,9 @@ int __init chr_dev_init(void) { - PROGRESS(6,"setting up character devices"); + //senquack - fixing for GP2X +// PROGRESS(6,"setting up character devices"); + PROGRESS(6,"char devices"); if (devfs_register_chrdev(MEM_MAJOR,"mem",&memory_fops)) printk("unable to get major %d for memory devs\n", MEM_MAJOR); memory_devfs_register(); Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/parport/init.c =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/parport/init.c 2008-08-05 23:03:26 UTC (rev 318) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/parport/init.c 2008-08-06 14:24:54 UTC (rev 319) @@ -150,7 +150,8 @@ if (io[0] == PARPORT_DISABLE) return 1; - PROGRESS(4,"setting up parport"); + // senquack - no parport on GP2X +// PROGRESS(4,"setting up parport"); #ifdef CONFIG_SYSCTL parport_default_proc_register (); #endif Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/sound/ac97_codec.c =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/sound/ac97_codec.c 2008-08-05 23:03:26 UTC (rev 318) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/sound/ac97_codec.c 2008-08-06 14:24:54 UTC (rev 319) @@ -671,6 +671,7 @@ if (cmd == SOUND_MIXER_PRIVATE2) { get_user(val, (int *)arg); g_volume_scale = val; + printk("\nKernel: got new g_volume_scale value: %d\n", g_volume_scale); return 0; } Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/video/fbprogress.c =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/video/fbprogress.c 2008-08-05 23:03:26 UTC (rev 318) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/video/fbprogress.c 2008-08-06 14:24:54 UTC (rev 319) @@ -77,7 +77,11 @@ #undef LINUX22 #endif +//senquack #define LPP_BPP ((p->var.bits_per_pixel+7)/8) +//senquack - changing it to this did nothing to fix progress bug: +//#define LPP_BPP 2 + #define LPP_CHAR_HEIGHT 11 #define LPP_CHAR_WIDTH 8 @@ -265,7 +269,10 @@ void fbcon_draw( unsigned char *pic) { int y; + // senquack - fix for progress bar disappearing after init is called.. changing + // [fg_console] to [0] did nothing to help with progress bar in the end.. struct display *p = &fb_display[fg_console]; +// struct display *p = &fb_display[0]; int line = p->next_line; unsigned char *fb = p->screen_base + ICON_X*LPP_BPP + ICON_Y * line; @@ -319,6 +326,7 @@ if(value > 100 ) ignore_proc= 1; + if( !ignore_proc ) fbcon_progress(value, buffer); return i; @@ -349,7 +357,8 @@ void fbcon_render_char( int offset, int x, int y, unsigned char fgcol[], unsigned char bgcol[] ) { - struct display *p = &fb_display[fg_console]; /* draw to vt in foreground */ +// struct display *p = &fb_display[fg_console]; /* draw to vt in foreground */ + struct display *p = &fb_display[0]; /* draw to vt in foreground */ int line = p->next_line; int depth=LPP_BPP; unsigned char *fb = p->screen_base + x + y * line; @@ -375,9 +384,20 @@ char *idx= "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789():;-+. "; char z; int offset, k, x_pos= x, sw; + + //senquack - moved this up here so LPP_BPP macro will work + // senquack - fix for progress bar disappearing after init is called.. changing + // [fg_console] to [0] did nothing to help with progress bar in the end.. + struct display *p = &fb_display[fg_console]; +// struct display *p = &fb_display[0]; + + //senquack - fixing character offsets + x_pos *= LPP_BPP; + #ifdef LPP_TEXT_BLOCK_HEIGHT - struct display *p = &fb_display[fg_console]; + // senquack +// struct display *p = &fb_display[fg_console]; int line = p->next_line; char *tmp = (p->screen_base+x*LPP_BPP + y * line); @@ -400,7 +420,9 @@ } fbcon_render_char( offset, x_pos, y, fgcol, bgcol ); - x_pos+= LPP_CHAR_WIDTH; + //senquack - fix +// x_pos+= LPP_CHAR_WIDTH; + x_pos+= LPP_CHAR_WIDTH * LPP_BPP; } } @@ -431,7 +453,9 @@ { /* Redraw entire progress bar. */ - struct display *p = &fb_display[fg_console]; /* draw to vt in foreground */ + // senquack - fix for progress bar disappearing after init is called +// struct display *p = &fb_display[fg_console]; /* draw to vt in foreground */ + struct display *p = &fb_display[0]; /* draw to vt in foreground */ int depth = p->var.bits_per_pixel; int line = p->next_line; /* _bytes_/screen line */ unsigned char *fb = p->screen_base; @@ -477,7 +501,11 @@ void fbcon_progress_setup(unsigned char *fb, unsigned int line){ /* line = number of bytes/screen line, _not_ the number of pixels. */ - struct display *p = &fb_display[fg_console]; /* draw to vt in foreground */ + // + // senquack - fix for progress bar disappearing after init is called +// struct display *p = &fb_display[fg_console]; /* draw to vt in foreground */ + struct display *p = &fb_display[0]; /* draw to vt in foreground */ + int depth = LPP_BPP; int y; Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/video/fbprogress.h =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/video/fbprogress.h 2008-08-05 23:03:26 UTC (rev 318) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/video/fbprogress.h 2008-08-06 14:24:54 UTC (rev 319) @@ -1,13 +1,28 @@ -#define PROGRESS_BAR_X 0 -#define PROGRESS_BAR_Y 236 -#define PROGRESS_CORNER_X 320 -#define PROGRESS_CORNER_Y 240 +//senquack +//#define PROGRESS_BAR_X 0 +//#define PROGRESS_BAR_Y 236 +//#define PROGRESS_CORNER_X 320 +//#define PROGRESS_CORNER_Y 240 +//#define PROGRESS_VERTICALLY 0 +//#define REVERSE_DIRECTION 0 +//#define TEXT_X 0 +//#define TEXT_Y 229 +//#define MAX_TEXT_LEN 60 +//#define MESSAGE_LENGTH 80 +//#define ICON_X 0 +//#define ICON_Y 223 +//#define LOGO_H 240 +//#define LOGO_W 320 +#define PROGRESS_BAR_X 63 +#define PROGRESS_BAR_Y 152 +#define PROGRESS_CORNER_X 256 +#define PROGRESS_CORNER_Y 159 #define PROGRESS_VERTICALLY 0 #define REVERSE_DIRECTION 0 -#define TEXT_X 0 -#define TEXT_Y 229 -#define MAX_TEXT_LEN 60 -#define MESSAGE_LENGTH 80 +#define TEXT_X 63 +#define TEXT_Y 138 +#define MAX_TEXT_LEN 17 +#define MESSAGE_LENGTH 17 #define ICON_X 0 #define ICON_Y 223 #define LOGO_H 240 Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/include/linux/linux_logo.h =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/include/linux/linux_logo.h 2008-08-05 23:03:26 UTC (rev 318) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/include/linux/linux_logo.h 2008-08-06 14:24:54 UTC (rev 319) @@ -1,9722 +1,9741 @@ -/* linux_logo.h created with fblogo, 2007/03/20 22:17:26 - * include/linux/linux_logo.h: This is a linux logo - * to be displayed on boot. +/* $Id: linux_logo.h,v 1.5 2008/08/06 03:05:35 png2linuxlogo Exp $ + * include/asm/linux_logo.h: This is a color Linux logo + * to be displayed on boot. * * Copyright (C) 1996 Larry Ewing (le...@is...) - * Copyright (C) 1996,1998 Jakub Jelinek (jj...@su...) + * Copyright (C) 1998 Jakub Jelinek (jj...@su...) * - * You can put anything here, but: - * LINUX_LOGO_COLORS has to be less than 224 - * Generated by fblogo version 0.5.1 + * You can put anything here, subject to these restrictions: + * - LINUX_LOGO_COLORS has to be strictly less than 224; + * - image size has to be exactly 80x80; + * - index values have to start from 0x20 + * (i.e., RGB(linux_logo_red[0], + * linux_logo_green[0], + * linux_logo_blue[0]) is color index 0x20); + * - BW image has to be 80x80 as well, with most-significant + * bit on the left; + * - serial_console ASCII image can be any size, + * but it should contain %s to display the version. * + * This version was autogenerated by png2linuxlogo 1.02 of 9 June 2002 + * (http://www.libpng.org/pub/png/apps/png2linuxlogo.html), + * Copyright (C) 2001-2002 Greg Roelofs (ne...@po...). * - * Remember to modify drivers/video/fbcon.c: - * Change "#define LOGO_H 80" to "#define LOGO_H 240" - * Change "#define LOGO_W 80" to "#define LOGO_W 320" + * Replace /usr/src/linux/include/asm-<your_arch>/linux_logo.h with + * this (include/asm will point at include/asm-<your_arch> after you + * do "make config" or "make menuconfig"), edit the linux_logo_banner + * line below ("FIXME") to match the original, recompile the kernel, and + * enjoy your new boot logo. (Unless your display supports 16 or fewer + * colors, in which case you're out of luck...sorry.) */ -#ifndef __HAVE_ARCH_LINUX_LOGO -#define LINUX_LOGO_COLORS 223 -#endif +#include <linux/init.h> +#include <linux/version.h> + +#define linux_logo_banner "Linux/<arch-FIXME> version " UTS_RELEASE + +#define __HAVE_ARCH_LINUX_LOGO /* needed for 2.4.18, at least */ + +#define LINUX_LOGO_COLORS 220 + #ifdef INCLUDE_LINUX_LOGO_DATA -#ifndef __HAVE_ARCH_LINUX_LOGO + unsigned char linux_logo_red[] __initdata = { - 0x10, 0x0A, 0x1A, 0x10, 0x0E, 0x13, 0x14, 0x11, - 0x14, 0x17, 0x27, 0x1C, 0x25, 0x35, 0x15, 0x1A, - 0x18, 0x1D, 0x1F, 0x1C, 0x1F, 0x1C, 0x1A, 0x1E, - 0x21, 0x22, 0x1E, 0x25, 0x35, 0x25, 0x26, 0x23, - 0x49, 0x54, 0x2A, 0x2A, 0x29, 0x26, 0x2B, 0x28, - 0x66, 0x38, 0x47, 0x32, 0x37, 0x2D, 0x2E, 0x32, - 0x36, 0x47, 0x34, 0x30, 0x34, 0x35, 0x83, 0x31, - 0x37, 0x36, 0x3B, 0x37, 0x7F, 0x3E, 0x3C, 0x3D, - 0x3F, 0x3B, 0x65, 0x46, 0x3F, 0x4A, 0x4E, 0x7C, - 0x5B, 0x45, 0xA7, 0x98, 0x5E, 0x46, 0x42, 0x44, - 0x5B, 0x43, 0x48, 0x56, 0x4D, 0x43, 0x4E, 0x49, - 0x45, 0x4B, 0x4E, 0x4B, 0x4E, 0x54, 0x53, 0x58, - 0x54, 0x6A, 0x51, 0xBB, 0x60, 0x55, 0x52, 0x55, - 0x53, 0x55, 0x4F, 0xD5, 0x65, 0xB2, 0x5D, 0x56, - 0x5D, 0x56, 0x5B, 0x5D, 0x5B, 0x75, 0x80, 0x62, - 0x7B, 0x5E, 0x6E, 0x7B, 0x6C, 0x59, 0x5E, 0x65, - 0x65, 0x75, 0x61, 0x65, 0x63, 0x6D, 0xFF, 0x6B, - 0x6C, 0x6B, 0x6F, 0x7C, 0x71, 0x6D, 0x6B, 0x6A, - 0xFF, 0x72, 0x6E, 0x89, 0x76, 0x76, 0x7C, 0x7E, - 0x7E, 0xFE, 0x81, 0x7F, 0x7C, 0x77, 0x7C, 0x7E, - 0xAE, 0x89, 0x83, 0xA3, 0x84, 0x87, 0x8F, 0x8A, - 0x8F, 0x92, 0xD4, 0x8E, 0x8B, 0xCA, 0x9A, 0x9D, - 0x9C, 0x96, 0x9B, 0x9B, 0xA2, 0xA9, 0xAC, 0xA9, - 0xAB, 0xA6, 0xAE, 0xAB, 0xAB, 0xB2, 0xEE, 0xFD, - 0xB1, 0xFA, 0xE9, 0xFE, 0xFD, 0xB7, 0xBA, 0xC0, - 0xC4, 0xFB, 0xBF, 0xEE, 0xD3, 0xC3, 0xC4, 0xE4, - 0xCC, 0xD5, 0xD9, 0xD1, 0xD9, 0xE3, 0xDE, 0xE6, - 0xE6, 0xF7, 0xEB, 0xF5, 0xF2, 0xF9, 0xFC + 0x8E, 0x32, 0x31, 0x2F, 0x2E, 0x2C, 0x2B, 0xDE, + 0x30, 0x29, 0x62, 0x28, 0x2E, 0xA8, 0x32, 0x25, + 0x24, 0x21, 0x4F, 0x20, 0x1E, 0x1D, 0x1C, 0x35, + 0x19, 0x61, 0x18, 0xFE, 0x5F, 0x5D, 0x14, 0xC4, + 0x38, 0xC2, 0x73, 0xB6, 0x6C, 0x3D, 0x3E, 0x3B, + 0x51, 0x33, 0xA8, 0xDF, 0xA6, 0x45, 0x8E, 0x48, + 0x8B, 0xC6, 0x87, 0xAD, 0x98, 0x96, 0x94, 0xA3, + 0xC1, 0x8A, 0x34, 0x86, 0x84, 0x46, 0x77, 0x82, + 0x3C, 0xB1, 0x78, 0x6C, 0xE8, 0x49, 0x96, 0x67, + 0xC2, 0x7B, 0x65, 0x6E, 0x62, 0x60, 0xD8, 0x5C, + 0x5A, 0xF1, 0x75, 0x56, 0x55, 0x46, 0x7D, 0x52, + 0x50, 0x82, 0x4E, 0x4C, 0x49, 0x46, 0x9B, 0x44, + 0xA1, 0xB9, 0x49, 0x41, 0x3F, 0x3E, 0xEF, 0x3C, + 0x39, 0x36, 0x34, 0x33, 0x30, 0xDF, 0x2D, 0x37, + 0x2A, 0x35, 0x27, 0x26, 0xC8, 0x8E, 0x23, 0x2F, + 0x22, 0xD3, 0x3C, 0x27, 0x2D, 0xD1, 0xEF, 0x1F, + 0x25, 0xBB, 0x86, 0x82, 0x1B, 0x1A, 0x17, 0x65, + 0x16, 0x15, 0x57, 0xD1, 0x54, 0xBE, 0xEC, 0xE3, + 0xB3, 0x84, 0xB4, 0x88, 0x21, 0x1F, 0xA3, 0xA1, + 0x6F, 0x75, 0xA7, 0xC6, 0xC1, 0x8D, 0x8B, 0x89, + 0x87, 0x85, 0xD6, 0x83, 0x81, 0x9C, 0x7D, 0x32, + 0x65, 0x7B, 0x5E, 0x94, 0x5B, 0x54, 0x75, 0x4C, + 0xB1, 0xBB, 0x42, 0x6D, 0x93, 0x6B, 0x91, 0xFB, + 0xF4, 0x59, 0x5F, 0x5D, 0x5F, 0xF8, 0x57, 0x8A, + 0x56, 0x53, 0xA4, 0x51, 0x4F, 0x4D, 0x3F, 0x37, + 0x70, 0x30, 0x4A, 0x48, 0xFF, 0x47, 0x59, 0x45, + 0x43, 0x50, 0x40, 0x9A, 0x3D, 0x3B, 0x3A, 0xCD, + 0x38, 0x37, 0x5E, 0x35 }; unsigned char linux_logo_green[] __initdata = { - 0x05, 0x07, 0x06, 0x10, 0x12, 0x13, 0x12, 0x15, - 0x15, 0x15, 0x10, 0x14, 0x15, 0x0D, 0x19, 0x18, - 0x1A, 0x1B, 0x18, 0x1B, 0x1D, 0x1E, 0x1F, 0x1D, - 0x22, 0x21, 0x23, 0x23, 0x1F, 0x25, 0x24, 0x25, - 0x1C, 0x18, 0x2B, 0x2A, 0x29, 0x2B, 0x29, 0x2A, - 0x17, 0x2C, 0x22, 0x29, 0x2D, 0x31, 0x30, 0x2F, - 0x2E, 0x31, 0x35, 0x31, 0x34, 0x34, 0x1B, 0x37, - 0x36, 0x36, 0x33, 0x35, 0x27, 0x40, 0x3C, 0x3D, - 0x3E, 0x3D, 0x31, 0x3A, 0x3F, 0x42, 0x3A, 0x2E, - 0x38, 0x42, 0x1E, 0x27, 0x45, 0x46, 0x44, 0x45, - 0x3C, 0x45, 0x4A, 0x48, 0x42, 0x45, 0x4F, 0x4C, - 0x4C, 0x4B, 0x4E, 0x4A, 0x4B, 0x4A, 0x50, 0x52, - 0x4B, 0x46, 0x51, 0x2E, 0x4B, 0x57, 0x51, 0x55, - 0x53, 0x52, 0x53, 0x2E, 0x50, 0x3D, 0x5E, 0x59, - 0x5D, 0x5A, 0x5B, 0x5D, 0x5D, 0x53, 0x5F, 0x5B, - 0x53, 0x61, 0x58, 0x62, 0x63, 0x61, 0x60, 0x66, - 0x64, 0x65, 0x60, 0x66, 0x68, 0x6F, 0x3B, 0x6B, - 0x6E, 0x6B, 0x6F, 0x66, 0x71, 0x6E, 0x6E, 0x70, - 0x4A, 0x75, 0x77, 0x7B, 0x77, 0x76, 0x78, 0x7F, - 0x7E, 0x57, 0x81, 0x7F, 0x7C, 0x7F, 0x7E, 0x80, - 0x83, 0x8A, 0x7F, 0x8B, 0x86, 0x89, 0x8F, 0x8B, - 0x8F, 0x93, 0x8D, 0x91, 0x8E, 0x97, 0x9B, 0x9E, - 0x9E, 0x9A, 0x9C, 0x9C, 0xA4, 0xA9, 0xAB, 0xAB, - 0xAD, 0xAA, 0xAE, 0xAC, 0xAC, 0xB2, 0xAF, 0xB5, - 0xB3, 0xB1, 0xBF, 0xBF, 0xBF, 0xB8, 0xBB, 0xC0, - 0xC4, 0xC9, 0xBF, 0xC5, 0xC7, 0xC3, 0xC6, 0xD0, - 0xCC, 0xD5, 0xCD, 0xD4, 0xDA, 0xD8, 0xE1, 0xE7, - 0xE7, 0xE9, 0xEE, 0xF4, 0xF4, 0xFD, 0xFE + 0x44, 0x33, 0x33, 0x31, 0x2F, 0x2D, 0x2D, 0x60, + 0x2A, 0x2B, 0x38, 0x29, 0x28, 0x4E, 0x25, 0x27, + 0x25, 0x23, 0x32, 0x21, 0x1F, 0x1F, 0x1D, 0x2D, + 0x1B, 0x3C, 0x19, 0xFF, 0x3A, 0x38, 0x15, 0xC6, + 0x34, 0xC4, 0x3F, 0xB8, 0x39, 0x37, 0x30, 0x2E, + 0x2E, 0x2D, 0xAA, 0x61, 0xA8, 0x29, 0x4A, 0x39, + 0x48, 0x5A, 0x44, 0x52, 0x9A, 0x98, 0x96, 0x4A, + 0xC3, 0x8C, 0x2F, 0x88, 0x86, 0x2B, 0x3D, 0x84, + 0x28, 0xB3, 0x7A, 0x40, 0x62, 0x2C, 0x4B, 0x68, + 0x57, 0x41, 0x66, 0x30, 0x64, 0x62, 0x5B, 0x5E, + 0x5C, 0x6A, 0x46, 0x58, 0x56, 0x31, 0x42, 0x54, + 0x52, 0x40, 0x50, 0x4E, 0x4A, 0x48, 0x49, 0x46, + 0x42, 0x56, 0x32, 0x42, 0x40, 0x40, 0xF1, 0x3E, + 0x3A, 0x38, 0x36, 0x34, 0x32, 0xE1, 0x2E, 0x2A, + 0x2C, 0x28, 0x28, 0x28, 0x5C, 0x49, 0x24, 0x22, + 0x24, 0xD5, 0x34, 0x21, 0x20, 0xD3, 0x67, 0x20, + 0x1F, 0x51, 0x43, 0x40, 0x1C, 0x1C, 0x18, 0x3A, + 0x18, 0x16, 0x38, 0x5C, 0x36, 0xC1, 0x65, 0x5E, + 0x51, 0x36, 0x52, 0x3F, 0x1D, 0x1B, 0xA5, 0xA3, + 0x3C, 0x3B, 0x4D, 0x5A, 0x56, 0x8F, 0x8D, 0x8B, + 0x89, 0x87, 0x61, 0x85, 0x83, 0x4A, 0x7F, 0x24, + 0x34, 0x7D, 0x33, 0x44, 0x31, 0x30, 0x77, 0x2F, + 0x4F, 0x51, 0x2C, 0x6F, 0x49, 0x6D, 0x47, 0x6A, + 0x65, 0x35, 0x61, 0x5F, 0x35, 0x68, 0x59, 0x47, + 0x57, 0x55, 0x51, 0x53, 0x51, 0x4F, 0x2A, 0x29, + 0x38, 0x28, 0x4B, 0x49, 0x69, 0x49, 0x35, 0x47, + 0x45, 0x32, 0x41, 0x4E, 0x3F, 0x3D, 0x3B, 0x59, + 0x39, 0x39, 0x38, 0x37 }; unsigned char linux_logo_blue[] __initdata = { - 0x04, 0x0D, 0x01, 0x18, 0x1E, 0x1B, 0x1F, 0x20, - 0x25, 0x21, 0x13, 0x22, 0x08, 0x08, 0x24, 0x25, - 0x2A, 0x1B, 0x26, 0x23, 0x2A, 0x2F, 0x34, 0x34, - 0x33, 0x38, 0x39, 0x30, 0x28, 0x37, 0x3C, 0x41, - 0x16, 0x0F, 0x28, 0x2F, 0x3B, 0x41, 0x40, 0x46, - 0x06, 0x19, 0x29, 0x43, 0x26, 0x48, 0x4D, 0x48, - 0x47, 0x0C, 0x32, 0x53, 0x39, 0x45, 0x03, 0x58, - 0x4F, 0x54, 0x58, 0x59, 0x0B, 0x3F, 0x5F, 0x5B, - 0x51, 0x66, 0x34, 0x5C, 0x57, 0x36, 0x58, 0x1E, - 0x44, 0x4B, 0x05, 0x0B, 0x17, 0x57, 0x6D, 0x63, - 0x55, 0x69, 0x48, 0x2E, 0x67, 0x75, 0x4D, 0x6F, - 0x7B, 0x76, 0x5E, 0x7C, 0x70, 0x70, 0x5A, 0x4A, - 0x7E, 0x60, 0x6B, 0x0A, 0x72, 0x55, 0x83, 0x66, - 0x78, 0x7E, 0x89, 0x05, 0x81, 0x25, 0x5C, 0x90, - 0x6E, 0x97, 0x8C, 0x7D, 0x86, 0x77, 0x1B, 0x88, - 0x71, 0x7B, 0x83, 0x32, 0x5A, 0x9E, 0x98, 0x65, - 0x77, 0x4B, 0x9F, 0xA5, 0xAC, 0x6D, 0x01, 0x94, - 0x88, 0xA0, 0x83, 0x90, 0x7A, 0xAD, 0xB3, 0xBB, - 0x05, 0xBB, 0xC2, 0x66, 0xB4, 0xC3, 0xAA, 0x88, - 0x91, 0x08, 0x85, 0x9C, 0xCB, 0xCB, 0xC5, 0xBD, - 0x2B, 0x87, 0xD5, 0x58, 0xD5, 0xD0, 0xA2, 0xC9, - 0xAF, 0x96, 0x12, 0xBC, 0xDF, 0x1D, 0xC2, 0xAF, - 0xBA, 0xEC, 0xDB, 0xE5, 0xCC, 0xAC, 0xA5, 0xD6, - 0xC9, 0xFC, 0xD2, 0xEC, 0xF6, 0xC5, 0x44, 0x06, - 0xE0, 0x32, 0x36, 0x00, 0x0D, 0xFF, 0xEB, 0xDC, - 0xC4, 0x1E, 0xFD, 0x6A, 0xAB, 0xF4, 0xFE, 0x96, - 0xFE, 0xD5, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xE7, - 0xFF, 0xD1, 0xFF, 0xF0, 0xFB, 0xFF, 0xFB + 0x0E, 0x31, 0x30, 0x2E, 0x2D, 0x2B, 0x2A, 0x00, + 0x25, 0x28, 0x1E, 0x27, 0x23, 0x03, 0x1D, 0x24, + 0x23, 0x20, 0x1F, 0x1F, 0x1D, 0x1C, 0x1B, 0x23, + 0x18, 0x20, 0x17, 0xFC, 0x1E, 0x1C, 0x13, 0xC3, + 0x33, 0xC1, 0x17, 0xB5, 0x10, 0x31, 0x28, 0x25, + 0x13, 0x27, 0xA7, 0x00, 0xA5, 0x11, 0x1A, 0x2B, + 0x17, 0x05, 0x13, 0x14, 0x97, 0x95, 0x93, 0x0A, + 0xBF, 0x89, 0x2E, 0x85, 0x83, 0x18, 0x10, 0x81, + 0x18, 0xAF, 0x77, 0x26, 0x08, 0x14, 0x0D, 0x66, + 0x00, 0x1A, 0x64, 0x00, 0x61, 0x5F, 0x05, 0x5B, + 0x59, 0x03, 0x21, 0x55, 0x54, 0x21, 0x15, 0x51, + 0x4F, 0x06, 0x4D, 0x4B, 0x48, 0x45, 0x04, 0x43, + 0x00, 0x07, 0x1D, 0x40, 0x3E, 0x3D, 0xEE, 0x3B, + 0x38, 0x35, 0x33, 0x32, 0x2F, 0xDE, 0x2C, 0x22, + 0x29, 0x20, 0x26, 0x25, 0x08, 0x11, 0x22, 0x1A, + 0x21, 0xD2, 0x2A, 0x1C, 0x18, 0xD0, 0x00, 0x1E, + 0x1A, 0x05, 0x09, 0x0F, 0x1A, 0x19, 0x16, 0x1A, + 0x15, 0x14, 0x20, 0x00, 0x1D, 0xBD, 0x00, 0x01, + 0x00, 0x00, 0x0E, 0x11, 0x1C, 0x1A, 0xA2, 0xA0, + 0x19, 0x15, 0x0E, 0x12, 0x0D, 0x8C, 0x8A, 0x88, + 0x86, 0x84, 0x07, 0x82, 0x80, 0x10, 0x7C, 0x18, + 0x12, 0x7A, 0x15, 0x08, 0x12, 0x15, 0x74, 0x17, + 0x0A, 0x00, 0x17, 0x6C, 0x14, 0x6A, 0x12, 0x00, + 0x03, 0x13, 0x5E, 0x5C, 0x1C, 0x00, 0x56, 0x0E, + 0x55, 0x52, 0x17, 0x50, 0x4E, 0x4C, 0x1A, 0x1C, + 0x12, 0x1F, 0x49, 0x47, 0x00, 0x46, 0x19, 0x44, + 0x42, 0x1A, 0x3F, 0x1A, 0x3C, 0x3A, 0x39, 0x0A, + 0x37, 0x36, 0x17, 0x34 }; unsigned char linux_logo[] __initdata = { - 0x8F, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, - 0x8A, 0x8A, 0x8A, 0x7B, 0x8A, 0x7B, 0x8A, 0x8A, - 0x8A, 0x8A, 0x8A, 0x8A, 0x7B, 0x8A, 0x7B, 0x7B, - 0x7B, 0x7B, 0x7B, 0x75, 0x75, 0x75, 0x75, 0x75, - 0x75, 0x75, 0x75, 0x75, 0x6E, 0x75, 0x75, 0x75, - 0x75, 0x75, 0x75, 0x6E, 0x75, 0x6E, 0x6E, 0x75, - 0x75, 0x75, 0x75, 0x75, 0x75, 0x75, 0x75, 0x7B, - 0x75, 0x75, 0x75, 0x75, 0x75, 0x75, 0x7B, 0x78, - 0x7B, 0x7B, 0x7B, 0x7B, 0x7B, 0x86, 0x7B, 0x86, - 0x86, 0x86, 0x8A, 0x86, 0x86, 0x8A, 0x8A, 0x8F, - 0x8F, 0x91, 0xA2, 0xA2, 0x9D, 0xA3, 0xA4, 0xA4, - 0xA4, 0xAE, 0xA4, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, - 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, - 0xAE, 0xAE, 0xB1, 0xAF, 0xB5, 0xAF, 0xB5, 0xB5, - 0xB5, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, - 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xB5, 0xBC, 0xB5, - 0xB5, 0xB5, 0xB5, 0xBC, 0xBD, 0xBC, 0xC4, 0xBC, - 0xC4, 0xBC, 0xC4, 0xBD, 0xBD, 0xB2, 0xB2, 0xB1, - 0xAE, 0xAE, 0xA3, 0xA3, 0xA2, 0xA2, 0x91, 0x8F, - 0x8F, 0x8F, 0x8F, 0x8A, 0x86, 0x86, 0x7B, 0x7B, - 0x79, 0x6E, 0x6E, 0x6E, 0x6E, 0x5E, 0x5E, 0x5E, - 0x57, 0x59, 0x59, 0x59, 0x4E, 0x4F, 0x4E, 0x46, - 0x46, 0x46, 0x3E, 0x46, 0x3D, 0x3D, 0x3D, 0x3D, - 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x38, 0x38, 0x3D, - 0x38, 0x38, 0x38, 0x38, 0x3D, 0x3D, 0x3D, 0x3D, - 0x3D, 0x3A, 0x3D, 0x38, 0x3E, 0x3D, 0x3E, 0x3E, - 0x3A, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, - 0x44, 0x45, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, - 0x46, 0x46, 0x46, 0x45, 0x45, 0x46, 0x4F, 0x4F, - 0x46, 0x4F, 0x46, 0x4F, 0x4F, 0x4F, 0x4F, 0x4D, - 0x4D, 0x4F, 0x4E, 0x4E, 0x4E, 0x4E, 0x4E, 0x4E, - 0x59, 0x59, 0x4E, 0x59, 0x4E, 0x59, 0x4E, 0x59, - 0x59, 0x59, 0x59, 0x59, 0x59, 0x59, 0x59, 0x59, - 0x59, 0x59, 0x59, 0x59, 0x59, 0x59, 0x59, 0x59, - 0x59, 0x59, 0x59, 0x5F, 0x57, 0x57, 0x5B, 0x5E, - 0x59, 0x5E, 0x5E, 0x5E, 0x5E, 0x5B, 0x5E, 0x5E, - 0x5E, 0x5E, 0x5E, 0x5B, 0x5E, 0x5B, 0x5E, 0x5E, - 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, - 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, - 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, - 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8A, 0x8A, 0x8A, - 0x8A, 0x86, 0x86, 0x8F, 0x80, 0x91, 0x86, 0x8A, - 0x80, 0x80, 0x80, 0x8A, 0x80, 0x80, 0x8A, 0x8A, - 0x86, 0x78, 0x7B, 0x7B, 0x7B, 0x75, 0x78, 0x75, - 0x75, 0x75, 0x75, 0x6E, 0x75, 0x6E, 0x75, 0x6E, - 0x75, 0x75, 0x6E, 0x75, 0x6E, 0x75, 0x75, 0x6E, - 0x6E, 0x6E, 0x79, 0x75, 0x75, 0x75, 0x7B, 0x75, - 0x75, 0x7B, 0x7B, 0x7B, 0x7B, 0x7B, 0x75, 0x7B, - 0x78, 0x7B, 0x7B, 0x78, 0x7B, 0x7B, 0x86, 0x7B, - 0x7B, 0x7B, 0x86, 0x8A, 0x8A, 0x8F, 0x8F, 0x8F, - 0x8F, 0x8F, 0x8F, 0x91, 0xA3, 0xA4, 0xA2, 0xA3, - 0xAD, 0xAD, 0xAE, 0xA4, 0xAE, 0xAE, 0xAE, 0xAE, - 0xAE, 0xAE, 0xAE, 0xAE, 0xAF, 0xAE, 0xAF, 0xAE, - 0xAE, 0xB5, 0xAF, 0xB1, 0xAE, 0xB1, 0xB1, 0xB2, - 0xB5, 0xBC, 0xBC, 0xBC, 0xBC, 0xC2, 0xBC, 0xC4, - 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xB5, - 0xBC, 0xBC, 0xBC, 0xBD, 0xBC, 0xBD, 0xBC, 0xBD, - 0xBD, 0xBE, 0xBE, 0xBE, 0xB1, 0xB1, 0xAE, 0xAE, - 0xAD, 0xA4, 0xA4, 0xA4, 0xA2, 0x9E, 0xA2, 0x91, - 0x8F, 0x8F, 0x86, 0x86, 0x86, 0x78, 0x79, 0x79, - 0x6E, 0x79, 0x79, 0x6E, 0x5E, 0x61, 0x5E, 0x5B, - 0x59, 0x5B, 0x4E, 0x4E, 0x4E, 0x47, 0x46, 0x45, - 0x3F, 0x39, 0x3A, 0x36, 0x39, 0x39, 0x37, 0x39, - 0x39, 0x3A, 0x3A, 0x38, 0x37, 0x37, 0x37, 0x36, - 0x37, 0x38, 0x38, 0x37, 0x35, 0x35, 0x38, 0x38, - 0x37, 0x3D, 0x37, 0x39, 0x35, 0x37, 0x38, 0x38, - 0x3D, 0x39, 0x3A, 0x39, 0x3A, 0x39, 0x3E, 0x39, - 0x3A, 0x39, 0x3A, 0x3A, 0x3A, 0x3A, 0x3E, 0x3E, - 0x46, 0x46, 0x3F, 0x46, 0x46, 0x45, 0x3A, 0x45, - 0x45, 0x45, 0x45, 0x45, 0x45, 0x47, 0x4D, 0x4F, - 0x46, 0x4E, 0x4F, 0x4F, 0x4F, 0x4F, 0x4F, 0x4F, - 0x46, 0x4E, 0x50, 0x4E, 0x4E, 0x4E, 0x4E, 0x47, - 0x47, 0x4E, 0x4E, 0x4E, 0x4E, 0x4E, 0x4E, 0x59, - 0x4E, 0x53, 0x53, 0x59, 0x59, 0x59, 0x59, 0x59, - 0x57, 0x57, 0x59, 0x59, 0x5B, 0x5B, 0x57, 0x57, - 0x57, 0x53, 0x59, 0x59, 0x59, 0x59, 0x57, 0x57, - 0x57, 0x59, 0x59, 0x59, 0x5B, 0x59, 0x5B, 0x5B, - 0x5B, 0x5B, 0x5B, 0x57, 0x5B, 0x5B, 0x5B, 0x5B, - 0x5B, 0x5B, 0x5B, 0x59, 0x57, 0x59, 0x5F, 0x59, - 0x5F, 0x5E, 0x5E, 0x57, 0x59, 0x59, 0x57, 0x59, - 0x91, 0x91, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, - 0x91, 0x8F, 0x8F, 0x91, 0x86, 0x8F, 0x8F, 0x91, - 0x91, 0x91, 0x8F, 0x91, 0x8A, 0x8A, 0x8A, 0x7B, - 0x8A, 0x78, 0x7B, 0x7B, 0x78, 0x7B, 0x75, 0x80, - 0x75, 0x80, 0x75, 0x75, 0x7B, 0x75, 0x75, 0x75, - 0x75, 0x75, 0x75, 0x7B, 0x75, 0x78, 0x78, 0x7B, - 0x7B, 0x75, 0x7B, 0x7B, 0x7B, 0x7B, 0x7B, 0x86, - 0x7B, 0x7B, 0x7B, 0x7B, 0x7B, 0x86, 0x7B, 0x7B, - 0x78, 0x78, 0x8A, 0x86, 0x8A, 0x7B, 0x8A, 0x8A, - 0x8A, 0x7B, 0x8A, 0x8A, 0x80, 0x80, 0x8F, 0x8F, - 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA4, 0xAE, 0xA4, - 0xA4, 0xAE, 0xAE, 0xA4, 0xAE, 0xAE, 0xAE, 0xAE, - 0xA4, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xB1, 0xAF, - 0xAE, 0xAE, 0xAF, 0xB5, 0xB5, 0xAF, 0xB5, 0xB2, - 0xB5, 0xBC, 0xBC, 0xBC, 0xB2, 0xC2, 0xBC, 0xBC, - 0xC4, 0xBC, 0xBC, 0xBC, 0xBC, 0xB2, 0xBD, 0xB5, - 0xB5, 0xB2, 0xBE, 0xBE, 0xBC, 0xBE, 0xC4, 0xBE, - 0xC4, 0xBC, 0xBC, 0xBC, 0xBE, 0xB1, 0xB1, 0xAE, - 0xAD, 0xA3, 0xA3, 0x9D, 0xA2, 0x9E, 0x9E, 0x91, - 0x9E, 0x8F, 0x9E, 0x8A, 0x92, 0x89, 0x78, 0x86, - 0x7B, 0x79, 0x7C, 0x79, 0x7C, 0x71, 0x71, 0x71, - 0x5F, 0x5F, 0x64, 0x58, 0x64, 0x58, 0x59, 0x4D, - 0x4D, 0x58, 0x4F, 0x55, 0x55, 0x55, 0x44, 0x55, - 0x44, 0x44, 0x4F, 0x55, 0x44, 0x55, 0x44, 0x55, - 0x44, 0x4F, 0x55, 0x46, 0x55, 0x46, 0x55, 0x55, - 0x46, 0x55, 0x46, 0x55, 0x4D, 0x4D, 0x4D, 0x4F, - 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, - 0x55, 0x58, 0x55, 0x58, 0x58, 0x55, 0x58, 0x4D, - 0x59, 0x58, 0x59, 0x58, 0x58, 0x58, 0x58, 0x58, - 0x58, 0x5F, 0x58, 0x5F, 0x64, 0x59, 0x58, 0x5F, - 0x64, 0x59, 0x5F, 0x59, 0x5F, 0x5F, 0x5F, 0x5F, - 0x5F, 0x5E, 0x5F, 0x5F, 0x5F, 0x64, 0x64, 0x6F, - 0x5F, 0x5F, 0x6F, 0x5F, 0x6F, 0x6F, 0x6F, 0x6F, - 0x6F, 0x6F, 0x5E, 0x6F, 0x6F, 0x6F, 0x6F, 0x6F, - 0x6F, 0x71, 0x71, 0x6F, 0x6F, 0x71, 0x6F, 0x7C, - 0x6F, 0x71, 0x71, 0x71, 0x77, 0x6F, 0x7C, 0x6F, - 0x71, 0x71, 0x77, 0x6F, 0x77, 0x71, 0x71, 0x71, - 0x71, 0x77, 0x7C, 0x77, 0x77, 0x77, 0x71, 0x77, - 0x71, 0x77, 0x77, 0x82, 0x77, 0x71, 0x77, 0x77, - 0x6F, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, - 0x9E, 0x9E, 0xA2, 0x91, 0x9E, 0x8F, 0x91, 0x8F, - 0x8F, 0x91, 0x91, 0x8F, 0x91, 0x8F, 0x91, 0x91, - 0x8F, 0x91, 0x91, 0x8A, 0x91, 0x91, 0x80, 0x8A, - 0x86, 0x8A, 0x86, 0x86, 0x8A, 0x7B, 0x80, 0x78, - 0x7B, 0x78, 0x7B, 0x7B, 0x7B, 0x7B, 0x7B, 0x7B, - 0x7B, 0x7B, 0x7B, 0x78, 0x78, 0x7B, 0x7B, 0x78, - 0x86, 0x86, 0x78, 0x78, 0x86, 0x86, 0x89, 0x86, - 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8F, - 0x8A, 0x8F, 0x80, 0x8A, 0x86, 0x8A, 0x8A, 0x8A, - 0x80, 0x8F, 0x8A, 0x8F, 0x91, 0x91, 0x91, 0x9D, - 0x91, 0xA2, 0x9D, 0xA2, 0xA2, 0xA4, 0xA4, 0xA4, - 0xA4, 0xA4, 0xAE, 0xAD, 0xAE, 0xA4, 0xAE, 0xA3, - 0xAE, 0xA4, 0xAE, 0xA3, 0xAE, 0xAE, 0xAE, 0xAE, - 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xB5, - 0xAF, 0xB5, 0xB5, 0xB5, 0xBC, 0xB5, 0xB5, 0xBC, - 0xBC, 0xBC, 0xBC, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, - 0xB5, 0xB5, 0xB5, 0xB5, 0xBE, 0xBC, 0xBE, 0xBC, - 0xBD, 0xBD, 0xBE, 0xBE, 0xB5, 0xB1, 0xAE, 0xAE, - 0xA4, 0xA4, 0xA3, 0xA3, 0x9D, 0xA2, 0x8F, 0x8F, - 0x8F, 0x8F, 0x86, 0x86, 0x7B, 0x78, 0x7B, 0x79, - 0x6E, 0x6E, 0x6E, 0x5E, 0x61, 0x5E, 0x5E, 0x5B, - 0x57, 0x57, 0x53, 0x50, 0x47, 0x45, 0x46, 0x46, - 0x46, 0x39, 0x3E, 0x37, 0x37, 0x3A, 0x37, 0x36, - 0x38, 0x38, 0x35, 0x35, 0x38, 0x36, 0x38, 0x36, - 0x37, 0x35, 0x36, 0x38, 0x37, 0x38, 0x37, 0x36, - 0x38, 0x3A, 0x38, 0x36, 0x3A, 0x32, 0x3D, 0x35, - 0x36, 0x39, 0x3A, 0x3E, 0x3E, 0x3A, 0x3F, 0x3F, - 0x3E, 0x3E, 0x3F, 0x3E, 0x3E, 0x47, 0x3A, 0x3E, - 0x45, 0x45, 0x3E, 0x47, 0x46, 0x45, 0x45, 0x4F, - 0x46, 0x45, 0x47, 0x45, 0x47, 0x4F, 0x4E, 0x45, - 0x4E, 0x4F, 0x47, 0x4E, 0x4E, 0x4E, 0x4E, 0x4E, - 0x4E, 0x59, 0x50, 0x59, 0x4E, 0x59, 0x53, 0x50, - 0x4E, 0x59, 0x53, 0x59, 0x53, 0x53, 0x5B, 0x5B, - 0x53, 0x53, 0x59, 0x53, 0x53, 0x53, 0x53, 0x5B, - 0x5B, 0x5A, 0x59, 0x5B, 0x5E, 0x5A, 0x5B, 0x5B, - 0x5B, 0x5B, 0x5B, 0x5B, 0x5B, 0x5B, 0x5B, 0x5E, - 0x5E, 0x5B, 0x5B, 0x5B, 0x5B, 0x5B, 0x5B, 0x5B, - 0x5B, 0x5B, 0x5B, 0x5B, 0x61, 0x5B, 0x57, 0x5B, - 0x5E, 0x5B, 0x5B, 0x61, 0x57, 0x5E, 0x5E, 0x5E, - 0x61, 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, - 0xA2, 0xA2, 0xA3, 0xA2, 0xA2, 0x9E, 0xA2, 0xA2, - 0x9D, 0xA2, 0x9D, 0x9E, 0xA2, 0x9E, 0x8F, 0xA2, - 0x9D, 0x8F, 0x91, 0x91, 0x8F, 0x91, 0x8F, 0x8F, - 0x86, 0x8A, 0x8A, 0x86, 0x8A, 0x7B, 0x8A, 0x86, - 0x86, 0x7B, 0x86, 0x86, 0x7B, 0x86, 0x7B, 0x86, - 0x86, 0x78, 0x89, 0x86, 0x78, 0x89, 0x78, 0x8A, - 0x7B, 0x86, 0x86, 0x86, 0x8A, 0x8A, 0x8A, 0x8A, - 0x86, 0x8F, 0x8F, 0x8F, 0x80, 0x8F, 0x8A, 0x8F, - 0x8A, 0x8A, 0x8F, 0x8A, 0x8A, 0x8F, 0x8A, 0x8F, - 0x8A, 0x8F, 0x80, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, - 0x9D, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA4, - 0xA2, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xAE, 0xA4, - 0xAE, 0xA4, 0xA4, 0xA4, 0xA3, 0xA4, 0xAE, 0xA4, - 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAF, 0xAE, 0xAF, - 0xAF, 0xB5, 0xAF, 0xB5, 0xB2, 0xB2, 0xB2, 0xB2, - 0xB2, 0xB5, 0xB2, 0xB2, 0xB5, 0xB5, 0xB2, 0xB2, - 0xB1, 0xB5, 0xB5, 0xB5, 0xB1, 0xB5, 0xB5, 0xB5, - 0xBE, 0xB5, 0xB2, 0xB1, 0xB1, 0xAE, 0xAE, 0xAD, - 0xAD, 0xA3, 0xA2, 0x9E, 0x9E, 0x9E, 0x9E, 0x8F, - 0x8F, 0x8F, 0x92, 0x86, 0x86, 0x79, 0x78, 0x79, - 0x6E, 0x6E, 0x6E, 0x5E, 0x61, 0x5B, 0x5B, 0x5B, - 0x59, 0x4B, 0x53, 0x4E, 0x47, 0x47, 0x46, 0x3F, - 0x3A, 0x3A, 0x3A, 0x3A, 0x3A, 0x38, 0x37, 0x38, - 0x32, 0x38, 0x38, 0x35, 0x35, 0x32, 0x35, 0x36, - 0x35, 0x32, 0x37, 0x38, 0x36, 0x38, 0x38, 0x39, - 0x37, 0x3A, 0x3D, 0x3D, 0x3A, 0x39, 0x3E, 0x3E, - 0x3E, 0x39, 0x3A, 0x3A, 0x3E, 0x3A, 0x39, 0x39, - 0x38, 0x3E, 0x3A, 0x3E, 0x3A, 0x46, 0x46, 0x3E, - 0x3E, 0x47, 0x46, 0x47, 0x46, 0x46, 0x45, 0x47, - 0x46, 0x4F, 0x4B, 0x45, 0x4E, 0x46, 0x4B, 0x45, - 0x4E, 0x4F, 0x4F, 0x4E, 0x47, 0x4E, 0x4E, 0x50, - 0x53, 0x53, 0x4B, 0x53, 0x53, 0x59, 0x53, 0x59, - 0x4E, 0x50, 0x53, 0x59, 0x59, 0x4E, 0x59, 0x59, - 0x5B, 0x57, 0x57, 0x57, 0x5B, 0x5B, 0x5B, 0x59, - 0x59, 0x59, 0x5B, 0x5B, 0x57, 0x5B, 0x57, 0x57, - 0x57, 0x5B, 0x5B, 0x57, 0x5E, 0x57, 0x61, 0x5B, - 0x5E, 0x5E, 0x61, 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, - 0x5E, 0x61, 0x57, 0x5B, 0x61, 0x63, 0x61, 0x57, - 0x61, 0x61, 0x5B, 0x61, 0x5E, 0x57, 0x61, 0x57, - 0x5E, 0x5E, 0x61, 0x61, 0x5E, 0x61, 0x5E, 0x5E, - 0xA4, 0x9D, 0xA3, 0x9D, 0xA3, 0xA2, 0xA2, 0x9D, - 0xA2, 0x9D, 0xA2, 0xA2, 0xA2, 0xA2, 0x9D, 0x91, - 0xA2, 0xA2, 0xA2, 0x91, 0x91, 0x8F, 0x91, 0x80, - 0x8F, 0x8A, 0x86, 0x8A, 0x86, 0x8A, 0x8A, 0x7B, - 0x86, 0x8A, 0x86, 0x7B, 0x89, 0x86, 0x89, 0x78, - 0x8A, 0x8A, 0x78, 0x8A, 0x86, 0x8A, 0x8A, 0x78, - 0x8A, 0x86, 0x8A, 0x8A, 0x86, 0x8A, 0x8A, 0x8F, - 0x8F, 0x80, 0x8F, 0x8F, 0x8F, 0x92, 0x8F, 0x8F, - 0x8A, 0x92, 0x86, 0x92, 0x86, 0x86, 0x8F, 0x8A, - 0x8F, 0x8F, 0x91, 0x8F, 0x8F, 0x8F, 0x8F, 0x9E, - 0x91, 0xA2, 0xA2, 0xA4, 0xA3, 0xA4, 0xAE, 0xA3, - 0xAE, 0xA3, 0xA4, 0xA3, 0xAE, 0xA3, 0xA4, 0xAE, - 0xA3, 0xAE, 0xAE, 0xAE, 0xAE, 0xAD, 0xAD, 0xB1, - 0xAE, 0xB1, 0xAD, 0xB1, 0xB1, 0xB4, 0xB1, 0xB1, - 0xB1, 0xB2, 0xBD, 0xBD, 0xBC, 0xBC, 0xBC, 0xC4, - 0xC4, 0xC4, 0xBD, 0xC4, 0xC5, 0xBE, 0xBE, 0xBE, - 0xBE, 0xBE, 0xBF, 0xBE, 0xC5, 0xC5, 0xC7, 0xC7, - 0xC7, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xB4, 0xB4, - 0xB4, 0xB4, 0xA9, 0xB4, 0xA9, 0xA9, 0xA9, 0xA9, - 0x97, 0xA7, 0x92, 0x94, 0x94, 0x94, 0x88, 0x88, - 0x7C, 0x79, 0x7C, 0x7C, 0x6F, 0x6F, 0x6F, 0x5F, - 0x5F, 0x59, 0x64, 0x58, 0x58, 0x4F, 0x45, 0x46, - 0x44, 0x46, 0x46, 0x3E, 0x3D, 0x3A, 0x3A, 0x39, - 0x3A, 0x38, 0x38, 0x3D, 0x3D, 0x36, 0x3D, 0x39, - 0x39, 0x39, 0x3A, 0x37, 0x3D, 0x3D, 0x3A, 0x38, - 0x38, 0x38, 0x37, 0x39, 0x39, 0x39, 0x3D, 0x3A, - 0x3A, 0x3E, 0x3E, 0x3E, 0x3A, 0x3E, 0x3E, 0x3E, - 0x3E, 0x45, 0x46, 0x3A, 0x46, 0x3E, 0x3F, 0x46, - 0x46, 0x46, 0x3F, 0x46, 0x45, 0x4E, 0x46, 0x4F, - 0x47, 0x47, 0x4E, 0x4B, 0x46, 0x4E, 0x4E, 0x4E, - 0x4D, 0x4E, 0x4E, 0x4E, 0x59, 0x4E, 0x4E, 0x53, - 0x4E, 0x4E, 0x57, 0x59, 0x4E, 0x4E, 0x57, 0x50, - 0x5B, 0x57, 0x5B, 0x53, 0x5B, 0x5B, 0x57, 0x5B, - 0x57, 0x5B, 0x5B, 0x5B, 0x57, 0x57, 0x59, 0x5B, - 0x5B, 0x5B, 0x5B, 0x61, 0x5E, 0x57, 0x5B, 0x61, - 0x5E, 0x5E, 0x5E, 0x5E, 0x61, 0x5E, 0x5B, 0x61, - 0x61, 0x61, 0x57, 0x61, 0x5B, 0x61, 0x5E, 0x61, - 0x61, 0x5E, 0x61, 0x61, 0x5E, 0x61, 0x61, 0x61, - 0x61, 0x61, 0x61, 0x5F, 0x6E, 0x6E, 0x5E, 0x5F, - 0x6E, 0x5E, 0x5E, 0x5F, 0x61, 0x5E, 0x61, 0x61, - 0xA4, 0xA2, 0xA4, 0xA2, 0xA3, 0xA2, 0xA2, 0x9D, - 0xA2, 0xA2, 0x9D, 0x9D, 0xA2, 0xA2, 0xA2, 0x9E, - 0xA2, 0x91, 0x9E, 0x91, 0x8F, 0x8F, 0x91, 0x8A, - 0x8A, 0x8A, 0x86, 0x8A, 0x78, 0x86, 0x8A, 0x8A, - 0x86, 0x78, 0x89, 0x78, 0x78, 0x8A, 0x86, 0x78, - 0x86, 0x8A, 0x78, 0x78, 0x78, 0x86, 0x86, 0x86, - 0x8A, 0x86, 0x89, 0x8A, 0x86, 0x8F, 0x8F, 0x8F, - 0x91, 0x91, 0x8A, 0x91, 0x8F, 0x8A, 0x8F, 0x8F, - 0x8A, 0x8F, 0x80, 0x8F, 0x8F, 0x8A, 0x8A, 0x80, - 0x80, 0x8A, 0x8A, 0x8A, 0x8F, 0x91, 0x91, 0x8F, - 0x8F, 0x91, 0x91, 0xA2, 0x91, 0xA2, 0xA2, 0xA2, - 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA3, 0xA2, 0xA4, - 0xA2, 0xA2, 0xA2, 0xA3, 0xA2, 0xA4, 0xA2, 0xA3, - 0xA2, 0xA4, 0xA3, 0xA4, 0xA4, 0xA4, 0xA3, 0xA3, - 0xAD, 0xA3, 0xA3, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, - 0xAE, 0xAE, 0xA4, 0xAE, 0xA4, 0xAE, 0xA4, 0xAD, - 0xAD, 0xA4, 0xAD, 0xA3, 0xA3, 0xA4, 0xAE, 0xA4, - 0xAE, 0xAE, 0xAE, 0xAD, 0xA3, 0xA3, 0x9E, 0x9E, - 0x92, 0x9E, 0x92, 0x8F, 0x8F, 0x86, 0x86, 0x92, - 0x89, 0x92, 0x89, 0x78, 0x79, 0x79, 0x77, 0x79, - 0x71, 0x6E, 0x5E, 0x5E, 0x5E, 0x5F, 0x5F, 0x59, - 0x59, 0x4E, 0x4E, 0x46, 0x4D, 0x46, 0x45, 0x3F, - 0x3A, 0x3A, 0x3D, 0x39, 0x3D, 0x3D, 0x38, 0x35, - 0x3A, 0x35, 0x32, 0x35, 0x38, 0x32, 0x38, 0x37, - 0x37, 0x37, 0x38, 0x3D, 0x36, 0x3D, 0x3E, 0x39, - 0x37, 0x38, 0x38, 0x3D, 0x3A, 0x39, 0x3D, 0x39, - 0x39, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3A, 0x3E, - 0x3E, 0x3E, 0x46, 0x3E, 0x46, 0x45, 0x46, 0x45, - 0x3F, 0x45, 0x47, 0x47, 0x45, 0x4E, 0x47, 0x4F, - 0x4D, 0x47, 0x4E, 0x53, 0x4E, 0x4E, 0x4E, 0x4E, - 0x4E, 0x4E, 0x4B, 0x4B, 0x50, 0x5B, 0x4E, 0x59, - 0x53, 0x4E, 0x53, 0x5B, 0x5B, 0x53, 0x57, 0x57, - 0x5B, 0x57, 0x5B, 0x50, 0x5B, 0x5B, 0x5B, 0x5B, - 0x5B, 0x5B, 0x5B, 0x5B, 0x5E, 0x5E, 0x5B, 0x5E, - 0x61, 0x5E, 0x5B, 0x5A, 0x61, 0x61, 0x5B, 0x61, - 0x57, 0x61, 0x61, 0x5B, 0x61, 0x5E, 0x5E, 0x5B, - 0x5E, 0x61, 0x5E, 0x61, 0x5E, 0x57, 0x61, 0x5E, - 0x61, 0x61, 0x5E, 0x61, 0x61, 0x5E, 0x61, 0x5E, - 0x5E, 0x61, 0x61, 0x5E, 0x5E, 0x6E, 0x6E, 0x61, - 0x6E, 0x61, 0x6E, 0x5E, 0x61, 0x5E, 0x5E, 0x61, - 0xA3, 0xA3, 0xA2, 0xA2, 0x9D, 0xA3, 0x9D, 0xA3, - 0x9D, 0x9D, 0x9D, 0xA2, 0x9D, 0x9D, 0x9D, 0x9D, - 0x9D, 0x9E, 0x91, 0x8F, 0x8F, 0x8A, 0x86, 0x8F, - 0x92, 0x86, 0x8A, 0x89, 0x8A, 0x8A, 0x86, 0x78, - 0x86, 0x8A, 0x92, 0x8A, 0x89, 0x89, 0x89, 0x92, - 0x89, 0x89, 0x89, 0x8A, 0x86, 0x86, 0x8A, 0x86, - 0x86, 0x8A, 0x8A, 0x8F, 0x8F, 0x8F, 0x8F, 0x91, - 0x8F, 0x8F, 0x9E, 0x8F, 0x91, 0x9E, 0x8F, 0x8F, - 0x9E, 0x9E, 0x91, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, - 0x91, 0x8F, 0x8F, 0x91, 0x91, 0x8F, 0x8F, 0x91, - 0x91, 0x91, 0x9E, 0x91, 0xA2, 0xA2, 0xA2, 0x91, - 0xA4, 0xA2, 0xA4, 0xA4, 0xA2, 0xA4, 0x9D, 0xA2, - 0xA2, 0xA3, 0x9D, 0xA2, 0xA4, 0xA2, 0xA3, 0xA3, - 0xA3, 0xA2, 0xA3, 0xA3, 0xA2, 0xA2, 0xA4, 0xA4, - 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xAE, 0xA4, 0xA4, - 0xAD, 0xA3, 0xAD, 0xA4, 0xAE, 0xA2, 0xA3, 0xA4, - 0xA3, 0xA2, 0xA2, 0xA4, 0xA4, 0xA3, 0xA3, 0xA3, - 0xA3, 0xA3, 0xA3, 0xA2, 0xA2, 0x9E, 0xA2, 0x9E, - 0xA2, 0x8F, 0x8F, 0x92, 0x86, 0x92, 0x92, 0x8A, - 0x8A, 0x89, 0x78, 0x79, 0x88, 0x79, 0x6E, 0x6E, - 0x71, 0x5E, 0x71, 0x5E, 0x5E, 0x5B, 0x59, 0x59, - 0x4E, 0x4E, 0x4F, 0x4E, 0x47, 0x47, 0x46, 0x44, - 0x44, 0x3E, 0x39, 0x3D, 0x37, 0x3D, 0x39, 0x38, - 0x35, 0x3D, 0x3A, 0x32, 0x37, 0x3A, 0x37, 0x36, - 0x36, 0x35, 0x39, 0x39, 0x38, 0x3D, 0x38, 0x3D, - 0x3A, 0x3E, 0x3E, 0x39, 0x3E, 0x39, 0x37, 0x39, - 0x3E, 0x3A, 0x3A, 0x3E, 0x3A, 0x3A, 0x46, 0x46, - 0x3E, 0x45, 0x46, 0x46, 0x3E, 0x46, 0x3F, 0x47, - 0x45, 0x47, 0x47, 0x47, 0x47, 0x46, 0x46, 0x47, - 0x46, 0x47, 0x4E, 0x45, 0x46, 0x4E, 0x4B, 0x4E, - 0x53, 0x4B, 0x57, 0x53, 0x57, 0x4E, 0x4E, 0x4E, - 0x53, 0x5B, 0x50, 0x59, 0x53, 0x57, 0x5B, 0x50, - 0x59, 0x5B, 0x53, 0x57, 0x57, 0x5B, 0x57, 0x5B, - 0x57, 0x57, 0x5E, 0x5E, 0x5B, 0x5B, 0x61, 0x5B, - 0x5B, 0x5B, 0x61, 0x61, 0x61, 0x5E, 0x5E, 0x5B, - 0x61, 0x5B, 0x61, 0x61, 0x5E, 0x61, 0x61, 0x61, - 0x61, 0x5E, 0x61, 0x5E, 0x61, 0x61, 0x5E, 0x61, - 0x71, 0x5E, 0x61, 0x61, 0x5E, 0x6E, 0x5E, 0x6E, - 0x6E, 0x5E, 0x6E, 0x6E, 0x6E, 0x61, 0x61, 0x5E, - 0x61, 0x71, 0x5E, 0x6E, 0x61, 0x6E, 0x6E, 0x71, - 0xA4, 0xA3, 0xA4, 0xA3, 0x9D, 0xA3, 0xA2, 0xA3, - 0x9D, 0xA3, 0x9D, 0xA4, 0xA3, 0x9D, 0xA2, 0xA2, - 0x91, 0xA2, 0x91, 0x91, 0x8F, 0x8F, 0x8A, 0x8A, - 0x8A, 0x86, 0x8A, 0x86, 0x86, 0x89, 0x86, 0x8A, - 0x92, 0x8A, 0x89, 0x8A, 0x8A, 0x8A, 0x92, 0x8A, - 0x8A, 0x8A, 0x86, 0x92, 0x8A, 0x86, 0x8F, 0x8A, - 0x8F, 0x8A, 0x8A, 0x91, 0x8F, 0x8F, 0x9E, 0xA2, - 0x91, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, - 0x9D, 0x9E, 0xA2, 0x8F, 0x8F, 0x9E, 0x9D, 0x8F, - 0x8F, 0x91, 0x8F, 0x8F, 0x91, 0xA2, 0xA2, 0xA2, - 0xA2, 0x91, 0xA2, 0xA2, 0xA2, 0xA2, 0xA4, 0xA2, - 0xA4, 0xA2, 0xA2, 0xA4, 0xA2, 0xA3, 0xA2, 0xA2, - 0x9D, 0xA3, 0xA4, 0xA2, 0xA3, 0x9D, 0xA3, 0xA3, - 0xA3, 0xA4, 0xA3, 0xA4, 0xA3, 0xA3, 0xA3, 0xA3, - 0xA3, 0xAD, 0xA3, 0xAE, 0xA4, 0xAE, 0xAE, 0xA4, - 0xAE, 0xAE, 0xA4, 0xA4, 0xAE, 0xAE, 0xA2, 0xA4, - 0xA4, 0xA4, 0xA2, 0xA3, 0xAE, 0xA4, 0xAE, 0xAE, - 0xAE, 0xA4, 0xAE, 0xA3, 0xA3, 0x9E, 0x9D, 0x9E, - 0x9E, 0x9E, 0x9E, 0x9E, 0x8F, 0x82, 0x82, 0x82, - 0x82, 0x88, 0x88, 0x88, 0x77, 0x89, 0x71, 0x7C, - 0x71, 0x71, 0x6E, 0x71, 0x71, 0x5E, 0x5E, 0x5F, - 0x59, 0x59, 0x4E, 0x46, 0x4E, 0x46, 0x3F, 0x46, - 0x44, 0x3E, 0x39, 0x37, 0x37, 0x37, 0x37, 0x32, - 0x2B, 0x35, 0x36, 0x38, 0x38, 0x32, 0x39, 0x39, - 0x37, 0x36, 0x35, 0x39, 0x37, 0x37, 0x39, 0x3D, - 0x39, 0x38, 0x39, 0x39, 0x39, 0x3E, 0x3E, 0x3A, - 0x3E, 0x3E, 0x3A, 0x3E, 0x3E, 0x3E, 0x3F, 0x3E, - 0x3E, 0x3F, 0x3F, 0x47, 0x3F, 0x46, 0x3E, 0x4B, - 0x47, 0x47, 0x4B, 0x47, 0x47, 0x4E, 0x4B, 0x4E, - 0x4F, 0x47, 0x53, 0x4B, 0x47, 0x53, 0x4E, 0x4E, - 0x57, 0x4E, 0x4E, 0x4E, 0x50, 0x5B, 0x53, 0x59, - 0x53, 0x57, 0x53, 0x57, 0x59, 0x57, 0x5B, 0x53, - 0x53, 0x5B, 0x5B, 0x5B, 0x5B, 0x5B, 0x5E, 0x61, - 0x61, 0x5B, 0x5B, 0x61, 0x61, 0x57, 0x61, 0x61, - 0x61, 0x57, 0x61, 0x5B, 0x61, 0x61, 0x61, 0x5E, - 0x61, 0x5E, 0x5E, 0x61, 0x61, 0x5E, 0x61, 0x5E, - 0x6E, 0x5E, 0x6E, 0x61, 0x6E, 0x61, 0x61, 0x61, - 0x61, 0x71, 0x71, 0x6E, 0x6E, 0x61, 0x6E, 0x5E, - 0x6E, 0x61, 0x61, 0x61, 0x71, 0x5E, 0x6E, 0x5E, - 0x6E, 0x6E, 0x6E, 0x71, 0x61, 0x61, 0x61, 0x61, - 0xA3, 0xA4, 0xA3, 0xA4, 0xA3, 0xA3, 0xA3, 0xA3, - 0xA3, 0xA3, 0xA3, 0x9D, 0x9D, 0xA3, 0x9D, 0x9D, - 0xA2, 0x8F, 0xA2, 0x8F, 0x91, 0x8F, 0x8F, 0x8F, - 0x92, 0x8F, 0x8F, 0x86, 0x92, 0x8F, 0x8A, 0x92, - 0x8A, 0x92, 0x8F, 0x8F, 0x92, 0x92, 0x8F, 0x92, - 0x92, 0x8F, 0x92, 0x8F, 0x86, 0x8F, 0x8F, 0x8F, - 0x8F, 0x91, 0x91, 0x8F, 0x8F, 0x9E, 0x9E, 0x9D, - 0xA3, 0xA2, 0x9D, 0xA3, 0xAE, 0xB4, 0xB1, 0xB1, - 0xB4, 0xB4, 0xAD, 0xAD, 0xAD, 0xA2, 0x9E, 0x8F, - 0x8F, 0x8F, 0x8F, 0x91, 0x8F, 0x91, 0x91, 0x9D, - 0x9D, 0xA3, 0xA3, 0x9D, 0x9D, 0xA4, 0xA2, 0xA2, - 0xA3, 0xA3, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, - 0xA4, 0xA2, 0xA2, 0xA3, 0x9D, 0xA4, 0xA4, 0xA3, - 0xAD, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xAD, - 0xA4, 0xA4, 0xAE, 0xAE, 0xAE, 0xAE, 0xAD, 0xB1, - 0xAE, 0xB5, 0xB1, 0xAE, 0xAF, 0xAE, 0xAE, 0xAE, - 0xAE, 0xA4, 0xAE, 0xAE, 0xAD, 0xAE, 0xAE, 0xAE, - 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xA3, 0xAD, 0xA9, - 0x9E, 0xA3, 0x9E, 0x92, 0x82, 0x64, 0x64, 0x6D, - 0x6D, 0x6D, 0x60, 0x60, 0x60, 0x60, 0x82, 0x6F, - 0x82, 0x77, 0x77, 0x71, 0x71, 0x71, 0x5E, 0x5E, - 0x57, 0x59, 0x59, 0x59, 0x4F, 0x4E, 0x46, 0x3F, - 0x45, 0x45, 0x3E, 0x3E, 0x3D, 0x3D, 0x39, 0x24, - 0x21, 0x21, 0x3D, 0x38, 0x37, 0x3A, 0x36, 0x3D, - 0x37, 0x37, 0x39, 0x38, 0x38, 0x38, 0x38, 0x37, - 0x3D, 0x39, 0x3E, 0x3E, 0x3E, 0x39, 0x39, 0x3E, - 0x39, 0x3E, 0x3E, 0x45, 0x46, 0x3E, 0x3A, 0x45, - 0x46, 0x3E, 0x46, 0x3A, 0x46, 0x3F, 0x47, 0x47, - 0x4B, 0x46, 0x47, 0x4B, 0x4E, 0x45, 0x4E, 0x47, - 0x4E, 0x4F, 0x4E, 0x53, 0x53, 0x4E, 0x4E, 0x59, - 0x4E, 0x4E, 0x53, 0x53, 0x57, 0x53, 0x53, 0x53, - 0x53, 0x53, 0x5B, 0x5B, 0x5B, 0x53, 0x5B, 0x5B, - 0x5B, 0x57, 0x5B, 0x61, 0x57, 0x57, 0x61, 0x5B, - 0x5E, 0x61, 0x61, 0x5B, 0x5B, 0x61, 0x5E, 0x57, - 0x61, 0x61, 0x5E, 0x61, 0x5E, 0x61, 0x5E, 0x6E, - 0x5E, 0x61, 0x61, 0x61, 0x5E, 0x61, 0x71, 0x6E, - 0x6E, 0x6E, 0x61, 0x5E, 0x61, 0x61, 0x61, 0x61, - 0x6E, 0x61, 0x61, 0x6E, 0x6E, 0x6E, 0x61, 0x6E, - 0x61, 0x71, 0x6E, 0x61, 0x6E, 0x6E, 0x6E, 0x6E, - 0x6E, 0x6E, 0x6E, 0x61, 0x6E, 0x6E, 0x6E, 0x6E, - 0xA3, 0xA4, 0xA3, 0xA3, 0xA4, 0xA3, 0xA3, 0xA3, - 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0x9D, - 0x9D, 0x8F, 0xA2, 0x8F, 0x8F, 0x92, 0x80, 0x8F, - 0x8A, 0x86, 0x8F, 0x8A, 0x89, 0x92, 0x8A, 0x92, - 0x8F, 0x92, 0x92, 0x9E, 0x8F, 0x9E, 0x8F, 0x9E, - 0x92, 0x9E, 0x8F, 0x9E, 0x8F, 0x8F, 0x8F, 0x8F, - 0x9E, 0x9E, 0xA2, 0xA2, 0x91, 0xA2, 0xA2, 0x9E, - 0xA3, 0xA3, 0xAD, 0xB4, 0xB1, 0xBE, 0xBE, 0xBE, - 0xBE, 0xBE, 0xBE, 0xAD, 0xAD, 0xA2, 0xA2, 0xA2, - 0x91, 0x91, 0x91, 0xA2, 0x91, 0x9E, 0x91, 0xA2, - 0xA2, 0xA2, 0xA3, 0xA3, 0x9D, 0xA3, 0xA4, 0xA3, - 0xA4, 0xAD, 0xA3, 0xA3, 0xA4, 0xA3, 0xA4, 0xA3, - 0xA4, 0xA3, 0x9D, 0xA3, 0xA3, 0x9D, 0xA4, 0x9D, - 0xA3, 0xA4, 0xA4, 0xA4, 0xA4, 0xAE, 0xA4, 0xAE, - 0xAE, 0xA4, 0xA4, 0xAE, 0xAE, 0xAF, 0xAE, 0xAF, - 0xAE, 0xAF, 0xAF, 0xB5, 0xAF, 0xAF, 0xAE, 0xB1, - 0xAF, 0xAF, 0xAF, 0xAF, 0xB1, 0xAE, 0xB5, 0xB1, - 0xB5, 0xB1, 0xAE, 0xAD, 0xB1, 0xAD, 0xA4, 0xAD, - 0xA9, 0xA9, 0xA7, 0x82, 0x6D, 0x7A, 0x87, 0xA8, - 0xAA, 0x90, 0x7A, 0x7A, 0x7A, 0x6D, 0x6D, 0x60, - 0x69, 0x55, 0x55, 0x55, 0x55, 0x6D, 0x64, 0x64, - 0x6F, 0x5F, 0x59, 0x59, 0x4F, 0x4E, 0x4F, 0x47, - 0x45, 0x46, 0x45, 0x3E, 0x39, 0x3A, 0x39, 0x23, - 0x21, 0x21, 0x37, 0x38, 0x3A, 0x3D, 0x37, 0x39, - 0x3E, 0x39, 0x37, 0x3E, 0x3E, 0x3E, 0x3D, 0x39, - 0x39, 0x3A, 0x3A, 0x39, 0x3E, 0x3E, 0x3E, 0x3E, - 0x3A, 0x45, 0x39, 0x39, 0x45, 0x3E, 0x3E, 0x3F, - 0x46, 0x3E, 0x46, 0x47, 0x46, 0x46, 0x3F, 0x47, - 0x47, 0x47, 0x4E, 0x47, 0x4E, 0x45, 0x4F, 0x4B, - 0x53, 0x4B, 0x4E, 0x4B, 0x53, 0x53, 0x4E, 0x59, - 0x5B, 0x53, 0x53, 0x53, 0x53, 0x57, 0x5B, 0x5B, - 0x5B, 0x57, 0x57, 0x5B, 0x5B, 0x57, 0x57, 0x57, - 0x61, 0x5B, 0x5B, 0x61, 0x5B, 0x61, 0x5B, 0x5A, - 0x61, 0x61, 0x61, 0x61, 0x5E, 0x61, 0x61, 0x5E, - 0x63, 0x61, 0x61, 0x61, 0x5E, 0x61, 0x6E, 0x61, - 0x61, 0x61, 0x5E, 0x61, 0x61, 0x61, 0x61, 0x61, - 0x6E, 0x71, 0x6E, 0x6E, 0x6E, 0x6E, 0x6E, 0x61, - 0x6E, 0x6E, 0x6E, 0x6E, 0x6E, 0x79, 0x61, 0x6E, - 0x61, 0x6E, 0x6E, 0x6E, 0x75, 0x61, 0x75, 0x6E, - 0x75, 0x6E, 0x6E, 0x6E, 0x6E, 0x6E, 0x6E, 0x6E, - 0xA4, 0xA3, 0xA4, 0xA4, 0x9D, 0xA3, 0x9D, 0x9D, - 0xA2, 0xA2, 0xA2, 0xA2, 0x9D, 0x9D, 0x9D, 0x9E, - 0x9E, 0xA2, 0x8F, 0x8F, 0x8F, 0x91, 0x8F, 0x80, - 0x92, 0x92, 0x60, 0x64, 0x64, 0x64, 0x60, 0x64, - 0x64, 0x64, 0x82, 0x82, 0x82, 0x82, 0x88, 0x82, - 0x94, 0x93, 0x88, 0x94, 0x93, 0x94, 0x94, 0x92, - 0x92, 0x92, 0x9E, 0x9E, 0x9D, 0xA2, 0xA2, 0xA4, - 0xA3, 0xAD, 0xB1, 0xB1, 0xBE, 0xBE, 0xBF, 0xBE, - 0xBE, 0xB4, 0xB4, 0xB1, 0xA4, 0xA4, 0x9D, 0xA2, - 0xA2, 0xA2, 0x9E, 0x91, 0x9E, 0xA2, 0xA2, 0x9D, - 0x9E, 0x9D, 0x9D, 0xA3, 0xA3, 0xA4, 0xA3, 0xA3, - 0xA3, 0xA4, 0xA4, 0xA4, 0xA3, 0xA4, 0xA2, 0xA4, - 0xA2, 0xA4, 0xA4, 0xA4, 0xA4, 0xA3, 0x9D, 0xA4, - 0xA3, 0xA3, 0xA3, 0xA4, 0xA4, 0xA4, 0xA2, 0xA4, - 0xA4, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, - 0xB5, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, - 0xAE, 0xAE, 0xA3, 0xB5, 0xAE, 0xB1, 0xB5, 0xAD, - 0xB5, 0xAD, 0xB1, 0xB1, 0xAD, 0xAD, 0xAD, 0xAD, - 0xAD, 0x94, 0x64, 0x6D, 0x87, 0x90, 0xCE, 0xD4, - 0xCE, 0xD4, 0xCE, 0xC8, 0xC8, 0xB8, 0xAA, 0x90, - 0x7A, 0x7A, 0x7A, 0x69, 0x69, 0x60, 0x54, 0x55, - 0x55, 0x43, 0x55, 0x3B, 0x55, 0x55, 0x4E, 0x46, - 0x46, 0x47, 0x46, 0x3F, 0x45, 0x39, 0x3A, 0x24, - 0x21, 0x20, 0x35, 0x3E, 0x32, 0x37, 0x3D, 0x39, - 0x37, 0x39, 0x39, 0x38, 0x38, 0x38, 0x39, 0x3E, - 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, - 0x3F, 0x3F, 0x46, 0x3E, 0x3F, 0x46, 0x46, 0x46, - 0x47, 0x47, 0x47, 0x46, 0x47, 0x3F, 0x45, 0x47, - 0x47, 0x4B, 0x47, 0x4E, 0x4E, 0x4E, 0x47, 0x53, - 0x47, 0x53, 0x53, 0x53, 0x4E, 0x4E, 0x5B, 0x53, - 0x59, 0x57, 0x59, 0x5B, 0x59, 0x59, 0x53, 0x53, - 0x57, 0x5B, 0x5B, 0x5B, 0x61, 0x5B, 0x61, 0x61, - 0x5B, 0x61, 0x61, 0x5B, 0x61, 0x5E, 0x61, 0x61, - 0x61, 0x5E, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, - 0x61, 0x61, 0x71, 0x6E, 0x6E, 0x6E, 0x61, 0x6E, - 0x6E, 0x6E, 0x6E, 0x6E, 0x6E, 0x6E, 0x6E, 0x74, - 0x6E, 0x6E, 0x6E, 0x6E, 0x6E, 0x6E, 0x6E, 0x79, - 0x75, 0x6E, 0x6E, 0x6E, 0x7B, 0x6E, 0x75, 0x75, - 0x75, 0x75, 0x6E, 0x75, 0x6E, 0x75, 0x6E, 0x75, - 0x6E, 0x75, 0x78, 0x75, 0x75, 0x75, 0x75, 0x75, - 0xA4, 0xA4, 0xA2, 0xA4, 0xA4, 0xA4, 0xA4, 0x9D, - 0x9D, 0x9D, 0xA2, 0xA3, 0xA2, 0xA2, 0xA2, 0xA2, - 0x8F, 0xA2, 0x91, 0x91, 0x8F, 0x8F, 0x8F, 0x8F, - 0x92, 0x64, 0x55, 0x55, 0x60, 0x60, 0x60, 0x60, - 0x60, 0x60, 0x60, 0x60, 0x64, 0x6D, 0x64, 0x60, - 0x60, 0x6D, 0x60, 0x64, 0x60, 0x64, 0x60, 0x60, - 0x64, 0x58, 0x92, 0x9E, 0x9D, 0x9D, 0xA2, 0xA3, - 0xAE, 0xB4, 0xBE, 0xBE, 0xBE, 0xBC, 0xBE, 0xBE, - 0xBE, 0xBE, 0xB4, 0xAD, 0xA3, 0xA4, 0xA4, 0x9D, - 0xA2, 0xA2, 0x9D, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, - 0xA2, 0xA2, 0x9D, 0x9D, 0xA3, 0xA3, 0xA4, 0xA3, - 0xA2, 0xA4, 0xA3, 0xA4, 0xA3, 0xA3, 0xA2, 0x9D, - 0x9D, 0xA2, 0xA2, 0xA2, 0xA3, 0xA3, 0xA2, 0x9D, - 0xA3, 0xA3, 0xA2, 0xA2, 0xA2, 0xA4, 0xA2, 0xA3, - 0xA4, 0xA2, 0xA4, 0xA4, 0xAE, 0xAE, 0xA3, 0xAD, - 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xA3, 0xB5, - 0xAE, 0xAE, 0xAD, 0xAE, 0xAE, 0xAD, 0xB5, 0xAD, - 0xB1, 0xB1, 0xAD, 0xB1, 0xAD, 0xAD, 0xA9, 0xA9, - 0x82, 0x64, 0x87, 0x87, 0xB8, 0xD4, 0xD4, 0xD4, - 0xD4, 0xD4, 0xD7, 0xCB, 0xCE, 0xCE, 0xCE, 0xCE, - 0xC8, 0xC8, 0xBB, 0xB8, 0xA8, 0xAA, 0x90, 0x7E, - 0x55, 0x54, 0x54, 0x54, 0x55, 0x33, 0x58, 0x4E, - 0x46, 0x3F, 0x45, 0x46, 0x3E, 0x3E, 0x39, 0x28, - 0x21, 0x21, 0x30, 0x3A, 0x3D, 0x39, 0x39, 0x3E, - 0x3E, 0x3D, 0x39, 0x3E, 0x3E, 0x3E, 0x39, 0x3E, - 0x3E, 0x3E, 0x47, 0x3A, 0x3E, 0x3A, 0x3F, 0x3E, - 0x3E, 0x3F, 0x47, 0x45, 0x3E, 0x47, 0x47, 0x46, - 0x45, 0x4B, 0x47, 0x47, 0x47, 0x4B, 0x47, 0x47, - 0x47, 0x53, 0x4B, 0x4B, 0x4B, 0x50, 0x4E, 0x4E, - 0x4E, 0x4E, 0x4E, 0x57, 0x53, 0x4E, 0x53, 0x53, - 0x59, 0x5B, 0x57, 0x5B, 0x53, 0x5B, 0x57, 0x5B, - 0x57, 0x5B, 0x61, 0x5B, 0x61, 0x61, 0x5B, 0x61, - 0x5B, 0x57, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, - 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x6E, 0x6E, - 0x61, 0x61, 0x61, 0x6E, 0x6E, 0x6E, 0x6E, 0x6E, - 0x61, 0x75, 0x61, 0x75, 0x6E, 0x75, 0x75, 0x75, - 0x75, 0x75, 0x79, 0x61, 0x6E, 0x75, 0x75, 0x6E, - 0x75, 0x75, 0x79, 0x6E, 0x79, 0x6E, 0x6E, 0x6E, - 0x6E, 0x75, 0x6E, 0x75, 0x6E, 0x75, 0x75, 0x78, - 0x79, 0x6E, 0x6E, 0x6E, 0x6E, 0x79, 0x75, 0x75, - 0xA4, 0xA3, 0xA4, 0xAD, 0x9D, 0xA3, 0xA3, 0xA3, - 0xA4, 0xA4, 0xA4, 0xA2, 0x9D, 0x9E, 0x9D, 0x9D, - 0xA2, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x92, - 0x60, 0x55, 0x55, 0x60, 0x6D, 0x6D, 0x6D, 0x7A, - 0x7A, 0x7A, 0x7A, 0x7A, 0x7A, 0x7A, 0x7A, 0x7A, - 0x64, 0x6D, 0x6D, 0x6D, 0x6D, 0x60, 0x6D, 0x60, - 0x60, 0x60, 0x64, 0xA9, 0xAD, 0xA3, 0xAD, 0xB1, - 0xB4, 0xBE, 0xBF, 0xC5, 0xBE, 0xC5, 0xBE, 0xC5, - 0xBE, 0xB1, 0xAE, 0xAE, 0xA4, 0xA4, 0xA3, 0xA3, - 0xA3, 0x9D, 0x9E, 0xA2, 0x9D, 0x9D, 0x8F, 0x9D, - 0x9D, 0x9E, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA3, - 0xA3, 0xA2, 0xA3, 0xA3, 0x9D, 0xA3, 0x9D, 0xA3, - 0xA2, 0xA2, 0x9D, 0x91, 0x9D, 0xA2, 0xA2, 0xA2, - 0xA2, 0xA2, 0x9E, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, - 0xA2, 0xA4, 0xA2, 0xA2, 0xA2, 0xA2, 0xA4, 0xA2, - 0xA4, 0xA2, 0xA2, 0xA3, 0xA3, 0xA2, 0xA3, 0xA3, - 0xA2, 0xA4, 0xA2, 0xAE, 0xA3, 0xAE, 0xA3, 0xAE, - 0xAD, 0xA3, 0xAD, 0xA3, 0xAD, 0xA3, 0x94, 0x64, - 0x6D, 0x87, 0x90, 0xCB, 0xD4, 0xD7, 0xCB, 0xD7, - 0xCB, 0xCE, 0xD4, 0xCE, 0xCE, 0xCE, 0xC8, 0xCB, - 0xC8, 0xCB, 0xC8, 0xC8, 0xBB, 0xBB, 0xBB, 0xBB, - 0xBB, 0xA8, 0xA8, 0x90, 0x54, 0x43, 0x43, 0x4F, - 0x4E, 0x46, 0x46, 0x46, 0x3A, 0x3A, 0x39, 0x29, - 0x21, 0x20, 0x28, 0x39, 0x39, 0x39, 0x39, 0x3D, - 0x39, 0x39, 0x39, 0x3A, 0x3E, 0x38, 0x3E, 0x3A, - 0x3A, 0x3A, 0x3A, 0x3F, 0x3A, 0x46, 0x3A, 0x46, - 0x45, 0x3E, 0x45, 0x3E, 0x47, 0x46, 0x46, 0x47, - 0x4B, 0x47, 0x47, 0x3F, 0x47, 0x47, 0x47, 0x4B, - 0x53, 0x47, 0x47, 0x53, 0x57, 0x53, 0x4E, 0x53, - 0x53, 0x53, 0x53, 0x53, 0x53, 0x5B, 0x5B, 0x57, - 0x5B, 0x57, 0x53, 0x53, 0x61, 0x5B, 0x61, 0x5B, - 0x61, 0x61, 0x57, 0x61, 0x5E, 0x57, 0x61, 0x61, - 0x61, 0x61, 0x61, 0x61, 0x61, 0x5E, 0x6E, 0x5E, - 0x6E, 0x6E, 0x5E, 0x6E, 0x61, 0x6E, 0x61, 0x61, - 0x6E, 0x6E, 0x75, 0x75, 0x6E, 0x6E, 0x6E, 0x61, - 0x79, 0x61, 0x80, 0x6E, 0x75, 0x6E, 0x6E, 0x6E, - 0x6E, 0x79, 0x75, 0x75, 0x75, 0x6E, 0x79, 0x75, - 0x6E, 0x79, 0x75, 0x75, 0x78, 0x78, 0x78, 0x78, - 0x7B, 0x75, 0x75, 0x79, 0x7B, 0x75, 0x6E, 0x79, - 0x75, 0x7B, 0x7B, 0x7B, 0x75, 0x75, 0x79, 0x75, - 0xAE, 0xAD, 0xA3, 0xA3, 0xAD, 0xA4, 0xA4, 0xA4, - 0xA2, 0x9D, 0xA3, 0xA3, 0xA4, 0xA2, 0xA2, 0x9D, - 0x9D, 0x9E, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x64, - 0x60, 0x60, 0x6D, 0x69, 0x7A, 0x7A, 0x7A, 0x7A, - 0x7A, 0x7A, 0x87, 0x7A, 0x87, 0x87, 0x87, 0x87, - 0x87, 0x87, 0x7A, 0x7A, 0x7A, 0x7A, 0x7A, 0x6D, - 0x6D, 0x60, 0x64, 0x82, 0xA9, 0xAE, 0xAD, 0xB1, - 0xBE, 0xBE, 0xC5, 0xBE, 0xC5, 0xC5, 0xBE, 0xBE, - 0xBE, 0xB1, 0xAE, 0xAD, 0xA3, 0xA4, 0xA4, 0xA3, - 0xA3, 0xA4, 0x9D, 0xA2, 0x91, 0xA2, 0xA2, 0xA2, - 0xA2, 0x9D, 0x9D, 0x9E, 0x9D, 0x9D, 0x9D, 0x9D, - 0xA3, 0xA3, 0xA3, 0xA3, 0x9D, 0xA3, 0xA2, 0x9D, - 0x9D, 0xA2, 0x9E, 0x91, 0x91, 0x91, 0x9D, 0x91, - 0x91, 0xA2, 0xA2, 0xA2, 0x9D, 0x9D, 0xA2, 0xA2, - 0xA2, 0xA2, 0xA3, 0xA3, 0xA4, 0x9E, 0xA3, 0xA2, - 0xA3, 0xA4, 0xA3, 0xA3, 0xA4, 0xA3, 0xA3, 0xA3, - 0xA3, 0xA4, 0xA2, 0xA4, 0xA3, 0xAE, 0xA3, 0xAE, - 0xAD, 0xAE, 0xAD, 0xAD, 0xA9, 0x93, 0x64, 0x82, - 0x87, 0xA8, 0xD0, 0xD7, 0xD4, 0xD7, 0xD7, 0xD7, - 0xD7, 0xD7, 0xD4, 0xD7, 0xCE, 0xD4, 0xCE, 0xD0, - 0xCB, 0xCB, 0xC8, 0xC8, 0xC8, 0xBB, 0xBB, 0xB8, - 0xBB, 0xBB, 0xA8, 0xBB, 0x90, 0x54, 0x3B, 0x55, - 0x4E, 0x46, 0x3F, 0x46, 0x3E, 0x3A, 0x3F, 0x28, - 0x21, 0x20, 0x23, 0x39, 0x39, 0x39, 0x39, 0x3E, - 0x39, 0x3E, 0x3E, 0x3A, 0x3F, 0x3A, 0x3F, 0x46, - 0x46, 0x46, 0x3E, 0x46, 0x3F, 0x46, 0x3F, 0x46, - 0x47, 0x3F, 0x3F, 0x46, 0x3F, 0x47, 0x47, 0x3F, - 0x47, 0x4B, 0x47, 0x4B, 0x47, 0x4B, 0x47, 0x47, - 0x53, 0x47, 0x28, 0x24, 0x3A, 0x53, 0x4E, 0x4E, - 0x53, 0x5B, 0x59, 0x59, 0x53, 0x53, 0x5B, 0x5B, - 0x5B, 0x5B, 0x61, 0x5B, 0x5B, 0x5B, 0x61, 0x5B, - 0x57, 0x61, 0x57, 0x61, 0x61, 0x61, 0x5E, 0x61, - 0x61, 0x61, 0x5E, 0x6E, 0x6E, 0x61, 0x75, 0x61, - 0x61, 0x75, 0x6E, 0x6E, 0x6E, 0x75, 0x6E, 0x6E, - 0x6E, 0x6E, 0x6E, 0x75, 0x75, 0x75, 0x79, 0x6E, - 0x79, 0x61, 0x75, 0x75, 0x75, 0x75, 0x7B, 0x79, - 0x75, 0x6E, 0x75, 0x79, 0x75, 0x75, 0x75, 0x75, - 0x7B, 0x75, 0x79, 0x6E, 0x7B, 0x79, 0x75, 0x6E, - 0x79, 0x7B, 0x75, 0x78, 0x79, 0x7B, 0x7B, 0x78, - 0x7B, 0x78, 0x75, 0x7B, 0x7B, 0x7B, 0x7B, 0x7B, - 0xAE, 0xAE, 0xAE, 0xAE, 0xA4, 0xA3, 0xA3, 0xA3, - 0xA4, 0xA3, 0xA2, 0xA2, 0x9D, 0xA2, 0x9D, 0x9E, - 0x9E, 0x91, 0x9E, 0x8F, 0x8F, 0x92, 0x6D, 0x60, - 0x4D, 0x60, 0x7A, 0x7A, 0x7A, 0xA0, 0xD0, 0xCE, - 0xD0, 0xC8, 0xD0, 0xC8, 0xC6, 0xBB, 0xC6, 0xBB, - 0xB8, 0xA8, 0xA8, 0xA8, 0xA0, 0x99, 0x7A, 0x7A, - 0x87, 0x64, 0x64, 0x64, 0x94, 0xAD, 0xB1, 0xBE, - 0xBE, 0xC5, 0xBE, 0xC5, 0xBE, 0xBE, 0xBE, 0xBF, - 0xAE, 0xAE, 0xA3, 0xAE, 0xAE, 0xA3, 0xA2, 0xA4, - 0xA3, 0xA2, 0xA2, 0x91, 0xA2, 0x9D, 0x8F, 0x9D, - 0x91, 0x9D, 0x9E, 0xA2, 0xA3, 0x9D, 0xA3, 0xA3, - 0x9D, 0x9D, 0xA2, 0xA2, 0xA2, 0x9E, 0x9D, 0x9E, - 0x9E, 0x9E, 0x91, 0xA2, 0x91, 0x91, 0x91, 0x9E, - 0x91, 0x9D, 0x9E, 0x8F, 0x8F, 0x91, 0x9D, 0x8F, - 0x91, 0x9E, 0x91, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, - 0xA3, 0xA2, 0xA2, 0xA4, 0xA2, 0xA2, 0xA2, 0xA2, - 0xA2, 0xA2, 0xA2, 0xA2, 0xA3, 0xA3, 0xA3, 0xA3, - 0xA3, 0xA3, 0xAD, 0xA3, 0x82, 0x6F, 0x87, 0x87, - 0xC8, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, - 0xD7, 0xD4, 0xD7, 0xD4, 0xD4, 0xCE, 0xD0, 0xCE, - 0xD0, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xBB, 0xBB, - 0xBB, 0xBB, 0xBB, 0xA8, 0xA8, 0x69, 0x54, 0x43, - 0x4F, 0x4E, 0x4D, 0x46, 0x44, 0x46, 0x45, 0x32, - 0x21, 0x21, 0x20, 0x3E, 0x3E, 0x3E, 0x3E, 0x3A, - 0x3F, 0x3F, 0x3E, 0x3E, 0x3E, 0x46, 0x46, 0x3F, - 0x3F, 0x3F, 0x46, 0x3F, 0x46, 0x3F, 0x47, 0x47, - 0x46, 0x46, 0x4F, 0x47, 0x47, 0x4B, 0x47, 0x53, - 0x47, 0x47, 0x4B, 0x4E, 0x53, 0x53, 0x47, 0x53, - 0x4B, 0x37, 0x21, 0x21, 0x3E, 0x4E, 0x5B, 0x53, - 0x59, 0x53, 0x5B, 0x5B, 0x5B, 0x57, 0x5B, 0x5B, - 0x5B, 0x61, 0x57, 0x57, 0x61, 0x5E, 0x5E, 0x61, - 0x61, 0x61, 0x61, 0x61, 0x5E, 0x5E, 0x61, 0x61, - 0x61, 0x61, 0x75, 0x6E, 0x61, 0x6E, 0x6E, 0x6E, - 0x79, 0x6E, 0x6E, 0x79, 0x75, 0x6E, 0x78, 0x75, - 0x75, 0x79, 0x75, 0x75, 0x75, 0x75, 0x75, 0x75, - 0x75, 0x7B, 0x79, 0x79, 0x79, 0x79, 0x6E, 0x75, - 0x7B, 0x7B, 0x7B, 0x78, 0x7B, 0x79, 0x79, 0x86, - 0x7B, 0x7B, 0x78, 0x7B, 0x78, 0x7B, 0x79, 0x7B, - 0x7B, 0x7B, 0x86, 0x7B, 0x7B, 0x78, 0x7B, 0x7B, - 0x78, 0x7B, 0x86, 0x7B, 0x7B, 0x7B, 0x7B, 0x7B, - 0xAF, 0xAE, 0xAE, 0xAE, 0xAE, 0xAF, 0xAE, 0xA4, - 0xA4, 0xA4, 0xA4, 0xA4, 0xA2, 0xA2, 0xA2, 0xA2, - 0xA2, 0x91, 0x9E, 0x9D, 0x9D, 0x6F, 0x64, 0x60, - 0x60, 0x6D, 0x7A, 0x7A, 0x90, 0xD4, 0xD7, 0xD7, - 0xE0, 0xD7, 0xE0, 0xD7, 0xE0, 0xE0, 0xE0, 0xE0, - 0xE0, 0xE0, 0xDA, 0xE0, 0xD7, 0xD7, 0xA8, 0x87, - 0x87, 0x7A, 0x64, 0x6F, 0x64, 0xA9, 0xB4, 0xBF, - 0xBC, 0xBE, 0xBE, 0xC5, 0xBE, 0xBE, 0xB5, 0xB4, - 0xAE, 0xAE, 0xAD, 0xA3, 0xA3, 0xA3, 0xA2, 0xA2, - 0xA2, 0xA2, 0xA2, 0x9D, 0x91, 0x91, 0x8F, 0x9E, - 0x8F, 0x91, 0x9D, 0x8F, 0xA2, 0xA2, 0x9D, 0xA2, - 0xA2, 0x9D, 0x9D, 0x9D, 0xA2, 0x91, 0xA2, 0x91, - 0x91, 0xA2, 0x8F, 0x8F, 0x8F, 0x8F, 0x91, 0x8F, - 0x8F, 0x8A, 0x91, 0x91, 0x8F, 0x8F, 0x91, 0x9E, - 0x91, 0xA2, 0x91, 0x91, 0x91, 0x9D, 0x9E, 0x9D, - 0x9E, 0x9D, 0x9E, 0x91, 0xA2, 0x91, 0x91, 0x91, - 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA3, 0xA3, 0xA3, - 0xAD, 0xA9, 0xAD, 0xA9, 0x6D, 0x7A, 0xA0, 0xD0, - 0xD4, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD4, - 0xD7, 0xD7, 0xD4, 0xD4, 0xD4, 0xD4, 0xCE, 0xCE, - 0xCE, 0xC8, 0xC8, 0xCB, 0xC8, 0xBB, 0xC8, 0xBB, - 0xBB, 0xA8, 0xBB, 0xA8, 0xA8, 0x90, 0x55, 0x43, - 0x55, 0x4F, 0x4E, 0x47, 0x46, 0x3E, 0x47, 0x35, - 0x21, 0x21, 0x21, 0x3E, 0x3E, 0x3E, 0x3E, 0x3A, - 0x3E, 0x3F, 0x3F, 0x46, 0x3E, 0x3E, 0x46, 0x3F, - 0x46, 0x47, 0x47, 0x3F, 0x47, 0x46, 0x4B, 0x4E, - 0x47, 0x47, 0x47, 0x4B, 0x53, 0x47, 0x4E, 0x4B, - 0x4E, 0x4E, 0x47, 0x4E, 0x47, 0x4E, 0x53, 0x53, - 0x45, 0x21, 0x21, 0x23, 0x4B, 0x53, 0x5B, 0x57, - 0x57, 0x5B, 0x5B, 0x57, 0x5E, 0x5E, 0x61, 0x5E, - 0x5E, 0x61, 0x61, 0x57, 0x61, 0x61, 0x61, 0x5E, - 0x5E, 0x61, 0x6E, 0x61, 0x6E, 0x6E, 0x6E, 0x6E, - 0x6E, 0x6E, 0x75, 0x6E, 0x6E, 0x6E, 0x75, 0x75, - 0x6E, 0x75, 0x79, 0x61, 0x7B, 0x75, 0x79, 0x6E, - 0x75, 0x7B, 0x79, 0x79, 0x79, 0x7B, 0x79, 0x7B, - 0x79, 0x7B, 0x75, 0x7B, 0x7B, 0x86, 0x86, 0x79, - 0x7B, 0x79, 0x7B, 0x78, 0x78, 0x86, 0x7B, 0x78, - 0x78, 0x86, 0x78, 0x86, 0x78, 0x86, 0x78, 0x86, - 0x86, 0x7B, 0x89, 0x78, 0x86, 0x78, 0x86, 0x86, - 0x86, 0x7B, 0x86, 0x86, 0x86, 0x78, 0x78, 0x86, - 0xAE, 0xB5, 0xAF, 0xAF, 0xAE, 0xAE, 0xAE, 0xAE, - 0xAE, 0xAE, 0xAE, 0xA3, 0xA4, 0xA3, 0xA4, 0xA2, - 0xA2, 0xA3, 0xA2, 0x9E, 0x64, 0x60, 0x60, 0x60, - 0x7A, 0x7A, 0x87, 0xA0, 0xD4, 0xD7, 0xD7, 0xD7, - 0xE0, 0xE0, 0xE0, 0xE6, 0xE0, 0xE0, 0xE0, 0xE0, - 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE6, 0xD7, 0xA0, - 0x87, 0x90, 0x7A, 0x7A, 0x6F, 0x82, 0xB4, 0xBE, - 0xBE, 0xC5, 0xBE, 0xBC, 0xBE, 0xBE, 0xB1, 0xB1, - 0xAD, 0xAD, 0xA3, 0xAD, 0xA3, 0xA3, 0x9D, 0xA2, - 0x9D, 0x91, 0x91, 0x8F, 0x91, 0x9D, 0x91, 0x91, - 0x91, 0x9E, 0x8F, 0xA2, 0x8F, 0x8F, 0x91, 0x9E, - 0x9D, 0x91, 0x8F, 0x9D, 0x91, 0x9E, 0x91, 0x91, - 0x91, 0x91, 0x91, 0x8F, 0x91, 0x8A, 0x92, 0x8F, - 0x8A, 0x8F, 0x8F, 0x8F, 0x8F, 0x91, 0x8F, 0x8F, - 0x8F, 0x8F, 0x8F, 0x91, 0x9D, 0x8F, 0x9D, 0x8F, - 0xA2, 0x8F, 0x91, 0x9E, 0x91, 0x9E, 0xA2, 0xA2, - 0x9D, 0x9D, 0xA2, 0xA3, 0xA3, 0xA3, 0xA3, 0xA9, - 0xA3, 0xA4, 0xA9, 0xA9, 0x82, 0x82, 0xD4, 0xD7, - 0xD7, 0xD7, 0xD7, 0xD7, 0xE0, 0xDA, 0xE0, 0xE0, - 0xD7, 0xD7, 0xD7, 0xDA, 0xD4, 0xD4, 0xD4, 0xD4, - 0xD4, 0xD4, 0xD0, 0xCE, 0xC8, 0xD0, 0xC8, 0xC8, - 0xC8, 0xC8, 0xBB, 0xBB, 0xBB, 0xB8, 0x5D, 0x55, - 0x43, 0x64, 0x58, 0x58, 0x4E, 0x58, 0x55, 0x3D, - 0x21, 0x20, 0x22, 0x44, 0x4D, 0x4D, 0x58, 0x4F, - 0x4F, 0x4F, 0x4F, 0x4E, 0x4E, 0x4E, 0x59, 0x58, - 0x59, 0x58, 0x4F, 0x58, 0x58, 0x59, 0x4E, 0x59, - 0x59, 0x59, 0x5F, 0x59, 0x59, 0x58, 0x59, 0x59, - 0x59, 0x59, 0x5F, 0x58, 0x64, 0x59, 0x64, 0x45, - 0x24, 0x21, 0x20, 0x4E, 0x5E, 0x5E, 0x5F, 0x5E, - 0x5E, 0x5F, 0x71, 0x71, 0x5E, 0x6E, 0x71, 0x6E, - 0x6E, 0x71, 0x6E, 0x79, 0x6E, 0x6E, 0x7C, 0x79, - 0x79, 0x7C, 0x79, 0x79, 0x7B, 0x89, 0x79, 0x79, - 0x79, 0x79, 0x79, 0x86, 0x78, 0x86, 0x89, 0x79, - 0x86, 0x79, 0x86, 0x86, 0x79, 0x89, 0x86, 0x86, - 0x89, 0x79, 0x86, 0x86, 0x89, 0x89, 0x86, 0x92, - 0x89, 0x89, 0x92, 0x86, 0x86, 0x8A, 0x89, 0x89, - 0x92, 0x92, 0x89, 0x92, 0x8F, 0x89, 0x92, 0x92, - 0x92, 0x92, 0x86, 0x92, 0x92, 0x92, 0x8F, 0x89, - 0x89, 0x92, 0x8A, 0x92, 0x8A, 0x8F, 0x8A, 0x86, - 0x86, 0x8A, 0x8A, 0x89, 0x8A, 0x92, 0x92, 0x8A, - 0xB5, 0xB5, 0xB1, 0xB5, 0xB1, 0xB1, 0xB1, 0xB1, - 0xB1, 0xAE, 0xAF, 0xAE, 0xA4, 0xA4, 0xA4, 0xA3, - 0xA3, 0xA3, 0xA3, 0xA3, 0x64, 0x60, 0x60, 0x7A, - 0x82, 0x87, 0x90, 0xD4, 0xD7, 0xE0, 0xE0, 0xDB, - 0xE0, 0xE0, 0xE0, 0xE6, 0xE6, 0xE6, 0xE6, 0xE6, - 0xE6, 0xE6, 0xE0, 0xE0, 0xE0, 0xE6, 0xE0, 0xD4, - 0x87, 0x87, 0x87, 0x7A, 0x6D, 0x6F, 0x93, 0xBE, - 0xBE, 0xBE, 0xC5, 0xBE, 0xBE, 0xB1, 0xB1, 0xAE, - 0xAE, 0xAE, 0xA3, 0xA3, 0xA3, 0x9E, 0x9D, 0x9E, - 0x9E, 0x9E, 0x8F, 0x9E, 0x8F, 0x8F, 0x8F, 0x9E, - 0x91, 0x91, 0x91, 0x9D, 0x9D, 0x9E, 0x91, 0x8F, - 0x9E, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9E, 0x91, - 0x8F, 0x9E, 0x9E, 0x8F, 0x9E, 0x91, 0x92, 0x92, - 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0xA2, - 0x8F, 0x9E, 0x9E, 0x8F, 0xA2, 0x8F, 0x9E, 0x9E, - 0xA2, 0x9E, 0xA2, 0x9D, 0xA2, 0x9E, 0x9E, 0x9E, - 0x9E, 0x9E, 0x9D, 0xA3, 0xA3, 0xA3, 0xA3, 0xAD, - 0xA9, 0xAD, 0xAD, 0x94, 0x7A, 0x99, 0xD7, 0xD7, - 0xD7, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, - 0xE0, 0xE0, 0xDA, 0xD7, 0xD7, 0xD4, 0xD0, 0xD4, - 0xCE, 0xCE, 0xD0, 0xCE, 0xC8, 0xC8, 0xC8, 0xC6, - 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xA8, 0x90, 0x69, - 0x3B, 0x55, 0x58, 0x4D, 0x45, 0x47, 0x46, 0x3E, - 0x21, 0x21, 0x22, 0x30, 0x46, 0x3E, 0x46, 0x3F, - 0x3F, 0x47, 0x47, 0x46, 0x46, 0x46, 0x46, 0x46, - 0x46, 0x4E, 0x47, 0x46, 0x4E, 0x4E, 0x47, 0x50, - 0x4B, 0x4E, 0x4E, 0x4E, 0x4E, 0x4F, 0x4E, 0x4E, - 0x4E, 0x4E, 0x4E, 0x53, 0x59, 0x53, 0x47, 0x23, - 0x21, 0x20, 0x38, 0x57, 0x57, 0x5B, 0x5B, 0x5E, - 0x5B, 0x5B, 0x5B, 0x61, 0x5E, 0x5E, 0x61, 0x5E, - 0x63, 0x5E, 0x61, 0x71, 0x71, 0x61, 0x6E, 0x61, - 0x6E, 0x6E, 0x6E, 0x6E, 0x6E, 0x6E, 0x75, 0x6E, - 0x75, 0x6E, 0x6E, 0x79, 0x6E, 0x75, 0x79, 0x75, - 0x75, 0x6E, 0x79, 0x78, 0x7B, 0x7B, 0x78, 0x7B, - 0x78, 0x78, 0x78, 0x7B, 0x78, 0x78, 0x78, 0x78, - 0x78, 0x86, 0x89, 0x8A, 0x78, 0x8A, 0x8A, 0x78, - 0x8A, 0x8A, 0x86, 0x86, 0x8A, 0x8A, 0x86, 0x86, - 0x8A, 0x8A, 0x86, 0x8A, 0x7B, 0x86, 0x8A, 0x8A, - 0x8A, 0x86, 0x80, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, - 0x86, 0x8A, 0x8A, 0x89, 0x8A, 0x80, 0x8A, 0x8A, - 0xBC, 0xB5, 0xBC, 0xB5, 0xB5, 0xAF, 0xB5, 0xAF, - 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xA3, 0xA4, 0xA3, - 0xA3, 0xA3, 0xA3, 0x9D, 0x64, 0x64, 0x7A, 0x7A, - 0x7A, 0x90, 0xD4, 0xE0, 0xE0, 0xE0, 0xE0, 0xE6, - 0xE6, 0xE6, 0xE6, 0xE6, 0xE6, 0xE6, 0xE6, 0xE6, - 0xE6, 0xEA, 0xE6, 0xE6, 0xE6, 0xE6, 0xE6, 0xE6, - 0xCE, 0xA0, 0x82, 0x87, 0x82, 0x82, 0x64, 0xB6, - 0xBC, 0xBE, 0xBE, 0xB1, 0xB1, 0xB4, 0xAE, 0xAD, - 0xA3, 0xA3, 0x9D, 0xA3, 0x9D, 0xA2, 0x9E, 0x8F, - 0x9E, 0x9D, 0x9E, 0x9E, 0x9E, 0x9E, 0x9D, 0x9E, - 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, - 0xA2, 0x9E, 0x9E, 0x9E, 0xA2, 0x9E, 0xA3, 0x9E, - 0xA2, 0x9E, 0x9D, 0x9E, 0x8F, 0x9E, 0x8F, 0xA2, - 0x9E, 0x8F, 0x9E, 0x8F, 0x8F, 0x9E, 0x8F, 0x8F, - 0x9E, 0x91, 0x9E, 0x9E, 0x9E, 0xA2, 0x9E, 0xA2, - 0x9E, 0x9E, 0x9E, 0x9E, 0x9D, 0x9D, 0x9D, 0xA2, - 0xA2, 0xA2, 0x9E, 0xA2, 0xAD, 0xAD, 0xAD, 0xA3, - 0xAD, 0xAD, 0xAD, 0x99, 0x82, 0xA8, 0xD7, 0xE0, - 0xE0, 0xE0, 0xE6, 0xE0, 0xE6, 0xE0, 0xE6, 0xE0, - 0xE6, 0xE0, 0xDA, 0xE6, 0xDA, 0xDA, 0xDA, 0xD4, - 0xD4, 0xCE, 0xCE, 0xCE, 0xD0, 0xCE, 0xD0, 0xC8, - 0xD0, 0xC8, 0xC8, 0xC6, 0xBB, 0xBB, 0xB8, 0x69, - 0x54, 0x43, 0x64, 0x64, 0x58, 0x58, 0x59, 0x55, - 0x21, 0x21, 0x22, 0x29, 0x4E, 0x4D, 0x4F, 0x4D, - 0x58, 0x4F, 0x4F, 0x4E, 0x59, 0x59, 0x58, 0x59, - 0x59, 0x58, 0x58, 0x59, 0x58, 0x58, 0x59, 0x59, - 0x59, 0x58, 0x5F, 0x59, 0x5F, 0x59, 0x5F, 0x5F, - 0x5F, 0x59, 0x5F, 0x59, 0x64, 0x4D, 0x2B, 0x23, - 0x22, 0x2B, 0x5B, 0x5E, 0x5F, 0x6F, 0x6F, 0x71, - 0x71, 0x7C, 0x71, 0x71, 0x6E, 0x6E, 0x71, 0x79, - 0x77, 0x79, 0x7C, 0x6E, 0x79, 0x77, 0x79, 0x77, - 0x7B, 0x79, 0x... [truncated message content] |
From: <sen...@us...> - 2008-08-05 23:03:22
|
Revision: 318 http://open2x.svn.sourceforge.net/open2x/?rev=318&view=rev Author: senquack Date: 2008-08-05 23:03:26 +0000 (Tue, 05 Aug 2008) Log Message: ----------- Update Paeryn's 1.2.9 HW SDL to 1.2.13 Added Paths: ----------- trunk/libs/SDL-1.2.13/build-scripts/config.guess trunk/libs/SDL-1.2.13/build-scripts/config.sub trunk/libs/SDL-1.2.13/build-scripts/fatbuild.sh trunk/libs/SDL-1.2.13/build-scripts/install-sh trunk/libs/SDL-1.2.13/build-scripts/ltmain.sh trunk/libs/SDL-1.2.13/build-scripts/makedep.sh trunk/libs/SDL-1.2.13/build-scripts/mkinstalldirs trunk/libs/SDL-1.2.13/build-scripts/strip_fPIC.sh Added: trunk/libs/SDL-1.2.13/build-scripts/config.guess =================================================================== --- trunk/libs/SDL-1.2.13/build-scripts/config.guess (rev 0) +++ trunk/libs/SDL-1.2.13/build-scripts/config.guess 2008-08-05 23:03:26 UTC (rev 318) @@ -0,0 +1,1479 @@ +#! /bin/sh +# Attempt to guess a canonical system name. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + +timestamp='2006-01-02' + +# This file 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., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + + +# Originally written by Per Bothner <pe...@bo...>. +# Please send patches to <con...@gn...>. Submit a context +# diff and a properly formatted ChangeLog entry. +# +# This script attempts to guess a canonical system name similar to +# config.sub. If it succeeds, it prints the system name on stdout, and +# exits with 0. Otherwise, it exits with 1. +# +# The plan is that this can be called by configure scripts if you +# don't specify an explicit build system type. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to <con...@gn...>." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + +trap 'exit 1' 1 2 15 + +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' + +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +# (gh...@no... 1994-08-24) +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then + PATH=$PATH:/.attbin ; export PATH +fi + +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +# Note: order is significant - the case branches are not exclusive. + +case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep __ELF__ >/dev/null + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # The OS release + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerppc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; + alpha:OSF1:*:*) + case $UNAME_RELEASE in + *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix + exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 + exit ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 + exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos + exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos + exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp + exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # ak...@wp... (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + i86pc:SunOS:5.*:*) + echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) + UNAME_RELEASE=`uname -v` + ;; + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} + exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} + ;; + sun4) + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac + exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} + exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 + exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} + exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} + exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} + exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include <stdio.h> /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_SVR4) + printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) + printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + #endif + #endif + exit (-1); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} + exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix + exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 + exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 + exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then + echo m88k-dg-dgux${UNAME_RELEASE} + else + echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} + fi + exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 + exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 + exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd + exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix + exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include <sys/systemcfg.h> + + main() + { + if (!__power_pc()) + exit(1); + puts("powerpc-ibm-aix3.2.5"); + exit(0); + } +EOF + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi + exit ;; + *:AIX:*:[45]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix + exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 + exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx + exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 + exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd + exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 + exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + esac ;; + esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include <stdlib.h> + #include <unistd.h> + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } +EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; + esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} + exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include <unistd.h> + int + main () + { + long cpu = sysconf (_SC_CPU_VERSION); + /* The order matters, because CPU_IS_HP_MC68K erroneously returns + true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct + results, however. */ + if (CPU_IS_PA_RISC (cpu)) + { + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; + case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; + default: puts ("hppa-hitachi-hiuxwe2"); break; + } + } + else if (CPU_IS_HP_MC68K (cpu)) + puts ("m68k-hitachi-hiuxwe2"); + else puts ("unknown-hitachi-hiuxwe2"); + exit (0); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 + exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd + exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd + exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf + exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf + exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi + exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd + exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd + exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd + exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd + exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; + i*:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; + x86:Interix*:[345]*) + echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' + exit ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix + exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + *:GNU:*:*) + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; + arm*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + mips:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips + #undef mipsel + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mipsel + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips + #else + CPU= + #endif + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips64 + #undef mips64el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mips64el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips64 + #else + CPU= + #endif + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu + exit ;; + i*86:Linux:*:*) + # The BFD linker knows what the default object file format is, so + # first see if it will tell us. cd to the root directory to prevent + # problems with other programs or directories called `ld' in the path. + # Set LC_ALL=C to ensure ld outputs messages in English. + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ + | sed -ne '/supported targets:/!d + s/[ ][ ]*/ /g + s/.*supported targets: *// + s/ .*// + p'` + case "$ld_supported_targets" in + elf32-i386) + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + ;; + a.out-i386-linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit ;; + coff-i386) + echo "${UNAME_MACHINE}-pc-linux-gnucoff" + exit ;; + "") + # Either a pre-BFD a.out linker (linux-gnuoldld) or + # one that does not give us useful --help. + echo "${UNAME_MACHINE}-pc-linux-gnuoldld" + exit ;; + esac + # Determine whether the default compiler is a.out or elf + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include <features.h> + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 + LIBC=gnu + # else + LIBC=gnulibc1 + # endif + # else + LIBC=gnulibc1 + # endif + #else + #if defined(__INTEL_COMPILER) || defined(__PGI) + LIBC=gnu + #else + LIBC=gnuaout + #endif + #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`" + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit + } + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } + ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` + echo ${UNAME_MACHINE}-pc-isc$UNAME_REL + elif /bin/uname -X 2>/dev/null >/dev/null ; then + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + else + echo ${UNAME_MACHINE}-pc-sysv32 + fi + exit ;; + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i386. + echo i386-pc-msdosdjgpp + exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; + paragon:*:*:*) + echo i860-intel-osf1 + exit ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi + exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv + exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 + exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} + exit ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} + exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` + echo ${UNAME_MACHINE}-sni-sysv4 + else + echo ns32k-sni-sysv + fi + exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says <Ric...@cc...> + echo i586-unisys-sysv4 + exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes <he...@op...>. + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 + exit ;; + *:*:*:FTX*) + # From se...@sw.... + echo i860-stratus-sysv4 + exit ;; + i*86:VOS:*:*) + # From Pau...@st.... + echo ${UNAME_MACHINE}-stratus-vos + exit ;; + *:VOS:*:*) + # From Pau...@st.... + echo hppa1.1-stratus-vos + exit ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} + exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else + echo mips-unknown-sysv${UNAME_RELEASE} + fi + exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + exit ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "$cputype" = "386"; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 + exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 + exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; +esac + +#echo '(No uname command or uname output not recognized.)' 1>&2 +#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 + +eval $set_cc_for_build +cat >$dummy.c <<EOF +#ifdef _SEQUENT_ +# include <sys/types.h> +# include <sys/utsname.h> +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include <sys/param.h> + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (__arm) && defined (__acorn) && defined (__unix) + printf ("arm-acorn-riscix\n"); exit (0); +#endif + +#if defined (hp300) && !defined (hpux) + printf ("m68k-hp-bsd\n"); exit (0); +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); + +#endif + +#if defined (vax) +# if !defined (ultrix) +# include <sys/param.h> +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + +# Apollos put the system type in the environment. + +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } + +# Convex versions that predate uname can use getsysinfo(1) + +if [ -x /usr/convex/getsysinfo ] +then + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd + exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + c34*) + echo c34-convex-bsd + exit ;; + c38*) + echo c38-convex-bsd + exit ;; + c4*) + echo c4-convex-bsd + exit ;; + esac +fi + +cat >&2 <<EOF +$0: unable to guess system type + +This script, last modified $timestamp, has failed to recognize +the operating system you are using. It is advised that you +download the most up to date version of the config scripts from + + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess +and + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + +If the version you run ($0) is already up to date, please +send the following data and any information you think might be +pertinent to <con...@gn...> in order to provide the needed +information to handle your system. + +config.guess timestamp = $timestamp + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF + +exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: Property changes on: trunk/libs/SDL-1.2.13/build-scripts/config.guess ___________________________________________________________________ Added: svn:executable + * Added: trunk/libs/SDL-1.2.13/build-scripts/config.sub =================================================================== --- trunk/libs/SDL-1.2.13/build-scripts/config.sub (rev 0) +++ trunk/libs/SDL-1.2.13/build-scripts/config.sub 2008-08-05 23:03:26 UTC (rev 318) @@ -0,0 +1,1606 @@ +#! /bin/sh +# Configuration validation subroutine script. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + +timestamp='2006-01-02' + +# This file is (in principle) common to ALL GNU software. +# The presence of a machine in this file suggests that SOME GNU software +# can handle that machine. It does not imply ALL GNU software can. +# +# This file 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., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + + +# Please send patches to <con...@gn...>. Submit a context +# diff and a properly formatted ChangeLog entry. +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# Otherwise, we print the canonical config type on stdout and succeed. + +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. +# Each package is responsible for reporting which valid configurations +# it does not support. The user should be able to distinguish +# a failure to support a valid configuration from a meaningless +# configuration. + +# The goal of this file is to map all the various variations of a given +# machine specification into a single specification in the form: +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or in some cases, the newer four-part form: +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# It is wrong to echo any other type of specification. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to <con...@gn...>." + +version="\ +GNU config.sub ($timestamp) + +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit ;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; +esac + +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] + then os=`echo $1 | sed 's/.*-/-/'` + else os=; fi + ;; +esac + +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. + ;; + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis | -knuth | -cray) + os= + basic_machine=$1 + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + ;; + -windowsnt*) + os=`echo $os | sed -e 's/windowsnt/winnt/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; +esac + +# Decode aliases for certain CPU-COMPANY combinations. +case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64vr | mips64vrel \ + | mips64orion | mips64orionel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | mt \ + | msp430 \ + | ns16k | ns32k \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b \ + | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ + | we32k \ + | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | z8k) + basic_machine=$basic_machine-unknown + ;; + m32c) + basic_machine=$basic_machine-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12) + # Motorola 68HC11/12. + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; + ms1) + basic_machine=mt-unknown + ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ + | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa-* \ + | ymp-* \ + | z8k-*) + ;; + m32c-*) + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att + ;; + 3b*) + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | j90) + basic_machine=j90-cray + os=-unicos + ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16c) + basic_machine=cr16c-unknown + os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf ... [truncated message content] |
From: <sen...@us...> - 2008-08-05 22:50:45
|
Revision: 317 http://open2x.svn.sourceforge.net/open2x/?rev=317&view=rev Author: senquack Date: 2008-08-05 22:50:26 +0000 (Tue, 05 Aug 2008) Log Message: ----------- Added Paths: ----------- trunk/libs/SDL-1.2.13/docs/html/ trunk/libs/SDL-1.2.13/docs/html/audio.html trunk/libs/SDL-1.2.13/docs/html/cdrom.html trunk/libs/SDL-1.2.13/docs/html/event.html trunk/libs/SDL-1.2.13/docs/html/eventfunctions.html trunk/libs/SDL-1.2.13/docs/html/eventstructures.html trunk/libs/SDL-1.2.13/docs/html/general.html trunk/libs/SDL-1.2.13/docs/html/guide.html trunk/libs/SDL-1.2.13/docs/html/guideaboutsdldoc.html trunk/libs/SDL-1.2.13/docs/html/guideaudioexamples.html trunk/libs/SDL-1.2.13/docs/html/guidebasicsinit.html trunk/libs/SDL-1.2.13/docs/html/guidecdromexamples.html trunk/libs/SDL-1.2.13/docs/html/guidecredits.html trunk/libs/SDL-1.2.13/docs/html/guideeventexamples.html trunk/libs/SDL-1.2.13/docs/html/guideexamples.html trunk/libs/SDL-1.2.13/docs/html/guideinput.html trunk/libs/SDL-1.2.13/docs/html/guideinputkeyboard.html trunk/libs/SDL-1.2.13/docs/html/guidepreface.html trunk/libs/SDL-1.2.13/docs/html/guidethebasics.html trunk/libs/SDL-1.2.13/docs/html/guidetimeexamples.html trunk/libs/SDL-1.2.13/docs/html/guidevideo.html trunk/libs/SDL-1.2.13/docs/html/guidevideoopengl.html trunk/libs/SDL-1.2.13/docs/html/index.html trunk/libs/SDL-1.2.13/docs/html/joystick.html trunk/libs/SDL-1.2.13/docs/html/reference.html trunk/libs/SDL-1.2.13/docs/html/sdlactiveevent.html trunk/libs/SDL-1.2.13/docs/html/sdladdtimer.html trunk/libs/SDL-1.2.13/docs/html/sdlaudiocvt.html trunk/libs/SDL-1.2.13/docs/html/sdlaudiospec.html trunk/libs/SDL-1.2.13/docs/html/sdlblitsurface.html trunk/libs/SDL-1.2.13/docs/html/sdlbuildaudiocvt.html trunk/libs/SDL-1.2.13/docs/html/sdlcd.html trunk/libs/SDL-1.2.13/docs/html/sdlcdclose.html trunk/libs/SDL-1.2.13/docs/html/sdlcdeject.html trunk/libs/SDL-1.2.13/docs/html/sdlcdname.html trunk/libs/SDL-1.2.13/docs/html/sdlcdnumdrives.html trunk/libs/SDL-1.2.13/docs/html/sdlcdopen.html trunk/libs/SDL-1.2.13/docs/html/sdlcdpause.html trunk/libs/SDL-1.2.13/docs/html/sdlcdplay.html trunk/libs/SDL-1.2.13/docs/html/sdlcdplaytracks.html trunk/libs/SDL-1.2.13/docs/html/sdlcdresume.html trunk/libs/SDL-1.2.13/docs/html/sdlcdstatus.html trunk/libs/SDL-1.2.13/docs/html/sdlcdstop.html trunk/libs/SDL-1.2.13/docs/html/sdlcdtrack.html trunk/libs/SDL-1.2.13/docs/html/sdlcloseaudio.html trunk/libs/SDL-1.2.13/docs/html/sdlcolor.html trunk/libs/SDL-1.2.13/docs/html/sdlcondbroadcast.html trunk/libs/SDL-1.2.13/docs/html/sdlcondsignal.html trunk/libs/SDL-1.2.13/docs/html/sdlcondwait.html trunk/libs/SDL-1.2.13/docs/html/sdlcondwaittimeout.html trunk/libs/SDL-1.2.13/docs/html/sdlconvertaudio.html trunk/libs/SDL-1.2.13/docs/html/sdlconvertsurface.html trunk/libs/SDL-1.2.13/docs/html/sdlcreatecond.html trunk/libs/SDL-1.2.13/docs/html/sdlcreatecursor.html trunk/libs/SDL-1.2.13/docs/html/sdlcreatemutex.html trunk/libs/SDL-1.2.13/docs/html/sdlcreatergbsurface.html trunk/libs/SDL-1.2.13/docs/html/sdlcreatergbsurfacefrom.html trunk/libs/SDL-1.2.13/docs/html/sdlcreatesemaphore.html trunk/libs/SDL-1.2.13/docs/html/sdlcreatethread.html trunk/libs/SDL-1.2.13/docs/html/sdlcreateyuvoverlay.html trunk/libs/SDL-1.2.13/docs/html/sdldelay.html trunk/libs/SDL-1.2.13/docs/html/sdldestroycond.html trunk/libs/SDL-1.2.13/docs/html/sdldestroymutex.html trunk/libs/SDL-1.2.13/docs/html/sdldestroysemaphore.html trunk/libs/SDL-1.2.13/docs/html/sdldisplayformat.html trunk/libs/SDL-1.2.13/docs/html/sdldisplayformatalpha.html trunk/libs/SDL-1.2.13/docs/html/sdldisplayyuvoverlay.html trunk/libs/SDL-1.2.13/docs/html/sdlenablekeyrepeat.html trunk/libs/SDL-1.2.13/docs/html/sdlenableunicode.html trunk/libs/SDL-1.2.13/docs/html/sdlenvvars.html trunk/libs/SDL-1.2.13/docs/html/sdlevent.html trunk/libs/SDL-1.2.13/docs/html/sdleventstate.html trunk/libs/SDL-1.2.13/docs/html/sdlexposeevent.html trunk/libs/SDL-1.2.13/docs/html/sdlfillrect.html trunk/libs/SDL-1.2.13/docs/html/sdlflip.html trunk/libs/SDL-1.2.13/docs/html/sdlfreecursor.html trunk/libs/SDL-1.2.13/docs/html/sdlfreesurface.html trunk/libs/SDL-1.2.13/docs/html/sdlfreewav.html trunk/libs/SDL-1.2.13/docs/html/sdlfreeyuvoverlay.html trunk/libs/SDL-1.2.13/docs/html/sdlgetappstate.html trunk/libs/SDL-1.2.13/docs/html/sdlgetaudiostatus.html trunk/libs/SDL-1.2.13/docs/html/sdlgetcliprect.html trunk/libs/SDL-1.2.13/docs/html/sdlgetcursor.html trunk/libs/SDL-1.2.13/docs/html/sdlgeterror.html trunk/libs/SDL-1.2.13/docs/html/sdlgeteventfilter.html trunk/libs/SDL-1.2.13/docs/html/sdlgetgammaramp.html trunk/libs/SDL-1.2.13/docs/html/sdlgetkeyname.html trunk/libs/SDL-1.2.13/docs/html/sdlgetkeystate.html trunk/libs/SDL-1.2.13/docs/html/sdlgetmodstate.html trunk/libs/SDL-1.2.13/docs/html/sdlgetmousestate.html trunk/libs/SDL-1.2.13/docs/html/sdlgetrelativemousestate.html trunk/libs/SDL-1.2.13/docs/html/sdlgetrgb.html trunk/libs/SDL-1.2.13/docs/html/sdlgetrgba.html trunk/libs/SDL-1.2.13/docs/html/sdlgetthreadid.html trunk/libs/SDL-1.2.13/docs/html/sdlgetticks.html trunk/libs/SDL-1.2.13/docs/html/sdlgetvideoinfo.html trunk/libs/SDL-1.2.13/docs/html/sdlgetvideosurface.html trunk/libs/SDL-1.2.13/docs/html/sdlglattr.html trunk/libs/SDL-1.2.13/docs/html/sdlglgetattribute.html trunk/libs/SDL-1.2.13/docs/html/sdlglgetprocaddress.html trunk/libs/SDL-1.2.13/docs/html/sdlglloadlibrary.html trunk/libs/SDL-1.2.13/docs/html/sdlglsetattribute.html trunk/libs/SDL-1.2.13/docs/html/sdlglswapbuffers.html trunk/libs/SDL-1.2.13/docs/html/sdlinit.html trunk/libs/SDL-1.2.13/docs/html/sdlinitsubsystem.html trunk/libs/SDL-1.2.13/docs/html/sdljoyaxisevent.html trunk/libs/SDL-1.2.13/docs/html/sdljoyballevent.html trunk/libs/SDL-1.2.13/docs/html/sdljoybuttonevent.html trunk/libs/SDL-1.2.13/docs/html/sdljoyhatevent.html trunk/libs/SDL-1.2.13/docs/html/sdljoystickclose.html trunk/libs/SDL-1.2.13/docs/html/sdljoystickeventstate.html trunk/libs/SDL-1.2.13/docs/html/sdljoystickgetaxis.html trunk/libs/SDL-1.2.13/docs/html/sdljoystickgetball.html trunk/libs/SDL-1.2.13/docs/html/sdljoystickgetbutton.html trunk/libs/SDL-1.2.13/docs/html/sdljoystickgethat.html trunk/libs/SDL-1.2.13/docs/html/sdljoystickindex.html trunk/libs/SDL-1.2.13/docs/html/sdljoystickname.html trunk/libs/SDL-1.2.13/docs/html/sdljoysticknumaxes.html trunk/libs/SDL-1.2.13/docs/html/sdljoysticknumballs.html trunk/libs/SDL-1.2.13/docs/html/sdljoysticknumbuttons.html trunk/libs/SDL-1.2.13/docs/html/sdljoysticknumhats.html trunk/libs/SDL-1.2.13/docs/html/sdljoystickopen.html trunk/libs/SDL-1.2.13/docs/html/sdljoystickopened.html trunk/libs/SDL-1.2.13/docs/html/sdljoystickupdate.html trunk/libs/SDL-1.2.13/docs/html/sdlkey.html trunk/libs/SDL-1.2.13/docs/html/sdlkeyboardevent.html trunk/libs/SDL-1.2.13/docs/html/sdlkeysym.html trunk/libs/SDL-1.2.13/docs/html/sdlkillthread.html trunk/libs/SDL-1.2.13/docs/html/sdllistmodes.html trunk/libs/SDL-1.2.13/docs/html/sdlloadbmp.html trunk/libs/SDL-1.2.13/docs/html/sdlloadwav.html trunk/libs/SDL-1.2.13/docs/html/sdllockaudio.html trunk/libs/SDL-1.2.13/docs/html/sdllocksurface.html trunk/libs/SDL-1.2.13/docs/html/sdllockyuvoverlay.html trunk/libs/SDL-1.2.13/docs/html/sdlmaprgb.html trunk/libs/SDL-1.2.13/docs/html/sdlmaprgba.html trunk/libs/SDL-1.2.13/docs/html/sdlmixaudio.html trunk/libs/SDL-1.2.13/docs/html/sdlmousebuttonevent.html trunk/libs/SDL-1.2.13/docs/html/sdlmousemotionevent.html trunk/libs/SDL-1.2.13/docs/html/sdlmutexp.html trunk/libs/SDL-1.2.13/docs/html/sdlmutexv.html trunk/libs/SDL-1.2.13/docs/html/sdlnumjoysticks.html trunk/libs/SDL-1.2.13/docs/html/sdlopenaudio.html trunk/libs/SDL-1.2.13/docs/html/sdloverlay.html trunk/libs/SDL-1.2.13/docs/html/sdlpalette.html trunk/libs/SDL-1.2.13/docs/html/sdlpauseaudio.html trunk/libs/SDL-1.2.13/docs/html/sdlpeepevents.html trunk/libs/SDL-1.2.13/docs/html/sdlpixelformat.html trunk/libs/SDL-1.2.13/docs/html/sdlpollevent.html trunk/libs/SDL-1.2.13/docs/html/sdlpumpevents.html trunk/libs/SDL-1.2.13/docs/html/sdlpushevent.html trunk/libs/SDL-1.2.13/docs/html/sdlquit.html trunk/libs/SDL-1.2.13/docs/html/sdlquitevent.html trunk/libs/SDL-1.2.13/docs/html/sdlquitsubsystem.html trunk/libs/SDL-1.2.13/docs/html/sdlrect.html trunk/libs/SDL-1.2.13/docs/html/sdlremovetimer.html trunk/libs/SDL-1.2.13/docs/html/sdlresizeevent.html trunk/libs/SDL-1.2.13/docs/html/sdlsavebmp.html trunk/libs/SDL-1.2.13/docs/html/sdlsempost.html trunk/libs/SDL-1.2.13/docs/html/sdlsemtrywait.html trunk/libs/SDL-1.2.13/docs/html/sdlsemvalue.html trunk/libs/SDL-1.2.13/docs/html/sdlsemwait.html trunk/libs/SDL-1.2.13/docs/html/sdlsemwaittimeout.html trunk/libs/SDL-1.2.13/docs/html/sdlsetalpha.html trunk/libs/SDL-1.2.13/docs/html/sdlsetcliprect.html trunk/libs/SDL-1.2.13/docs/html/sdlsetcolorkey.html trunk/libs/SDL-1.2.13/docs/html/sdlsetcolors.html trunk/libs/SDL-1.2.13/docs/html/sdlsetcursor.html trunk/libs/SDL-1.2.13/docs/html/sdlseteventfilter.html trunk/libs/SDL-1.2.13/docs/html/sdlsetgamma.html trunk/libs/SDL-1.2.13/docs/html/sdlsetgammaramp.html trunk/libs/SDL-1.2.13/docs/html/sdlsetmodstate.html trunk/libs/SDL-1.2.13/docs/html/sdlsetpalette.html trunk/libs/SDL-1.2.13/docs/html/sdlsettimer.html trunk/libs/SDL-1.2.13/docs/html/sdlsetvideomode.html trunk/libs/SDL-1.2.13/docs/html/sdlshowcursor.html trunk/libs/SDL-1.2.13/docs/html/sdlsurface.html trunk/libs/SDL-1.2.13/docs/html/sdlsyswmevent.html trunk/libs/SDL-1.2.13/docs/html/sdlthreadid.html trunk/libs/SDL-1.2.13/docs/html/sdlunlockaudio.html trunk/libs/SDL-1.2.13/docs/html/sdlunlocksurface.html trunk/libs/SDL-1.2.13/docs/html/sdlunlockyuvoverlay.html trunk/libs/SDL-1.2.13/docs/html/sdlupdaterect.html trunk/libs/SDL-1.2.13/docs/html/sdlupdaterects.html trunk/libs/SDL-1.2.13/docs/html/sdluserevent.html trunk/libs/SDL-1.2.13/docs/html/sdlvideodrivername.html trunk/libs/SDL-1.2.13/docs/html/sdlvideoinfo.html trunk/libs/SDL-1.2.13/docs/html/sdlvideomodeok.html trunk/libs/SDL-1.2.13/docs/html/sdlwaitevent.html trunk/libs/SDL-1.2.13/docs/html/sdlwaitthread.html trunk/libs/SDL-1.2.13/docs/html/sdlwarpmouse.html trunk/libs/SDL-1.2.13/docs/html/sdlwasinit.html trunk/libs/SDL-1.2.13/docs/html/sdlwmgetcaption.html trunk/libs/SDL-1.2.13/docs/html/sdlwmgrabinput.html trunk/libs/SDL-1.2.13/docs/html/sdlwmiconifywindow.html trunk/libs/SDL-1.2.13/docs/html/sdlwmsetcaption.html trunk/libs/SDL-1.2.13/docs/html/sdlwmseticon.html trunk/libs/SDL-1.2.13/docs/html/sdlwmtogglefullscreen.html trunk/libs/SDL-1.2.13/docs/html/thread.html trunk/libs/SDL-1.2.13/docs/html/time.html trunk/libs/SDL-1.2.13/docs/html/video.html trunk/libs/SDL-1.2.13/docs/html/wm.html trunk/libs/SDL-1.2.13/docs/images/ trunk/libs/SDL-1.2.13/docs/images/rainbow.gif trunk/libs/SDL-1.2.13/docs/index.html trunk/libs/SDL-1.2.13/docs/man3/ trunk/libs/SDL-1.2.13/docs/man3/SDLKey.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_ActiveEvent.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_AddTimer.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_AudioCVT.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_AudioSpec.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_BlitSurface.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_BuildAudioCVT.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_CD.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_CDClose.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_CDEject.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_CDName.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_CDNumDrives.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_CDOpen.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_CDPause.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_CDPlay.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_CDPlayTracks.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_CDResume.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_CDStatus.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_CDStop.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_CDtrack.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_CloseAudio.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_Color.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_CondBroadcast.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_CondSignal.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_CondWait.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_CondWaitTimeout.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_ConvertAudio.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_ConvertSurface.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_CreateCond.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_CreateCursor.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_CreateMutex.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_CreateRGBSurface.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_CreateRGBSurfaceFrom.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_CreateSemaphore.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_CreateThread.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_CreateYUVOverlay.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_Delay.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_DestroyCond.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_DestroyMutex.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_DestroySemaphore.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_DisplayFormat.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_DisplayFormatAlpha.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_DisplayYUVOverlay.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_EnableKeyRepeat.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_EnableUNICODE.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_Event.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_EventState.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_ExposeEvent.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_FillRect.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_Flip.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_FreeCursor.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_FreeSurface.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_FreeWAV.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_FreeYUVOverlay.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_GL_GetAttribute.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_GL_GetProcAddress.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_GL_LoadLibrary.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_GL_SetAttribute.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_GL_SwapBuffers.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_GLattr.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_GetAppState.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_GetAudioStatus.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_GetClipRect.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_GetCursor.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_GetError.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_GetEventFilter.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_GetGamma.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_GetGammaRamp.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_GetKeyName.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_GetKeyState.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_GetModState.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_GetMouseState.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_GetRGB.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_GetRGBA.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_GetRelativeMouseState.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_GetThreadID.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_GetTicks.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_GetVideoInfo.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_GetVideoSurface.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_Init.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_InitSubSystem.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_JoyAxisEvent.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_JoyBallEvent.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_JoyButtonEvent.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_JoyHatEvent.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_JoystickClose.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_JoystickEventState.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_JoystickGetAxis.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_JoystickGetBall.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_JoystickGetButton.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_JoystickGetHat.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_JoystickIndex.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_JoystickName.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_JoystickNumAxes.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_JoystickNumBalls.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_JoystickNumButtons.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_JoystickNumHats.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_JoystickOpen.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_JoystickOpened.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_JoystickUpdate.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_KeyboardEvent.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_KillThread.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_ListModes.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_LoadBMP.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_LoadWAV.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_LockAudio.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_LockSurface.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_LockYUVOverlay.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_MapRGB.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_MapRGBA.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_MixAudio.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_MouseButtonEvent.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_MouseMotionEvent.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_NumJoysticks.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_OpenAudio.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_Overlay.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_Palette.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_PauseAudio.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_PeepEvents.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_PixelFormat.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_PollEvent.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_PumpEvents.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_PushEvent.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_Quit.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_QuitEvent.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_QuitSubSystem.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_RWFromFile.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_Rect.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_RemoveTimer.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_ResizeEvent.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_SaveBMP.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_SemPost.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_SemTryWait.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_SemValue.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_SemWait.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_SemWaitTimeout.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_SetAlpha.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_SetClipRect.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_SetColorKey.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_SetColors.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_SetCursor.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_SetEventFilter.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_SetGamma.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_SetGammaRamp.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_SetModState.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_SetPalette.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_SetTimer.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_SetVideoMode.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_ShowCursor.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_Surface.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_SysWMEvent.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_ThreadID.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_UnlockAudio.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_UnlockSurface.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_UnlockYUVOverlay.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_UpdateRect.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_UpdateRects.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_UserEvent.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_VideoDriverName.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_VideoInfo.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_VideoModeOK.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_WM_GetCaption.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_WM_GrabInput.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_WM_IconifyWindow.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_WM_SetCaption.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_WM_SetIcon.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_WM_ToggleFullScreen.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_WaitEvent.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_WaitThread.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_WarpMouse.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_WasInit.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_keysym.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_mutexP.3 trunk/libs/SDL-1.2.13/docs/man3/SDL_mutexV.3 Added: trunk/libs/SDL-1.2.13/docs/html/audio.html =================================================================== --- trunk/libs/SDL-1.2.13/docs/html/audio.html (rev 0) +++ trunk/libs/SDL-1.2.13/docs/html/audio.html 2008-08-05 22:50:26 UTC (rev 317) @@ -0,0 +1,242 @@ +<HTML +><HEAD +><TITLE +>Audio</TITLE +><META +NAME="GENERATOR" +CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+ +"><LINK +REL="HOME" +TITLE="SDL Library Documentation" +HREF="index.html"><LINK +REL="UP" +TITLE="SDL Reference" +HREF="reference.html"><LINK +REL="PREVIOUS" +TITLE="SDL_JoystickClose" +HREF="sdljoystickclose.html"><LINK +REL="NEXT" +TITLE="SDL_AudioSpec" +HREF="sdlaudiospec.html"><META +NAME="KEYWORD" +CONTENT="audio"><META +NAME="KEYWORD" +CONTENT="function"></HEAD +><BODY +CLASS="CHAPTER" +BGCOLOR="#FFF8DC" +TEXT="#000000" +LINK="#0000ee" +VLINK="#551a8b" +ALINK="#ff0000" +><DIV +CLASS="NAVHEADER" +><TABLE +SUMMARY="Header navigation table" +WIDTH="100%" +BORDER="0" +CELLPADDING="0" +CELLSPACING="0" +><TR +><TH +COLSPAN="3" +ALIGN="center" +>SDL Library Documentation</TH +></TR +><TR +><TD +WIDTH="10%" +ALIGN="left" +VALIGN="bottom" +><A +HREF="sdljoystickclose.html" +ACCESSKEY="P" +>Prev</A +></TD +><TD +WIDTH="80%" +ALIGN="center" +VALIGN="bottom" +></TD +><TD +WIDTH="10%" +ALIGN="right" +VALIGN="bottom" +><A +HREF="sdlaudiospec.html" +ACCESSKEY="N" +>Next</A +></TD +></TR +></TABLE +><HR +ALIGN="LEFT" +WIDTH="100%"></DIV +><DIV +CLASS="CHAPTER" +><H1 +><A +NAME="AUDIO" +></A +>Chapter 10. Audio</H1 +><DIV +CLASS="TOC" +><DL +><DT +><B +>Table of Contents</B +></DT +><DT +><A +HREF="sdlaudiospec.html" +>SDL_AudioSpec</A +> -- Audio Specification Structure</DT +><DT +><A +HREF="sdlopenaudio.html" +>SDL_OpenAudio</A +> -- Opens the audio device with the desired parameters.</DT +><DT +><A +HREF="sdlpauseaudio.html" +>SDL_PauseAudio</A +> -- Pauses and unpauses the audio callback processing</DT +><DT +><A +HREF="sdlgetaudiostatus.html" +>SDL_GetAudioStatus</A +> -- Get the current audio state</DT +><DT +><A +HREF="sdlloadwav.html" +>SDL_LoadWAV</A +> -- Load a WAVE file</DT +><DT +><A +HREF="sdlfreewav.html" +>SDL_FreeWAV</A +> -- Frees previously opened WAV data</DT +><DT +><A +HREF="sdlaudiocvt.html" +>SDL_AudioCVT</A +> -- Audio Conversion Structure</DT +><DT +><A +HREF="sdlbuildaudiocvt.html" +>SDL_BuildAudioCVT</A +> -- Initializes a SDL_AudioCVT structure for conversion</DT +><DT +><A +HREF="sdlconvertaudio.html" +>SDL_ConvertAudio</A +> -- Convert audio data to a desired audio format.</DT +><DT +><A +HREF="sdlmixaudio.html" +>SDL_MixAudio</A +> -- Mix audio data</DT +><DT +><A +HREF="sdllockaudio.html" +>SDL_LockAudio</A +> -- Lock out the callback function</DT +><DT +><A +HREF="sdlunlockaudio.html" +>SDL_UnlockAudio</A +> -- Unlock the callback function</DT +><DT +><A +HREF="sdlcloseaudio.html" +>SDL_CloseAudio</A +> -- Shuts down audio processing and closes the audio device.</DT +></DL +></DIV +><P +>Sound on the computer is translated from waves that you hear into a series of +values, or samples, each representing the amplitude of the wave. When these +samples are sent in a stream to a sound card, an approximation of the original +wave can be recreated. The more bits used to represent the amplitude, and the +greater frequency these samples are gathered, the closer the approximated +sound is to the original, and the better the quality of sound.</P +><P +>This library supports both 8 and 16 bit signed and unsigned sound samples, +at frequencies ranging from 11025 Hz to 44100 Hz, depending on the +underlying hardware. If the hardware doesn't support the desired audio +format or frequency, it can be emulated if desired (See +<A +HREF="sdlopenaudio.html" +><TT +CLASS="FUNCTION" +>SDL_OpenAudio()</TT +></A +>)</P +><P +>A commonly supported audio format is 16 bits per sample at 22050 Hz.</P +></DIV +><DIV +CLASS="NAVFOOTER" +><HR +ALIGN="LEFT" +WIDTH="100%"><TABLE +SUMMARY="Footer navigation table" +WIDTH="100%" +BORDER="0" +CELLPADDING="0" +CELLSPACING="0" +><TR +><TD +WIDTH="33%" +ALIGN="left" +VALIGN="top" +><A +HREF="sdljoystickclose.html" +ACCESSKEY="P" +>Prev</A +></TD +><TD +WIDTH="34%" +ALIGN="center" +VALIGN="top" +><A +HREF="index.html" +ACCESSKEY="H" +>Home</A +></TD +><TD +WIDTH="33%" +ALIGN="right" +VALIGN="top" +><A +HREF="sdlaudiospec.html" +ACCESSKEY="N" +>Next</A +></TD +></TR +><TR +><TD +WIDTH="33%" +ALIGN="left" +VALIGN="top" +>SDL_JoystickClose</TD +><TD +WIDTH="34%" +ALIGN="center" +VALIGN="top" +><A +HREF="reference.html" +ACCESSKEY="U" +>Up</A +></TD +><TD +WIDTH="33%" +ALIGN="right" +VALIGN="top" +>SDL_AudioSpec</TD +></TR +></TABLE +></DIV +></BODY +></HTML +> \ No newline at end of file Added: trunk/libs/SDL-1.2.13/docs/html/cdrom.html =================================================================== --- trunk/libs/SDL-1.2.13/docs/html/cdrom.html (rev 0) +++ trunk/libs/SDL-1.2.13/docs/html/cdrom.html 2008-08-05 22:50:26 UTC (rev 317) @@ -0,0 +1,260 @@ +<HTML +><HEAD +><TITLE +>CD-ROM</TITLE +><META +NAME="GENERATOR" +CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+ +"><LINK +REL="HOME" +TITLE="SDL Library Documentation" +HREF="index.html"><LINK +REL="UP" +TITLE="SDL Reference" +HREF="reference.html"><LINK +REL="PREVIOUS" +TITLE="SDL_CloseAudio" +HREF="sdlcloseaudio.html"><LINK +REL="NEXT" +TITLE="SDL_CDNumDrives" +HREF="sdlcdnumdrives.html"><META +NAME="KEYWORD" +CONTENT="cdrom"><META +NAME="KEYWORD" +CONTENT="function"></HEAD +><BODY +CLASS="CHAPTER" +BGCOLOR="#FFF8DC" +TEXT="#000000" +LINK="#0000ee" +VLINK="#551a8b" +ALINK="#ff0000" +><DIV +CLASS="NAVHEADER" +><TABLE +SUMMARY="Header navigation table" +WIDTH="100%" +BORDER="0" +CELLPADDING="0" +CELLSPACING="0" +><TR +><TH +COLSPAN="3" +ALIGN="center" +>SDL Library Documentation</TH +></TR +><TR +><TD +WIDTH="10%" +ALIGN="left" +VALIGN="bottom" +><A +HREF="sdlcloseaudio.html" +ACCESSKEY="P" +>Prev</A +></TD +><TD +WIDTH="80%" +ALIGN="center" +VALIGN="bottom" +></TD +><TD +WIDTH="10%" +ALIGN="right" +VALIGN="bottom" +><A +HREF="sdlcdnumdrives.html" +ACCESSKEY="N" +>Next</A +></TD +></TR +></TABLE +><HR +ALIGN="LEFT" +WIDTH="100%"></DIV +><DIV +CLASS="CHAPTER" +><H1 +><A +NAME="CDROM" +></A +>Chapter 11. CD-ROM</H1 +><DIV +CLASS="TOC" +><DL +><DT +><B +>Table of Contents</B +></DT +><DT +><A +HREF="sdlcdnumdrives.html" +>SDL_CDNumDrives</A +> -- Returns the number of CD-ROM drives on the system.</DT +><DT +><A +HREF="sdlcdname.html" +>SDL_CDName</A +> -- Returns a human-readable, system-dependent identifier for the CD-ROM.</DT +><DT +><A +HREF="sdlcdopen.html" +>SDL_CDOpen</A +> -- Opens a CD-ROM drive for access.</DT +><DT +><A +HREF="sdlcdstatus.html" +>SDL_CDStatus</A +> -- Returns the current status of the given drive.</DT +><DT +><A +HREF="sdlcdplay.html" +>SDL_CDPlay</A +> -- Play a CD</DT +><DT +><A +HREF="sdlcdplaytracks.html" +>SDL_CDPlayTracks</A +> -- Play the given CD track(s)</DT +><DT +><A +HREF="sdlcdpause.html" +>SDL_CDPause</A +> -- Pauses a CDROM</DT +><DT +><A +HREF="sdlcdresume.html" +>SDL_CDResume</A +> -- Resumes a CDROM</DT +><DT +><A +HREF="sdlcdstop.html" +>SDL_CDStop</A +> -- Stops a CDROM</DT +><DT +><A +HREF="sdlcdeject.html" +>SDL_CDEject</A +> -- Ejects a CDROM</DT +><DT +><A +HREF="sdlcdclose.html" +>SDL_CDClose</A +> -- Closes a SDL_CD handle</DT +><DT +><A +HREF="sdlcd.html" +>SDL_CD</A +> -- CDROM Drive Information</DT +><DT +><A +HREF="sdlcdtrack.html" +>SDL_CDtrack</A +> -- CD Track Information Structure</DT +></DL +></DIV +><P +>SDL supports audio control of up to 32 local CD-ROM drives at once.</P +><P +>You use this API to perform all the basic functions of a CD player, +including listing the tracks, playing, stopping, and ejecting the CD-ROM. +(Currently, multi-changer CD drives are not supported.)</P +><P +>Before you call any of the SDL CD-ROM functions, you must first call +"<TT +CLASS="FUNCTION" +>SDL_Init(SDL_INIT_CDROM)</TT +>", which scans the system for +CD-ROM drives, and sets the program up for audio control. Check the +return code, which should be <SPAN +CLASS="RETURNVALUE" +>0</SPAN +>, to see if there +were any errors in starting up.</P +><P +>After you have initialized the library, you can find out how many drives +are available using the <TT +CLASS="FUNCTION" +>SDL_CDNumDrives()</TT +> function. +The first drive listed is the system default CD-ROM drive. After you have +chosen a drive, and have opened it with <TT +CLASS="FUNCTION" +>SDL_CDOpen()</TT +>, +you can check the status and start playing if there's a CD in the drive.</P +><P +>A CD-ROM is organized into one or more tracks, each consisting of a certain +number of "frames". Each frame is ~2K in size, and at normal playing speed, +a CD plays 75 frames per second. SDL works with the number of frames on a +CD, but this can easily be converted to the more familiar minutes/seconds +format by using the <TT +CLASS="FUNCTION" +>FRAMES_TO_MSF()</TT +> macro.</P +></DIV +><DIV +CLASS="NAVFOOTER" +><HR +ALIGN="LEFT" +WIDTH="100%"><TABLE +SUMMARY="Footer navigation table" +WIDTH="100%" +BORDER="0" +CELLPADDING="0" +CELLSPACING="0" +><TR +><TD +WIDTH="33%" +ALIGN="left" +VALIGN="top" +><A +HREF="sdlcloseaudio.html" +ACCESSKEY="P" +>Prev</A +></TD +><TD +WIDTH="34%" +ALIGN="center" +VALIGN="top" +><A +HREF="index.html" +ACCESSKEY="H" +>Home</A +></TD +><TD +WIDTH="33%" +ALIGN="right" +VALIGN="top" +><A +HREF="sdlcdnumdrives.html" +ACCESSKEY="N" +>Next</A +></TD +></TR +><TR +><TD +WIDTH="33%" +ALIGN="left" +VALIGN="top" +>SDL_CloseAudio</TD +><TD +WIDTH="34%" +ALIGN="center" +VALIGN="top" +><A +HREF="reference.html" +ACCESSKEY="U" +>Up</A +></TD +><TD +WIDTH="33%" +ALIGN="right" +VALIGN="top" +>SDL_CDNumDrives</TD +></TR +></TABLE +></DIV +></BODY +></HTML +> \ No newline at end of file Added: trunk/libs/SDL-1.2.13/docs/html/event.html =================================================================== --- trunk/libs/SDL-1.2.13/docs/html/event.html (rev 0) +++ trunk/libs/SDL-1.2.13/docs/html/event.html 2008-08-05 22:50:26 UTC (rev 317) @@ -0,0 +1,216 @@ +<HTML +><HEAD +><TITLE +>Events</TITLE +><META +NAME="GENERATOR" +CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+ +"><LINK +REL="HOME" +TITLE="SDL Library Documentation" +HREF="index.html"><LINK +REL="UP" +TITLE="SDL Reference" +HREF="reference.html"><LINK +REL="PREVIOUS" +TITLE="SDL_WM_GrabInput" +HREF="sdlwmgrabinput.html"><LINK +REL="NEXT" +TITLE="SDL Event Structures." +HREF="eventstructures.html"><META +NAME="KEYWORD" +CONTENT="events"><META +NAME="KEYWORD" +CONTENT="function"></HEAD +><BODY +CLASS="CHAPTER" +BGCOLOR="#FFF8DC" +TEXT="#000000" +LINK="#0000ee" +VLINK="#551a8b" +ALINK="#ff0000" +><DIV +CLASS="NAVHEADER" +><TABLE +SUMMARY="Header navigation table" +WIDTH="100%" +BORDER="0" +CELLPADDING="0" +CELLSPACING="0" +><TR +><TH +COLSPAN="3" +ALIGN="center" +>SDL Library Documentation</TH +></TR +><TR +><TD +WIDTH="10%" +ALIGN="left" +VALIGN="bottom" +><A +HREF="sdlwmgrabinput.html" +ACCESSKEY="P" +>Prev</A +></TD +><TD +WIDTH="80%" +ALIGN="center" +VALIGN="bottom" +></TD +><TD +WIDTH="10%" +ALIGN="right" +VALIGN="bottom" +><A +HREF="eventstructures.html" +ACCESSKEY="N" +>Next</A +></TD +></TR +></TABLE +><HR +ALIGN="LEFT" +WIDTH="100%"></DIV +><DIV +CLASS="CHAPTER" +><H1 +><A +NAME="EVENT" +></A +>Chapter 8. Events</H1 +><DIV +CLASS="TOC" +><DL +><DT +><B +>Table of Contents</B +></DT +><DT +><A +HREF="event.html#AEN3691" +>Introduction</A +></DT +><DT +><A +HREF="eventstructures.html" +>SDL Event Structures.</A +></DT +><DT +><A +HREF="eventfunctions.html" +>Event Functions.</A +></DT +></DL +></DIV +><DIV +CLASS="SECT1" +><H1 +CLASS="SECT1" +><A +NAME="AEN3691" +></A +>Introduction</H1 +><P +>Event handling allows your application to receive input from the user. Event handling is initalised (along with video) with a call to: +<PRE +CLASS="PROGRAMLISTING" +>SDL_Init(SDL_INIT_VIDEO);</PRE +> +Internally, SDL stores all the events waiting to be handled in an event queue. Using functions like <A +HREF="sdlpollevent.html" +><TT +CLASS="FUNCTION" +>SDL_PollEvent</TT +></A +> and <A +HREF="sdlpeepevents.html" +><TT +CLASS="FUNCTION" +>SDL_PeepEvents</TT +></A +> you can observe and handle waiting input events.</P +><P +>The key to event handling in SDL is the <A +HREF="sdlevent.html" +><SPAN +CLASS="STRUCTNAME" +>SDL_Event</SPAN +></A +> union. The event queue itself is composed of a series of <SPAN +CLASS="STRUCTNAME" +>SDL_Event</SPAN +> unions, one for each waiting event. <SPAN +CLASS="STRUCTNAME" +>SDL_Event</SPAN +> unions are read from the queue with the <TT +CLASS="FUNCTION" +>SDL_PollEvent</TT +> function and it is then up to the application to process the information stored with them.</P +></DIV +></DIV +><DIV +CLASS="NAVFOOTER" +><HR +ALIGN="LEFT" +WIDTH="100%"><TABLE +SUMMARY="Footer navigation table" +WIDTH="100%" +BORDER="0" +CELLPADDING="0" +CELLSPACING="0" +><TR +><TD +WIDTH="33%" +ALIGN="left" +VALIGN="top" +><A +HREF="sdlwmgrabinput.html" +ACCESSKEY="P" +>Prev</A +></TD +><TD +WIDTH="34%" +ALIGN="center" +VALIGN="top" +><A +HREF="index.html" +ACCESSKEY="H" +>Home</A +></TD +><TD +WIDTH="33%" +ALIGN="right" +VALIGN="top" +><A +HREF="eventstructures.html" +ACCESSKEY="N" +>Next</A +></TD +></TR +><TR +><TD +WIDTH="33%" +ALIGN="left" +VALIGN="top" +>SDL_WM_GrabInput</TD +><TD +WIDTH="34%" +ALIGN="center" +VALIGN="top" +><A +HREF="reference.html" +ACCESSKEY="U" +>Up</A +></TD +><TD +WIDTH="33%" +ALIGN="right" +VALIGN="top" +>SDL Event Structures.</TD +></TR +></TABLE +></DIV +></BODY +></HTML +> \ No newline at end of file Added: trunk/libs/SDL-1.2.13/docs/html/eventfunctions.html =================================================================== --- trunk/libs/SDL-1.2.13/docs/html/eventfunctions.html (rev 0) +++ trunk/libs/SDL-1.2.13/docs/html/eventfunctions.html 2008-08-05 22:50:26 UTC (rev 317) @@ -0,0 +1,481 @@ +<HTML +><HEAD +><TITLE +>Event Functions.</TITLE +><META +NAME="GENERATOR" +CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+ +"><LINK +REL="HOME" +TITLE="SDL Library Documentation" +HREF="index.html"><LINK +REL="UP" +TITLE="Events" +HREF="event.html"><LINK +REL="PREVIOUS" +TITLE="SDLKey" +HREF="sdlkey.html"><LINK +REL="NEXT" +TITLE="SDL_PumpEvents" +HREF="sdlpumpevents.html"></HEAD +><BODY +CLASS="SECT1" +BGCOLOR="#FFF8DC" +TEXT="#000000" +LINK="#0000ee" +VLINK="#551a8b" +ALINK="#ff0000" +><DIV +CLASS="NAVHEADER" +><TABLE +SUMMARY="Header navigation table" +WIDTH="100%" +BORDER="0" +CELLPADDING="0" +CELLSPACING="0" +><TR +><TH +COLSPAN="3" +ALIGN="center" +>SDL Library Documentation</TH +></TR +><TR +><TD +WIDTH="10%" +ALIGN="left" +VALIGN="bottom" +><A +HREF="sdlkey.html" +ACCESSKEY="P" +>Prev</A +></TD +><TD +WIDTH="80%" +ALIGN="center" +VALIGN="bottom" +>Chapter 8. Events</TD +><TD +WIDTH="10%" +ALIGN="right" +VALIGN="bottom" +><A +HREF="sdlpumpevents.html" +ACCESSKEY="N" +>Next</A +></TD +></TR +></TABLE +><HR +ALIGN="LEFT" +WIDTH="100%"></DIV +><DIV +CLASS="SECT1" +><H1 +CLASS="SECT1" +><A +NAME="EVENTFUNCTIONS" +></A +>Event Functions.</H1 +><DIV +CLASS="TOC" +><DL +><DT +><B +>Table of Contents</B +></DT +><DT +><A +HREF="sdlpumpevents.html" +>SDL_PumpEvents</A +> -- Pumps the event loop, gathering events from the input devices.</DT +><DT +><A +HREF="sdlpeepevents.html" +>SDL_PeepEvents</A +> -- Checks the event queue for messages and optionally returns them.</DT +><DT +><A +HREF="sdlpollevent.html" +>SDL_PollEvent</A +> -- Polls for currently pending events.</DT +><DT +><A +HREF="sdlwaitevent.html" +>SDL_WaitEvent</A +> -- Waits indefinitely for the next available event.</DT +><DT +><A +HREF="sdlpushevent.html" +>SDL_PushEvent</A +> -- Pushes an event onto the event queue</DT +><DT +><A +HREF="sdlseteventfilter.html" +>SDL_SetEventFilter</A +> -- Sets up a filter to process all events before they are posted +to the event queue.</DT +><DT +><A +HREF="sdlgeteventfilter.html" +>SDL_GetEventFilter</A +> -- Retrieves a pointer to he event filter</DT +><DT +><A +HREF="sdleventstate.html" +>SDL_EventState</A +> -- This function allows you to set the state of processing certain events.</DT +><DT +><A +HREF="sdlgetkeystate.html" +>SDL_GetKeyState</A +> -- Get a snapshot of the current keyboard state</DT +><DT +><A +HREF="sdlgetmodstate.html" +>SDL_GetModState</A +> -- Get the state of modifier keys.</DT +><DT +><A +HREF="sdlsetmodstate.html" +>SDL_SetModState</A +> -- Set the current key modifier state</DT +><DT +><A +HREF="sdlgetkeyname.html" +>SDL_GetKeyName</A +> -- Get the name of an SDL virtual keysym</DT +><DT +><A +HREF="sdlenableunicode.html" +>SDL_EnableUNICODE</A +> -- Enable UNICODE translation</DT +><DT +><A +HREF="sdlenablekeyrepeat.html" +>SDL_EnableKeyRepeat</A +> -- Set keyboard repeat rate.</DT +><DT +><A +HREF="sdlgetmousestate.html" +>SDL_GetMouseState</A +> -- Retrieve the current state of the mouse</DT +><DT +><A +HREF="sdlgetrelativemousestate.html" +>SDL_GetRelativeMouseState</A +> -- Retrieve the current state of the mouse</DT +><DT +><A +HREF="sdlgetappstate.html" +>SDL_GetAppState</A +> -- Get the state of the application</DT +><DT +><A +HREF="sdljoystickeventstate.html" +>SDL_JoystickEventState</A +> -- Enable/disable joystick event polling</DT +></DL +></DIV +><DIV +CLASS="INFORMALTABLE" +><A +NAME="AEN5312" +></A +><P +></P +><TABLE +BORDER="0" +CLASS="CALSTABLE" +><TBODY +><TR +><TD +ALIGN="LEFT" +VALIGN="TOP" +><A +HREF="sdlpumpevents.html" +>SDL_PumpEvents</A +></TD +><TD +ALIGN="LEFT" +VALIGN="TOP" +>Pumps the event loop, gathering events from the input devices</TD +></TR +><TR +><TD +ALIGN="LEFT" +VALIGN="TOP" +><A +HREF="sdlpeepevents.html" +>SDL_PeepEvents</A +></TD +><TD +ALIGN="LEFT" +VALIGN="TOP" +>Checks the event queue for messages and optionally returns them</TD +></TR +><TR +><TD +ALIGN="LEFT" +VALIGN="TOP" +><A +HREF="sdlpollevent.html" +>SDL_PollEvent</A +></TD +><TD +ALIGN="LEFT" +VALIGN="TOP" +>Polls for currently pending events</TD +></TR +><TR +><TD +ALIGN="LEFT" +VALIGN="TOP" +><A +HREF="sdlwaitevent.html" +>SDL_WaitEvent</A +></TD +><TD +ALIGN="LEFT" +VALIGN="TOP" +>Waits indefinitely for the next available event</TD +></TR +><TR +><TD +ALIGN="LEFT" +VALIGN="TOP" +><A +HREF="sdlpushevent.html" +>SDL_PushEvent</A +></TD +><TD +ALIGN="LEFT" +VALIGN="TOP" +>Pushes an event onto the event queue</TD +></TR +><TR +><TD +ALIGN="LEFT" +VALIGN="TOP" +><A +HREF="sdlseteventfilter.html" +>SDL_SetEventFilter</A +></TD +><TD +ALIGN="LEFT" +VALIGN="TOP" +>Sets up a filter to process all events</TD +></TR +><TR +><TD +ALIGN="LEFT" +VALIGN="TOP" +><A +HREF="sdleventstate.html" +>SDL_EventState</A +></TD +><TD +ALIGN="LEFT" +VALIGN="TOP" +>Allows you to set the state of processing certain events</TD +></TR +><TR +><TD +ALIGN="LEFT" +VALIGN="TOP" +><A +HREF="sdlgetkeystate.html" +>SDL_GetKeyState</A +></TD +><TD +ALIGN="LEFT" +VALIGN="TOP" +>Get a snapshot of the current keyboard state</TD +></TR +><TR +><TD +ALIGN="LEFT" +VALIGN="TOP" +><A +HREF="sdlgetmodstate.html" +>SDL_GetModState</A +></TD +><TD +ALIGN="LEFT" +VALIGN="TOP" +>Get the state of modifier keys</TD +></TR +><TR +><TD +ALIGN="LEFT" +VALIGN="TOP" +><A +HREF="sdlsetmodstate.html" +>SDL_SetModState</A +></TD +><TD +ALIGN="LEFT" +VALIGN="TOP" +>Set the state of modifier keys</TD +></TR +><TR +><TD +ALIGN="LEFT" +VALIGN="TOP" +><A +HREF="sdlgetkeyname.html" +>SDL_GetKeyName</A +></TD +><TD +ALIGN="LEFT" +VALIGN="TOP" +>Get the name of an SDL virtual keysym</TD +></TR +><TR +><TD +ALIGN="LEFT" +VALIGN="TOP" +><A +HREF="sdlenableunicode.html" +>SDL_EnableUNICODE</A +></TD +><TD +ALIGN="LEFT" +VALIGN="TOP" +>Enable UNICODE translation</TD +></TR +><TR +><TD +ALIGN="LEFT" +VALIGN="TOP" +><A +HREF="sdlenablekeyrepeat.html" +>SDL_EnableKeyRepeat</A +></TD +><TD +ALIGN="LEFT" +VALIGN="TOP" +>Set keyboard repeat rate</TD +></TR +><TR +><TD +ALIGN="LEFT" +VALIGN="TOP" +><A +HREF="sdlgetmousestate.html" +>SDL_GetMouseState</A +></TD +><TD +ALIGN="LEFT" +VALIGN="TOP" +>Retrieve the current state of the mouse</TD +></TR +><TR +><TD +ALIGN="LEFT" +VALIGN="TOP" +><A +HREF="sdlgetrelativemousestate.html" +>SDL_GetRelativeMouseState</A +></TD +><TD +ALIGN="LEFT" +VALIGN="TOP" +>Retrieve the current state of the mouse</TD +></TR +><TR +><TD +ALIGN="LEFT" +VALIGN="TOP" +><A +HREF="sdlgetappstate.html" +>SDL_GetAppState</A +></TD +><TD +ALIGN="LEFT" +VALIGN="TOP" +>Get the state of the application</TD +></TR +><TR +><TD +ALIGN="LEFT" +VALIGN="TOP" +><A +HREF="sdljoystickeventstate.html" +>SDL_JoystickEventState</A +></TD +><TD +ALIGN="LEFT" +VALIGN="TOP" +>Enable/disable joystick event polling</TD +></TR +></TBODY +></TABLE +><P +></P +></DIV +></DIV +><DIV +CLASS="NAVFOOTER" +><HR +ALIGN="LEFT" +WIDTH="100%"><TABLE +SUMMARY="Footer navigation table" +WIDTH="100%" +BORDER="0" +CELLPADDING="0" +CELLSPACING="0" +><TR +><TD +WIDTH="33%" +ALIGN="left" +VALIGN="top" +><A +HREF="sdlkey.html" +ACCESSKEY="P" +>Prev</A +></TD +><TD +WIDTH="34%" +ALIGN="center" +VALIGN="top" +><A +HREF="index.html" +ACCESSKEY="H" +>Home</A +></TD +><TD +WIDTH="33%" +ALIGN="right" +VALIGN="top" +><A +HREF="sdlpumpevents.html" +ACCESSKEY="N" +>Next</A +></TD +></TR +><TR +><TD +WIDTH="33%" +ALIGN="left" +VALIGN="top" +>SDLKey</TD +><TD +WIDTH="34%" +ALIGN="center" +VALIGN="top" +><A +HREF="event.html" +ACCESSKEY="U" +>Up</A +></TD +><TD +WIDTH="33%" +ALIGN="right" +VALIGN="top" +>SDL_PumpEvents</TD +></TR +></TABLE +></DIV +></BODY +></HTML +> \ No newline at end of file Added: trunk/libs/SDL-1.2.13/docs/html/eventstructures.html =================================================================== --- trunk/libs/SDL-1.2.13/docs/html/eventstructures.html (rev 0) +++ trunk/libs/SDL-1.2.13/docs/html/eventstructures.html 2008-08-05 22:50:26 UTC (rev 317) @@ -0,0 +1,233 @@ +<HTML +><HEAD +><TITLE +>SDL Event Structures.</TITLE +><META +NAME="GENERATOR" +CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+ +"><LINK +REL="HOME" +TITLE="SDL Library Documentation" +HREF="index.html"><LINK +REL="UP" +TITLE="Events" +HREF="event.html"><LINK +REL="PREVIOUS" +TITLE="Events" +HREF="event.html"><LINK +REL="NEXT" +TITLE="SDL_Event" +HREF="sdlevent.html"></HEAD +><BODY +CLASS="SECT1" +BGCOLOR="#FFF8DC" +TEXT="#000000" +LINK="#0000ee" +VLINK="#551a8b" +ALINK="#ff0000" +><DIV +CLASS="NAVHEADER" +><TABLE +SUMMARY="Header navigation table" +WIDTH="100%" +BORDER="0" +CELLPADDING="0" +CELLSPACING="0" +><TR +><TH +COLSPAN="3" +ALIGN="center" +>SDL Library Documentation</TH +></TR +><TR +><TD +WIDTH="10%" +ALIGN="left" +VALIGN="bottom" +><A +HREF="event.html" +ACCESSKEY="P" +>Prev</A +></TD +><TD +WIDTH="80%" +ALIGN="center" +VALIGN="bottom" +>Chapter 8. Events</TD +><TD +WIDTH="10%" +ALIGN="right" +VALIGN="bottom" +><A +HREF="sdlevent.html" +ACCESSKEY="N" +>Next</A +></TD +></TR +></TABLE +><HR +ALIGN="LEFT" +WIDTH="100%"></DIV +><DIV +CLASS="SECT1" +><H1 +CLASS="SECT1" +><A +NAME="EVENTSTRUCTURES" +></A +>SDL Event Structures.</H1 +><DIV +CLASS="TOC" +><DL +><DT +><B +>Table of Contents</B +></DT +><DT +><A +HREF="sdlevent.html" +>SDL_Event</A +> -- General event structure</DT +><DT +><A +HREF="sdlactiveevent.html" +>SDL_ActiveEvent</A +> -- Application visibility event structure</DT +><DT +><A +HREF="sdlkeyboardevent.html" +>SDL_KeyboardEvent</A +> -- Keyboard event structure</DT +><DT +><A +HREF="sdlmousemotionevent.html" +>SDL_MouseMotionEvent</A +> -- Mouse motion event structure</DT +><DT +><A +HREF="sdlmousebuttonevent.html" +>SDL_MouseButtonEvent</A +> -- Mouse button event structure</DT +><DT +><A +HREF="sdljoyaxisevent.html" +>SDL_JoyAxisEvent</A +> -- Joystick axis motion event structure</DT +><DT +><A +HREF="sdljoybuttonevent.html" +>SDL_JoyButtonEvent</A +> -- Joystick button event structure</DT +><DT +><A +HREF="sdljoyhatevent.html" +>SDL_JoyHatEvent</A +> -- Joystick hat position change event structure</DT +><DT +><A +HREF="sdljoyballevent.html" +>SDL_JoyBallEvent</A +> -- Joystick trackball motion event structure</DT +><DT +><A +HREF="sdlresizeevent.html" +>SDL_ResizeEvent</A +> -- Window resize event structure</DT +><DT +><A +HREF="sdlexposeevent.html" +>SDL_ExposeEvent</A +> -- Quit requested event</DT +><DT +><A +HREF="sdlsyswmevent.html" +>SDL_SysWMEvent</A +> -- Platform-dependent window manager event.</DT +><DT +><A +HREF="sdluserevent.html" +>SDL_UserEvent</A +> -- A user-defined event type</DT +><DT +><A +HREF="sdlquitevent.html" +>SDL_QuitEvent</A +> -- Quit requested event</DT +><DT +><A +HREF="sdlkeysym.html" +>SDL_keysym</A +> -- Keysym structure</DT +><DT +><A +HREF="sdlkey.html" +>SDLKey</A +> -- Keysym definitions.</DT +></DL +></DIV +></DIV +><DIV +CLASS="NAVFOOTER" +><HR +ALIGN="LEFT" +WIDTH="100%"><TABLE +SUMMARY="Footer navigation table" +WIDTH="100%" +BORDER="0" +CELLPADDING="0" +CELLSPACING="0" +><TR +><TD +WIDTH="33%" +ALIGN="left" +VALIGN="top" +><A +HREF="event.html" +ACCESSKEY="P" +>Prev</A +></TD +><TD +WIDTH="34%" +ALIGN="center" +VALIGN="top" +><A +HREF="index.html" +ACCESSKEY="H" +>Home</A +></TD +><TD +WIDTH="33%" +ALIGN="right" +VALIGN="top" +><A +HREF="sdlevent.html" +ACCESSKEY="N" +>Next</A +></TD +></TR +><TR +><TD +WIDTH="33%" +ALIGN="left" +VALIGN="top" +>Events</TD +><TD +WIDTH="34%" +ALIGN="center" +VALIGN="top" +><A +HREF="event.html" +ACCESSKEY="U" +>Up</A +></TD +><TD +WIDTH="33%" +ALIGN="right" +VALIGN="top" +>SDL_Event</TD +></TR +></TABLE +></DIV +></BODY +></HTML +> \ No newline at end of file Added: trunk/libs/SDL-1.2.13/docs/html/general.html =================================================================== --- trunk/libs/SDL-1.2.13/docs/html/general.html (rev 0) +++ trunk/libs/SDL-1.2.13/docs/html/general.html 2008-08-05 22:50:26 UTC (rev 317) @@ -0,0 +1,225 @@ +<HTML +><HEAD +><TITLE +>General</TITLE +><META +NAME="GENERATOR" +CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+ +"><LINK +REL="HOME" +TITLE="SDL Library Documentation" +HREF="index.html"><LINK +REL="UP" +TITLE="SDL Reference" +HREF="reference.html"><LINK +REL="PREVIOUS" +TITLE="SDL Reference" +HREF="reference.html"><LINK +REL="NEXT" +TITLE="SDL_Init" +HREF="sdlinit.html"><META +NAME="KEYWORD" +CONTENT="general"><META +NAME="KEYWORD" +CONTENT="function"></HEAD +><BODY +CLASS="CHAPTER" +BGCOLOR="#FFF8DC" +TEXT="#000000" +LINK="#0000ee" +VLINK="#551a8b" +ALINK="#ff0000" +><DIV +CLASS="NAVHEADER" +><TABLE +SUMMARY="Header navigation table" +WIDTH="100%" +BORDER="0" +CELLPADDING="0" +CELLSPACING="0" +><TR +><TH +COLSPAN="3" +ALIGN="center" +>SDL Library Documentation</TH +></TR +><TR +><TD +WIDTH="10%" +ALIGN="left" +VALIGN="bottom" +><A +HREF="reference.html" +ACCESSKEY="P" +>Prev</A +></TD +><TD +WIDTH="80%" +ALIGN="center" +VALIGN="bottom" +></TD +><TD +WIDTH="10%" +ALIGN="right" +VALIGN="bottom" +><A +HREF="sdlinit.html" +ACCESSKEY="N" +>Next</A +></TD +></TR +></TABLE +><HR +ALIGN="LEFT" +WIDTH="100%"></DIV +><DIV +CLASS="CHAPTER" +><H1 +><A +NAME="GENERAL" +></A +>Chapter 5. General</H1 +><DIV +CLASS="TOC" +><DL +><DT +><B +>Table of Contents</B +></DT +><DT +><A +HREF="sdlinit.html" +>SDL_Init</A +> -- Initializes SDL</DT +><DT +><A +HREF="sdlinitsubsystem.html" +>SDL_InitSubSystem</A +> -- Initialize subsystems</DT +><DT +><A +HREF="sdlquitsubsystem.html" +>SDL_QuitSubSystem</A +> -- Shut down a subsystem</DT +><DT +><A +HREF="sdlquit.html" +>SDL_Quit</A +> -- Shut down SDL</DT +><DT +><A +HREF="sdlwasinit.html" +>SDL_WasInit</A +> -- Check which subsystems are initialized</DT +><DT +><A +HREF="sdlgeterror.html" +>SDL_GetError</A +> -- Get SDL error string</DT +><DT +><A +HREF="sdlenvvars.html" +>SDL_envvars</A +> -- SDL environment variables</DT +></DL +></DIV +><P +>Before SDL can be used in a program it must be initialized with <A +HREF="sdlinit.html" +><TT +CLASS="FUNCTION" +>SDL_Init</TT +></A +>. <TT +CLASS="FUNCTION" +>SDL_Init</TT +> initializes all the subsystems that the user requests (video, audio, joystick, timers and/or cdrom). Once SDL is initialized with <TT +CLASS="FUNCTION" +>SDL_Init</TT +> subsystems can be shut down and initialized as needed using <A +HREF="sdlinitsubsystem.html" +><TT +CLASS="FUNCTION" +>SDL_InitSubSystem</TT +></A +> and <A +HREF="sdlquitsubsystem.html" +><TT +CLASS="FUNCTION" +>SDL_QuitSubSystem</TT +></A +>.</P +><P +>SDL must also be shut down before the program exits to make sure it cleans up correctly. Calling <A +HREF="sdlquit.html" +><TT +CLASS="FUNCTION" +>SDL_Quit</TT +></A +> shuts down all subsystems and frees any resources allocated to SDL.</P +></DIV +><DIV +CLASS="NAVFOOTER" +><HR +ALIGN="LEFT" +WIDTH="100%"><TABLE +SUMMARY="Footer navigation table" +WIDTH="100%" +BORDER="0" +CELLPADDING="0" +CELLSPACING="0" +><TR +><TD +WIDTH="33%" +ALIGN="left" +VALIGN="top" +><A +HREF="reference.html" +ACCESSKEY="P" +>Prev</A +></TD +><TD +WIDTH="34%" +ALIGN="center" +VALIGN="top" +><A +HREF="index.html" +ACCESSKEY="H" +>Home</A +></TD +><TD +WIDTH="33%" +ALIGN="right" +VALIGN="top" +><A +HREF="sdlinit.html" +ACCESSKEY="N" +>Next</A +></TD +></TR +><TR +><TD +WIDTH="33%" +ALIGN="left" +VALIGN="top" +>SDL Reference</TD +><TD +WIDTH="34%" +ALIGN="center" +VALIGN="top" +><A +HREF="reference.html" +ACCESSKEY="U" +>Up</A +></TD +><TD +WIDTH="33%" +ALIGN="right" +VALIGN="top" +>SDL_Init</TD +></TR +></TABLE +></DIV +></BODY +></HTML +> \ No newline at end of file Added: trunk/libs/SDL-1.2.13/docs/html/guide.html =================================================================== --- trunk/libs/SDL-1.2.13/docs/html/guide.html (rev 0) +++ trunk/libs/SDL-1.2.13/docs/html/guide.html 2008-08-05 22:50:26 UTC (rev 317) @@ -0,0 +1,174 @@ +<HTML +><HEAD +><TITLE +>SDL Guide</TITLE +><META +NAME="GENERATOR" +CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+ +"><LINK +REL="HOME" +TITLE="SDL Library Documentation" +HREF="index.html"><LINK +REL="PREVIOUS" +TITLE="SDL Library Documentation" +HREF="index.html"><LINK +REL="NEXT" +TITLE="Preface" +HREF="guidepreface.html"></HEAD +><BODY +CLASS="PART" +BGCOLOR="#FFF8DC" +TEXT="#000000" +LINK="#0000ee" +VLINK="#551a8b" +ALINK="#ff0000" +><DIV +CLASS="NAVHEADER" +><TABLE +SUMMARY="Header navigation table" +WIDTH="100%" +BORDER="0" +CELLPADDING="0" +CELLSPACING="0" +><TR +><TH +COLSPAN="3" +ALIGN="center" +>SDL Library Documentation</TH +></TR +><TR +><TD +WIDTH="10%" +ALIGN="left" +VALIGN="bottom" +><A +HREF="index.html" +ACCESSKEY="P" +>Prev</A +></TD +><TD +WIDTH="80%" +ALIGN="center" +VALIGN="bottom" +></TD +><TD +WIDTH="10%" +ALIGN="right" +VALIGN="bottom" +><A +HREF="guidepreface.html" +ACCESSKEY="N" +>Next</A +></TD +></TR +></TABLE +><HR +ALIGN="LEFT" +WIDTH="100%"></DIV +><DIV +CLASS="PART" +><A +NAME="GUIDE" +></A +><DIV +CLASS="TITLEPAGE" +><H1 +CLASS="TITLE" +>I. SDL Guide</H1 +><DIV +CLASS="TOC" +><DL +><DT +><B +>Table of Contents</B +></DT +><DT +><A +HREF="guidepreface.html" +>Preface</A +></DT +><DT +>1. <A +HREF="guidethebasics.html" +>The Basics</A +></DT +><DT +>2. <A +HREF="guidevideo.html" +>Graphics and Video</A +></DT +><DT +>3. <A +HREF="guideinput.html" +>Input handling</A +></DT +><DT +>4. <A +HREF="guideexamples.html" +>Examples</A +></DT +></DL +></DIV +></DIV +></DIV +><DIV +CLASS="NAVFOOTER" +><HR +ALIGN="LEFT" +WIDTH="100%"><TABLE +SUMMARY="Footer navigation table" +WIDTH="100%" +BORDER="0" +CELLPADDING="0" +CELLSPACING="0" +><TR +><TD +WIDTH="33%" +ALIGN="left" +VALIGN="top" +><A +HREF="index.html" +ACCESSKEY="P" +>Prev</A +></TD +><TD +WIDTH="34%" +ALIGN="center" +VALIGN="top" +><A +HREF="index.html" +ACCESSKEY="H" +>Home</A +></TD +><TD +WIDTH="33%" +ALIGN="right" +VALIGN="top" +><A +HREF="guidepreface.html" +ACCESSKEY="N" +>Next</A +></TD +></TR +><TR +><TD +WIDTH="33%" +ALIGN="left" +VALIGN="top" +>SDL Library Documentation</TD +><TD +WIDTH="34%" +ALIGN="center" +VALIGN="top" +> </TD +><TD +WIDTH="33%" +ALIGN="right" +VALIGN="top" +>Preface</TD +></TR +></TABLE +></DIV +></BODY +></HTML +> \ No newline at end of file Added: trunk/libs/SDL-1.2.13/docs/html/guideaboutsdldoc.html =================================================================== --- trunk/libs/SDL-1.2.13/docs/html/guideaboutsdldoc.html (rev 0) +++ trunk/libs/SDL-1.2.13/docs/html/guideaboutsdldoc.html 2008-08-05 22:50:26 UTC (rev 317) @@ -0,0 +1,148 @@ +<HTML +><HEAD +><TITLE +>About SDLdoc</TITLE +><META +NAME="GENERATOR" +CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+ +"><LINK +REL="HOME" +TITLE="SDL Library Documentation" +HREF="index.html"><LINK +REL="UP" +TITLE="Preface" +HREF="guidepreface.html"><LINK +REL="PREVIOUS" +TITLE="Preface" +HREF="guidepreface.html"><LINK +REL="NEXT" +TITLE="Credits" +HREF="guidecredits.html"></HEAD +><BODY +CLASS="SECT1" +BGCOLOR="#FFF8DC" +TEXT="#000000" +LINK="#0000ee" +VLINK="#551a8b" +ALINK="#ff0000" +><DIV +CLASS="NAVHEADER" +><TABLE +SUMMARY="Header navigation table" +WIDTH="100%" +BORDER="0" +CELLPADDING="0" +CELLSPACING="0" +><TR +><TH +COLSPAN="3" +ALIGN="center" +>SDL Library Documentation</TH +></TR +><TR +><TD +WIDTH="10%" +ALIGN="left" +VALIGN="bottom" +><A +HREF="guidepreface.html" +ACCESSKEY="P" +>Prev</A +></TD +><TD +WIDTH="80%" +ALIGN="center" +VALIGN="bottom" +>Preface</TD +><TD +WIDTH="10%" +ALIGN="right" +VALIGN="bottom" +><A +HREF="guidecredits.html" +ACCESSKEY="N" +>Next</A +></TD +></TR +></TABLE +><HR +ALIGN="LEFT" +WIDTH="100%"></DIV +><DIV +CLASS="SECT1" +><H1 +CLASS="SECT1" +><A +NAME="GUIDEABOUTSDLDOC" +></A +>About SDLdoc</H1 +><P +>SDLdoc (The SDL Documentation Project) was formed to completely rewrite the SDL documentation and to keep it continually up to date. The team consists completely of volunteers ranging from people working with SDL in their spare time to people who use SDL in their everyday working lives.</P +><P +>The latest version of this documentation can always be found here: http://sdldoc.csn.ul.ie Downloadable PS, man pages and html tarballs are available at http://sdldoc.csn.ul.ie/pub/</P +></DIV +><DIV +CLASS="NAVFOOTER" +><HR +ALIGN="LEFT" +WIDTH="100%"><TABLE +SUMMARY="Footer navigation table" +WIDTH="100%" +BORDER="0" +CELLPADDING="0" +CELLSPACING="0" +><TR +><TD +WIDTH="33%" +ALIGN="left" +VALIGN="top" +><A +HREF="guidepreface.html" +ACCESSKEY="P" +>Prev</A +></TD +><TD +WIDTH="34%" +ALIGN="center" +VALIGN="top" +><A +HREF="index.html" +ACCESSKEY="H" +>Home</A +></TD +><TD +WIDTH="33%" +ALIGN="right" +VALIGN="top" +><A +HREF="guidecredits.html" +ACCESSKEY="N" +>Next</A +></TD +></TR +><TR +><TD +WIDTH="33%" +ALIGN="left" +VALIGN="top" +>Preface</TD +><TD +WIDTH="34%" +ALIGN="center" +VALIGN="top" +><A +HREF="guidepreface.html" +ACCESSKEY="U" +>Up</A +></TD +><TD +WIDTH="33%" +ALIGN="right" +VALIGN="top" +>Credits</TD +></TR +></TABLE +></DIV +></BODY +></HTML +> \ No newline at end of file Added: trunk/libs/SDL-1.2.13/docs/html/guideaudioexamples.html =================================================================== --- trunk/libs/SDL-1.2.13/docs/html/guideaudioexamples.html (rev 0) +++ trunk/libs/SDL-1.2.13/docs/html/guideaudioexamples.html 2008-08-05 22:50:26 UTC (rev 317) @@ -0,0 +1,228 @@ +<HTML +><HEAD +><TITLE +>Audio Examples</TITLE +><META +NAME="GENERATOR" +CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+ +"><LINK +REL="HOME" +TITLE="SDL Library Documentation" +HREF="index.html"><LINK +REL="UP" +TITLE="Examples" +HREF="guideexamples.html"><LINK +REL="PREVIOUS" +TITLE="Event Examples" +HREF="guideeventexamples.html"><LINK +REL="NEXT" +TITLE="CDROM Examples" +HREF="guidecdromexamples.html"></HEAD +><BODY +CLASS="SECT1" +BGCOLOR="#FFF8DC" +TEXT="#000000" +LINK="#0000ee" +VLINK="#551a8b" +ALINK="#ff0000" +><DIV +CLASS="NAVHEADER" +><TABLE +SUMMARY="Header navigation table" +WIDTH="100%" +BORDER="0" +CELLPADDING="0" +CELLSPACING="0" +><TR +><TH +COLSPAN="3" +ALIGN="center" +>SDL Library Documentation</TH +></TR +><TR +><TD +WIDTH="10%" +ALIGN="left" +VALIGN="bottom" +><A +HREF="guideeventexamples.html" +ACCESSKEY="P" +>Prev</A +></TD +><TD +WIDTH="80%" +ALIGN="center" +VALIGN="bottom" +>Chapter 4. Examples</TD +><TD +WIDTH="10%" +ALIGN="right" +VALIGN="bottom" +><A +HREF="guidecdromexamples.html" +ACCESSKEY="N" +>Next</A +></TD +></TR +></TABLE +><HR +ALIGN="LEFT" +WIDTH="100%"></DIV +><DIV +CLASS="SECT1" +><H1 +CLASS="SECT1" +><A +NAME="GUIDEAUDIOEXAMPLES" +></A +>Audio Examples</H1 +><P +></P +><DIV +CLASS="SECT2" +><H2 +CLASS="SECT2" +><A +NAME="AEN382" +></A +>Opening the audio device</H2 +><P +><PRE +CLASS="PROGRAMLISTING" +> SDL_AudioSpec wanted; + extern void fill_audio(void *udata, Uint8 *stream, int len); + + /* Set the audio format */ + wanted.freq = 22050; + wanted.format = AUDIO_S16; + wanted.channels = 2; /* 1 = mono, 2 = stereo */ + wanted.samples = 1024; /* Good low-latency value for callback */ + wanted.callback = fill_audio; + wanted.userdata = NULL; + + /* Open the audio device, forcing the desired format */ + if ( SDL_OpenAudio(&wanted, NULL) < 0 ) { + fprintf(stderr, "Couldn't open audio: %s\n", SDL_GetError()); + return(-1); + } + return(0);</PRE +></P +></DIV +><DIV +CLASS="SECT2" +><H2 +CLASS="SECT2" +><A +NAME="AEN386" +></A +>Playing audio</H2 +><P +><PRE +CLASS="PROGRAMLISTING" +> static Uint8 *audio_chunk; + static Uint32 audio_len; + static Uint8 *audio_pos; + + /* The audio function callback takes the following parameters: + stream: A pointer to the audio buffer to be filled + len: The length (in bytes) of the audio buffer + */ + void fill_audio(void *udata, Uint8 *stream, int len) + { + /* Only play if we have data left */ + if ( audio_len == 0 ) + return; + + /* Mix as much data as possible */ + len = ( len > audio_len ? audio_len : len ); + SDL_MixAudio(stream, audio_pos, len, SDL_MIX_MAXVOLUME); + audio_pos += len; + audio_len -= len; + } + + /* Load the audio data ... */ + + ;;;;; + + audio_pos = audio_chunk; + + /* Let the callback function play the audio chunk */ + SDL_PauseAudio(0); + + /* Do some processing */ + + ;;;;; + + /* Wait for sound to complete */ + while ( audio_len > 0 ) { + SDL_Delay(100); /* Sleep 1/10 second */ + } + SDL_CloseAudio();</PRE +></P +></DIV +></DIV +><DIV +CLASS="NAVFOOTER" +><HR +ALIGN="LEFT" +WIDTH="100%"><TABLE +SUMMARY="Footer navigation table" +WIDTH="100%" +BORDER="0" +CELLPADDING="0" +CELLSPACING="0" +><TR +><TD +WIDTH="33%" +ALIGN="left" +VALIGN="top" +><A +HREF="guideeventexamples.html" +ACCESSKEY="P" +>Prev</A +></TD +><TD +WIDTH="34%" +ALIGN="center" +VALIGN="top" +><A +HREF="index.html" +ACCESSKEY="H" +>Home</A +></TD +><TD +WIDTH="33%" +ALIGN="right" +VALIGN="top" +><A +HREF="guidecdromexamples.html" +ACCESSKEY="N" +>Next</A +></TD +></TR +><TR +><TD +WIDTH="33%" +ALIGN="left" +VALIGN="top" +>Event Examples</TD +><TD +WIDTH="34%" +ALIGN="center" +VALIGN="top" +><A +HREF="guideexamples.html" +ACCESSKEY="U" +>Up</A +></TD +><TD +WIDTH="33%" +ALIGN="right" +VALIGN="top" +>CDROM Examples</TD +></TR +></TABLE +></DIV +></BODY +></HTML +> \ No newline at end of file ... [truncated message content] |
From: <sen...@us...> - 2008-08-05 22:34:46
|
Revision: 316 http://open2x.svn.sourceforge.net/open2x/?rev=316&view=rev Author: senquack Date: 2008-08-05 22:34:52 +0000 (Tue, 05 Aug 2008) Log Message: ----------- Update Paeryn's 1.2.9 HW SDL to 1.2.13 Added Paths: ----------- trunk/libs/SDL-1.2.13/include/SDL.h trunk/libs/SDL-1.2.13/include/SDL_active.h trunk/libs/SDL-1.2.13/include/SDL_audio.h trunk/libs/SDL-1.2.13/include/SDL_byteorder.h trunk/libs/SDL-1.2.13/include/SDL_cdrom.h trunk/libs/SDL-1.2.13/include/SDL_config.h trunk/libs/SDL-1.2.13/include/SDL_config.h.default trunk/libs/SDL-1.2.13/include/SDL_config.h.in trunk/libs/SDL-1.2.13/include/SDL_config_dreamcast.h trunk/libs/SDL-1.2.13/include/SDL_config_macos.h trunk/libs/SDL-1.2.13/include/SDL_config_macosx.h trunk/libs/SDL-1.2.13/include/SDL_config_minimal.h trunk/libs/SDL-1.2.13/include/SDL_config_nds.h trunk/libs/SDL-1.2.13/include/SDL_config_os2.h trunk/libs/SDL-1.2.13/include/SDL_config_symbian.h trunk/libs/SDL-1.2.13/include/SDL_config_win32.h trunk/libs/SDL-1.2.13/include/SDL_copying.h trunk/libs/SDL-1.2.13/include/SDL_cpuinfo.h trunk/libs/SDL-1.2.13/include/SDL_endian.h trunk/libs/SDL-1.2.13/include/SDL_error.h trunk/libs/SDL-1.2.13/include/SDL_events.h trunk/libs/SDL-1.2.13/include/SDL_getenv.h trunk/libs/SDL-1.2.13/include/SDL_joystick.h trunk/libs/SDL-1.2.13/include/SDL_keyboard.h trunk/libs/SDL-1.2.13/include/SDL_keysym.h trunk/libs/SDL-1.2.13/include/SDL_loadso.h trunk/libs/SDL-1.2.13/include/SDL_main.h trunk/libs/SDL-1.2.13/include/SDL_mouse.h trunk/libs/SDL-1.2.13/include/SDL_mutex.h trunk/libs/SDL-1.2.13/include/SDL_name.h trunk/libs/SDL-1.2.13/include/SDL_opengl.h trunk/libs/SDL-1.2.13/include/SDL_platform.h trunk/libs/SDL-1.2.13/include/SDL_quit.h trunk/libs/SDL-1.2.13/include/SDL_rwops.h trunk/libs/SDL-1.2.13/include/SDL_stdinc.h trunk/libs/SDL-1.2.13/include/SDL_syswm.h trunk/libs/SDL-1.2.13/include/SDL_thread.h trunk/libs/SDL-1.2.13/include/SDL_timer.h trunk/libs/SDL-1.2.13/include/SDL_types.h trunk/libs/SDL-1.2.13/include/SDL_version.h trunk/libs/SDL-1.2.13/include/SDL_video.h trunk/libs/SDL-1.2.13/include/begin_code.h trunk/libs/SDL-1.2.13/include/close_code.h Added: trunk/libs/SDL-1.2.13/include/SDL.h =================================================================== --- trunk/libs/SDL-1.2.13/include/SDL.h (rev 0) +++ trunk/libs/SDL-1.2.13/include/SDL.h 2008-08-05 22:34:52 UTC (rev 316) @@ -0,0 +1,94 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + sl...@li... +*/ + +/* Main include header for the SDL library */ + +#ifndef _SDL_H +#define _SDL_H + +#include "SDL_main.h" +#include "SDL_stdinc.h" +#include "SDL_audio.h" +#include "SDL_cdrom.h" +#include "SDL_cpuinfo.h" +#include "SDL_endian.h" +#include "SDL_error.h" +#include "SDL_events.h" +#include "SDL_loadso.h" +#include "SDL_mutex.h" +#include "SDL_rwops.h" +#include "SDL_thread.h" +#include "SDL_timer.h" +#include "SDL_video.h" +#include "SDL_version.h" + +#include "begin_code.h" +/* Set up for C function definitions, even when using C++ */ +#ifdef __cplusplus +extern "C" { +#endif + +/* As of version 0.5, SDL is loaded dynamically into the application */ + +/* These are the flags which may be passed to SDL_Init() -- you should + specify the subsystems which you will be using in your application. +*/ +#define SDL_INIT_TIMER 0x00000001 +#define SDL_INIT_AUDIO 0x00000010 +#define SDL_INIT_VIDEO 0x00000020 +#define SDL_INIT_CDROM 0x00000100 +#define SDL_INIT_JOYSTICK 0x00000200 +#define SDL_INIT_NOPARACHUTE 0x00100000 /* Don't catch fatal signals */ +#define SDL_INIT_EVENTTHREAD 0x01000000 /* Not supported on all OS's */ +#define SDL_INIT_EVERYTHING 0x0000FFFF + +/* This function loads the SDL dynamically linked library and initializes + * the subsystems specified by 'flags' (and those satisfying dependencies) + * Unless the SDL_INIT_NOPARACHUTE flag is set, it will install cleanup + * signal handlers for some commonly ignored fatal signals (like SIGSEGV) + */ +extern DECLSPEC int SDLCALL SDL_Init(Uint32 flags); + +/* This function initializes specific SDL subsystems */ +extern DECLSPEC int SDLCALL SDL_InitSubSystem(Uint32 flags); + +/* This function cleans up specific SDL subsystems */ +extern DECLSPEC void SDLCALL SDL_QuitSubSystem(Uint32 flags); + +/* This function returns mask of the specified subsystems which have + been initialized. + If 'flags' is 0, it returns a mask of all initialized subsystems. +*/ +extern DECLSPEC Uint32 SDLCALL SDL_WasInit(Uint32 flags); + +/* This function cleans up all initialized subsystems and unloads the + * dynamically linked library. You should call it upon all exit conditions. + */ +extern DECLSPEC void SDLCALL SDL_Quit(void); + +/* Ends C function definitions when using C++ */ +#ifdef __cplusplus +} +#endif +#include "close_code.h" + +#endif /* _SDL_H */ Added: trunk/libs/SDL-1.2.13/include/SDL_active.h =================================================================== --- trunk/libs/SDL-1.2.13/include/SDL_active.h (rev 0) +++ trunk/libs/SDL-1.2.13/include/SDL_active.h 2008-08-05 22:34:52 UTC (rev 316) @@ -0,0 +1,58 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + sl...@li... +*/ + +/* Include file for SDL application focus event handling */ + +#ifndef _SDL_active_h +#define _SDL_active_h + +#include "SDL_stdinc.h" +#include "SDL_error.h" + +#include "begin_code.h" +/* Set up for C function definitions, even when using C++ */ +#ifdef __cplusplus +extern "C" { +#endif + +/* The available application states */ +#define SDL_APPMOUSEFOCUS 0x01 /* The app has mouse coverage */ +#define SDL_APPINPUTFOCUS 0x02 /* The app has input focus */ +#define SDL_APPACTIVE 0x04 /* The application is active */ + +/* Function prototypes */ +/* + * This function returns the current state of the application, which is a + * bitwise combination of SDL_APPMOUSEFOCUS, SDL_APPINPUTFOCUS, and + * SDL_APPACTIVE. If SDL_APPACTIVE is set, then the user is able to + * see your application, otherwise it has been iconified or disabled. + */ +extern DECLSPEC Uint8 SDLCALL SDL_GetAppState(void); + + +/* Ends C function definitions when using C++ */ +#ifdef __cplusplus +} +#endif +#include "close_code.h" + +#endif /* _SDL_active_h */ Added: trunk/libs/SDL-1.2.13/include/SDL_audio.h =================================================================== --- trunk/libs/SDL-1.2.13/include/SDL_audio.h (rev 0) +++ trunk/libs/SDL-1.2.13/include/SDL_audio.h 2008-08-05 22:34:52 UTC (rev 316) @@ -0,0 +1,253 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + sl...@li... +*/ + +/* Access to the raw audio mixing buffer for the SDL library */ + +#ifndef _SDL_audio_h +#define _SDL_audio_h + +#include "SDL_stdinc.h" +#include "SDL_error.h" +#include "SDL_endian.h" +#include "SDL_mutex.h" +#include "SDL_thread.h" +#include "SDL_rwops.h" + +#include "begin_code.h" +/* Set up for C function definitions, even when using C++ */ +#ifdef __cplusplus +extern "C" { +#endif + +/* The calculated values in this structure are calculated by SDL_OpenAudio() */ +typedef struct SDL_AudioSpec { + int freq; /* DSP frequency -- samples per second */ + Uint16 format; /* Audio data format */ + Uint8 channels; /* Number of channels: 1 mono, 2 stereo */ + Uint8 silence; /* Audio buffer silence value (calculated) */ + Uint16 samples; /* Audio buffer size in samples (power of 2) */ + Uint16 padding; /* Necessary for some compile environments */ + Uint32 size; /* Audio buffer size in bytes (calculated) */ + /* This function is called when the audio device needs more data. + 'stream' is a pointer to the audio data buffer + 'len' is the length of that buffer in bytes. + Once the callback returns, the buffer will no longer be valid. + Stereo samples are stored in a LRLRLR ordering. + */ + void (SDLCALL *callback)(void *userdata, Uint8 *stream, int len); + void *userdata; +} SDL_AudioSpec; + +/* Audio format flags (defaults to LSB byte order) */ +#define AUDIO_U8 0x0008 /* Unsigned 8-bit samples */ +#define AUDIO_S8 0x8008 /* Signed 8-bit samples */ +#define AUDIO_U16LSB 0x0010 /* Unsigned 16-bit samples */ +#define AUDIO_S16LSB 0x8010 /* Signed 16-bit samples */ +#define AUDIO_U16MSB 0x1010 /* As above, but big-endian byte order */ +#define AUDIO_S16MSB 0x9010 /* As above, but big-endian byte order */ +#define AUDIO_U16 AUDIO_U16LSB +#define AUDIO_S16 AUDIO_S16LSB + +/* Native audio byte ordering */ +#if SDL_BYTEORDER == SDL_LIL_ENDIAN +#define AUDIO_U16SYS AUDIO_U16LSB +#define AUDIO_S16SYS AUDIO_S16LSB +#else +#define AUDIO_U16SYS AUDIO_U16MSB +#define AUDIO_S16SYS AUDIO_S16MSB +#endif + + +/* A structure to hold a set of audio conversion filters and buffers */ +typedef struct SDL_AudioCVT { + int needed; /* Set to 1 if conversion possible */ + Uint16 src_format; /* Source audio format */ + Uint16 dst_format; /* Target audio format */ + double rate_incr; /* Rate conversion increment */ + Uint8 *buf; /* Buffer to hold entire audio data */ + int len; /* Length of original audio buffer */ + int len_cvt; /* Length of converted audio buffer */ + int len_mult; /* buffer must be len*len_mult big */ + double len_ratio; /* Given len, final size is len*len_ratio */ + void (SDLCALL *filters[10])(struct SDL_AudioCVT *cvt, Uint16 format); + int filter_index; /* Current audio conversion function */ +} SDL_AudioCVT; + + +/* Function prototypes */ + +/* These functions are used internally, and should not be used unless you + * have a specific need to specify the audio driver you want to use. + * You should normally use SDL_Init() or SDL_InitSubSystem(). + */ +extern DECLSPEC int SDLCALL SDL_AudioInit(const char *driver_name); +extern DECLSPEC void SDLCALL SDL_AudioQuit(void); + +/* This function fills the given character buffer with the name of the + * current audio driver, and returns a pointer to it if the audio driver has + * been initialized. It returns NULL if no driver has been initialized. + */ +extern DECLSPEC char * SDLCALL SDL_AudioDriverName(char *namebuf, int maxlen); + +/* + * This function opens the audio device with the desired parameters, and + * returns 0 if successful, placing the actual hardware parameters in the + * structure pointed to by 'obtained'. If 'obtained' is NULL, the audio + * data passed to the callback function will be guaranteed to be in the + * requested format, and will be automatically converted to the hardware + * audio format if necessary. This function returns -1 if it failed + * to open the audio device, or couldn't set up the audio thread. + * + * When filling in the desired audio spec structure, + * 'desired->freq' should be the desired audio frequency in samples-per-second. + * 'desired->format' should be the desired audio format. + * 'desired->samples' is the desired size of the audio buffer, in samples. + * This number should be a power of two, and may be adjusted by the audio + * driver to a value more suitable for the hardware. Good values seem to + * range between 512 and 8096 inclusive, depending on the application and + * CPU speed. Smaller values yield faster response time, but can lead + * to underflow if the application is doing heavy processing and cannot + * fill the audio buffer in time. A stereo sample consists of both right + * and left channels in LR ordering. + * Note that the number of samples is directly related to time by the + * following formula: ms = (samples*1000)/freq + * 'desired->size' is the size in bytes of the audio buffer, and is + * calculated by SDL_OpenAudio(). + * 'desired->silence' is the value used to set the buffer to silence, + * and is calculated by SDL_OpenAudio(). + * 'desired->callback' should be set to a function that will be called + * when the audio device is ready for more data. It is passed a pointer + * to the audio buffer, and the length in bytes of the audio buffer. + * This function usually runs in a separate thread, and so you should + * protect data structures that it accesses by calling SDL_LockAudio() + * and SDL_UnlockAudio() in your code. + * 'desired->userdata' is passed as the first parameter to your callback + * function. + * + * The audio device starts out playing silence when it's opened, and should + * be enabled for playing by calling SDL_PauseAudio(0) when you are ready + * for your audio callback function to be called. Since the audio driver + * may modify the requested size of the audio buffer, you should allocate + * any local mixing buffers after you open the audio device. + */ +extern DECLSPEC int SDLCALL SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpec *obtained); + +/* + * Get the current audio state: + */ +typedef enum { + SDL_AUDIO_STOPPED = 0, + SDL_AUDIO_PLAYING, + SDL_AUDIO_PAUSED +} SDL_audiostatus; +extern DECLSPEC SDL_audiostatus SDLCALL SDL_GetAudioStatus(void); + +/* + * This function pauses and unpauses the audio callback processing. + * It should be called with a parameter of 0 after opening the audio + * device to start playing sound. This is so you can safely initialize + * data for your callback function after opening the audio device. + * Silence will be written to the audio device during the pause. + */ +extern DECLSPEC void SDLCALL SDL_PauseAudio(int pause_on); + +/* + * This function loads a WAVE from the data source, automatically freeing + * that source if 'freesrc' is non-zero. For example, to load a WAVE file, + * you could do: + * SDL_LoadWAV_RW(SDL_RWFromFile("sample.wav", "rb"), 1, ...); + * + * If this function succeeds, it returns the given SDL_AudioSpec, + * filled with the audio data format of the wave data, and sets + * 'audio_buf' to a malloc()'d buffer containing the audio data, + * and sets 'audio_len' to the length of that audio buffer, in bytes. + * You need to free the audio buffer with SDL_FreeWAV() when you are + * done with it. + * + * This function returns NULL and sets the SDL error message if the + * wave file cannot be opened, uses an unknown data format, or is + * corrupt. Currently raw and MS-ADPCM WAVE files are supported. + */ +extern DECLSPEC SDL_AudioSpec * SDLCALL SDL_LoadWAV_RW(SDL_RWops *src, int freesrc, SDL_AudioSpec *spec, Uint8 **audio_buf, Uint32 *audio_len); + +/* Compatibility convenience function -- loads a WAV from a file */ +#define SDL_LoadWAV(file, spec, audio_buf, audio_len) \ + SDL_LoadWAV_RW(SDL_RWFromFile(file, "rb"),1, spec,audio_buf,audio_len) + +/* + * This function frees data previously allocated with SDL_LoadWAV_RW() + */ +extern DECLSPEC void SDLCALL SDL_FreeWAV(Uint8 *audio_buf); + +/* + * This function takes a source format and rate and a destination format + * and rate, and initializes the 'cvt' structure with information needed + * by SDL_ConvertAudio() to convert a buffer of audio data from one format + * to the other. + * This function returns 0, or -1 if there was an error. + */ +extern DECLSPEC int SDLCALL SDL_BuildAudioCVT(SDL_AudioCVT *cvt, + Uint16 src_format, Uint8 src_channels, int src_rate, + Uint16 dst_format, Uint8 dst_channels, int dst_rate); + +/* Once you have initialized the 'cvt' structure using SDL_BuildAudioCVT(), + * created an audio buffer cvt->buf, and filled it with cvt->len bytes of + * audio data in the source format, this function will convert it in-place + * to the desired format. + * The data conversion may expand the size of the audio data, so the buffer + * cvt->buf should be allocated after the cvt structure is initialized by + * SDL_BuildAudioCVT(), and should be cvt->len*cvt->len_mult bytes long. + */ +extern DECLSPEC int SDLCALL SDL_ConvertAudio(SDL_AudioCVT *cvt); + +/* + * This takes two audio buffers of the playing audio format and mixes + * them, performing addition, volume adjustment, and overflow clipping. + * The volume ranges from 0 - 128, and should be set to SDL_MIX_MAXVOLUME + * for full audio volume. Note this does not change hardware volume. + * This is provided for convenience -- you can mix your own audio data. + */ +#define SDL_MIX_MAXVOLUME 128 +extern DECLSPEC void SDLCALL SDL_MixAudio(Uint8 *dst, const Uint8 *src, Uint32 len, int volume); + +/* + * The lock manipulated by these functions protects the callback function. + * During a LockAudio/UnlockAudio pair, you can be guaranteed that the + * callback function is not running. Do not call these from the callback + * function or you will cause deadlock. + */ +extern DECLSPEC void SDLCALL SDL_LockAudio(void); +extern DECLSPEC void SDLCALL SDL_UnlockAudio(void); + +/* + * This function shuts down audio processing and closes the audio device. + */ +extern DECLSPEC void SDLCALL SDL_CloseAudio(void); + + +/* Ends C function definitions when using C++ */ +#ifdef __cplusplus +} +#endif +#include "close_code.h" + +#endif /* _SDL_audio_h */ Added: trunk/libs/SDL-1.2.13/include/SDL_byteorder.h =================================================================== --- trunk/libs/SDL-1.2.13/include/SDL_byteorder.h (rev 0) +++ trunk/libs/SDL-1.2.13/include/SDL_byteorder.h 2008-08-05 22:34:52 UTC (rev 316) @@ -0,0 +1,24 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + sl...@li... +*/ + +/* DEPRECATED */ +#include "SDL_endian.h" Added: trunk/libs/SDL-1.2.13/include/SDL_cdrom.h =================================================================== --- trunk/libs/SDL-1.2.13/include/SDL_cdrom.h (rev 0) +++ trunk/libs/SDL-1.2.13/include/SDL_cdrom.h 2008-08-05 22:34:52 UTC (rev 316) @@ -0,0 +1,171 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + sl...@li... +*/ + +/* This is the CD-audio control API for Simple DirectMedia Layer */ + +#ifndef _SDL_cdrom_h +#define _SDL_cdrom_h + +#include "SDL_stdinc.h" +#include "SDL_error.h" + +#include "begin_code.h" +/* Set up for C function definitions, even when using C++ */ +#ifdef __cplusplus +extern "C" { +#endif + +/* In order to use these functions, SDL_Init() must have been called + with the SDL_INIT_CDROM flag. This causes SDL to scan the system + for CD-ROM drives, and load appropriate drivers. +*/ + +/* The maximum number of CD-ROM tracks on a disk */ +#define SDL_MAX_TRACKS 99 + +/* The types of CD-ROM track possible */ +#define SDL_AUDIO_TRACK 0x00 +#define SDL_DATA_TRACK 0x04 + +/* The possible states which a CD-ROM drive can be in. */ +typedef enum { + CD_TRAYEMPTY, + CD_STOPPED, + CD_PLAYING, + CD_PAUSED, + CD_ERROR = -1 +} CDstatus; + +/* Given a status, returns true if there's a disk in the drive */ +#define CD_INDRIVE(status) ((int)(status) > 0) + +typedef struct SDL_CDtrack { + Uint8 id; /* Track number */ + Uint8 type; /* Data or audio track */ + Uint16 unused; + Uint32 length; /* Length, in frames, of this track */ + Uint32 offset; /* Offset, in frames, from start of disk */ +} SDL_CDtrack; + +/* This structure is only current as of the last call to SDL_CDStatus() */ +typedef struct SDL_CD { + int id; /* Private drive identifier */ + CDstatus status; /* Current drive status */ + + /* The rest of this structure is only valid if there's a CD in drive */ + int numtracks; /* Number of tracks on disk */ + int cur_track; /* Current track position */ + int cur_frame; /* Current frame offset within current track */ + SDL_CDtrack track[SDL_MAX_TRACKS+1]; +} SDL_CD; + +/* Conversion functions from frames to Minute/Second/Frames and vice versa */ +#define CD_FPS 75 +#define FRAMES_TO_MSF(f, M,S,F) { \ + int value = f; \ + *(F) = value%CD_FPS; \ + value /= CD_FPS; \ + *(S) = value%60; \ + value /= 60; \ + *(M) = value; \ +} +#define MSF_TO_FRAMES(M, S, F) ((M)*60*CD_FPS+(S)*CD_FPS+(F)) + +/* CD-audio API functions: */ + +/* Returns the number of CD-ROM drives on the system, or -1 if + SDL_Init() has not been called with the SDL_INIT_CDROM flag. + */ +extern DECLSPEC int SDLCALL SDL_CDNumDrives(void); + +/* Returns a human-readable, system-dependent identifier for the CD-ROM. + Example: + "/dev/cdrom" + "E:" + "/dev/disk/ide/1/master" +*/ +extern DECLSPEC const char * SDLCALL SDL_CDName(int drive); + +/* Opens a CD-ROM drive for access. It returns a drive handle on success, + or NULL if the drive was invalid or busy. This newly opened CD-ROM + becomes the default CD used when other CD functions are passed a NULL + CD-ROM handle. + Drives are numbered starting with 0. Drive 0 is the system default CD-ROM. +*/ +extern DECLSPEC SDL_CD * SDLCALL SDL_CDOpen(int drive); + +/* This function returns the current status of the given drive. + If the drive has a CD in it, the table of contents of the CD and current + play position of the CD will be stored in the SDL_CD structure. +*/ +extern DECLSPEC CDstatus SDLCALL SDL_CDStatus(SDL_CD *cdrom); + +/* Play the given CD starting at 'start_track' and 'start_frame' for 'ntracks' + tracks and 'nframes' frames. If both 'ntrack' and 'nframe' are 0, play + until the end of the CD. This function will skip data tracks. + This function should only be called after calling SDL_CDStatus() to + get track information about the CD. + For example: + // Play entire CD: + if ( CD_INDRIVE(SDL_CDStatus(cdrom)) ) + SDL_CDPlayTracks(cdrom, 0, 0, 0, 0); + // Play last track: + if ( CD_INDRIVE(SDL_CDStatus(cdrom)) ) { + SDL_CDPlayTracks(cdrom, cdrom->numtracks-1, 0, 0, 0); + } + // Play first and second track and 10 seconds of third track: + if ( CD_INDRIVE(SDL_CDStatus(cdrom)) ) + SDL_CDPlayTracks(cdrom, 0, 0, 2, 10); + + This function returns 0, or -1 if there was an error. +*/ +extern DECLSPEC int SDLCALL SDL_CDPlayTracks(SDL_CD *cdrom, + int start_track, int start_frame, int ntracks, int nframes); + +/* Play the given CD starting at 'start' frame for 'length' frames. + It returns 0, or -1 if there was an error. +*/ +extern DECLSPEC int SDLCALL SDL_CDPlay(SDL_CD *cdrom, int start, int length); + +/* Pause play -- returns 0, or -1 on error */ +extern DECLSPEC int SDLCALL SDL_CDPause(SDL_CD *cdrom); + +/* Resume play -- returns 0, or -1 on error */ +extern DECLSPEC int SDLCALL SDL_CDResume(SDL_CD *cdrom); + +/* Stop play -- returns 0, or -1 on error */ +extern DECLSPEC int SDLCALL SDL_CDStop(SDL_CD *cdrom); + +/* Eject CD-ROM -- returns 0, or -1 on error */ +extern DECLSPEC int SDLCALL SDL_CDEject(SDL_CD *cdrom); + +/* Closes the handle for the CD-ROM drive */ +extern DECLSPEC void SDLCALL SDL_CDClose(SDL_CD *cdrom); + + +/* Ends C function definitions when using C++ */ +#ifdef __cplusplus +} +#endif +#include "close_code.h" + +#endif /* _SDL_video_h */ Added: trunk/libs/SDL-1.2.13/include/SDL_config.h =================================================================== --- trunk/libs/SDL-1.2.13/include/SDL_config.h (rev 0) +++ trunk/libs/SDL-1.2.13/include/SDL_config.h 2008-08-05 22:34:52 UTC (rev 316) @@ -0,0 +1,45 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + sl...@li... +*/ + +#ifndef _SDL_config_h +#define _SDL_config_h + +#include "SDL_platform.h" + +/* Add any platform that doesn't build using the configure system */ +#if defined(__DREAMCAST__) +#include "SDL_config_dreamcast.h" +#elif defined(__MACOS__) +#include "SDL_config_macos.h" +#elif defined(__MACOSX__) +#include "SDL_config_macosx.h" +#elif defined(__SYMBIAN32__) +#include "SDL_config_symbian.h" /* must be before win32! */ +#elif defined(__WIN32__) +#include "SDL_config_win32.h" +#elif defined(__OS2__) +#include "SDL_config_os2.h" +#else +#include "SDL_config_minimal.h" +#endif /* platform config */ + +#endif /* _SDL_config_h */ Added: trunk/libs/SDL-1.2.13/include/SDL_config.h.default =================================================================== --- trunk/libs/SDL-1.2.13/include/SDL_config.h.default (rev 0) +++ trunk/libs/SDL-1.2.13/include/SDL_config.h.default 2008-08-05 22:34:52 UTC (rev 316) @@ -0,0 +1,45 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + sl...@li... +*/ + +#ifndef _SDL_config_h +#define _SDL_config_h + +#include "SDL_platform.h" + +/* Add any platform that doesn't build using the configure system */ +#if defined(__DREAMCAST__) +#include "SDL_config_dreamcast.h" +#elif defined(__MACOS__) +#include "SDL_config_macos.h" +#elif defined(__MACOSX__) +#include "SDL_config_macosx.h" +#elif defined(__SYMBIAN32__) +#include "SDL_config_symbian.h" /* must be before win32! */ +#elif defined(__WIN32__) +#include "SDL_config_win32.h" +#elif defined(__OS2__) +#include "SDL_config_os2.h" +#else +#include "SDL_config_minimal.h" +#endif /* platform config */ + +#endif /* _SDL_config_h */ Added: trunk/libs/SDL-1.2.13/include/SDL_config.h.in =================================================================== --- trunk/libs/SDL-1.2.13/include/SDL_config.h.in (rev 0) +++ trunk/libs/SDL-1.2.13/include/SDL_config.h.in 2008-08-05 22:34:52 UTC (rev 316) @@ -0,0 +1,307 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + sl...@li... +*/ + +#ifndef _SDL_config_h +#define _SDL_config_h + +/* This is a set of defines to configure the SDL features */ + +/* General platform specific identifiers */ +#include "SDL_platform.h" + +/* Make sure that this isn't included by Visual C++ */ +#ifdef _MSC_VER +#error You should copy include/SDL_config.h.default to include/SDL_config.h +#endif + +/* C language features */ +#undef const +#undef inline +#undef volatile + +/* C datatypes */ +#undef size_t +#undef int8_t +#undef uint8_t +#undef int16_t +#undef uint16_t +#undef int32_t +#undef uint32_t +#undef int64_t +#undef uint64_t +#undef uintptr_t +#undef SDL_HAS_64BIT_TYPE + +/* Endianness */ +#undef SDL_BYTEORDER + +/* Comment this if you want to build without any C library requirements */ +#undef HAVE_LIBC +#if HAVE_LIBC + +/* Useful headers */ +#undef HAVE_ALLOCA_H +#undef HAVE_SYS_TYPES_H +#undef HAVE_STDIO_H +#undef STDC_HEADERS +#undef HAVE_STDLIB_H +#undef HAVE_STDARG_H +#undef HAVE_MALLOC_H +#undef HAVE_MEMORY_H +#undef HAVE_STRING_H +#undef HAVE_STRINGS_H +#undef HAVE_INTTYPES_H +#undef HAVE_STDINT_H +#undef HAVE_CTYPE_H +#undef HAVE_MATH_H +#undef HAVE_ICONV_H +#undef HAVE_SIGNAL_H +#undef HAVE_ALTIVEC_H + +/* C library functions */ +#undef HAVE_MALLOC +#undef HAVE_CALLOC +#undef HAVE_REALLOC +#undef HAVE_FREE +#undef HAVE_ALLOCA +#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */ +#undef HAVE_GETENV +#undef HAVE_PUTENV +#undef HAVE_UNSETENV +#endif +#undef HAVE_QSORT +#undef HAVE_ABS +#undef HAVE_BCOPY +#undef HAVE_MEMSET +#undef HAVE_MEMCPY +#undef HAVE_MEMMOVE +#undef HAVE_MEMCMP +#undef HAVE_STRLEN +#undef HAVE_STRLCPY +#undef HAVE_STRLCAT +#undef HAVE_STRDUP +#undef HAVE__STRREV +#undef HAVE__STRUPR +#undef HAVE__STRLWR +#undef HAVE_INDEX +#undef HAVE_RINDEX +#undef HAVE_STRCHR +#undef HAVE_STRRCHR +#undef HAVE_STRSTR +#undef HAVE_ITOA +#undef HAVE__LTOA +#undef HAVE__UITOA +#undef HAVE__ULTOA +#undef HAVE_STRTOL +#undef HAVE_STRTOUL +#undef HAVE__I64TOA +#undef HAVE__UI64TOA +#undef HAVE_STRTOLL +#undef HAVE_STRTOULL +#undef HAVE_STRTOD +#undef HAVE_ATOI +#undef HAVE_ATOF +#undef HAVE_STRCMP +#undef HAVE_STRNCMP +#undef HAVE__STRICMP +#undef HAVE_STRCASECMP +#undef HAVE__STRNICMP +#undef HAVE_STRNCASECMP +#undef HAVE_SSCANF +#undef HAVE_SNPRINTF +#undef HAVE_VSNPRINTF +#undef HAVE_ICONV +#undef HAVE_SIGACTION +#undef HAVE_SETJMP +#undef HAVE_NANOSLEEP +#undef HAVE_CLOCK_GETTIME +#undef HAVE_DLVSYM +#undef HAVE_GETPAGESIZE +#undef HAVE_MPROTECT + +#else +/* We may need some replacement for stdarg.h here */ +#include <stdarg.h> +#endif /* HAVE_LIBC */ + +/* Allow disabling of core subsystems */ +#undef SDL_AUDIO_DISABLED +#undef SDL_CDROM_DISABLED +#undef SDL_CPUINFO_DISABLED +#undef SDL_EVENTS_DISABLED +#undef SDL_FILE_DISABLED +#undef SDL_JOYSTICK_DISABLED +#undef SDL_LOADSO_DISABLED +#undef SDL_THREADS_DISABLED +#undef SDL_TIMERS_DISABLED +#undef SDL_VIDEO_DISABLED + +/* Enable various audio drivers */ +#undef SDL_AUDIO_DRIVER_ALSA +#undef SDL_AUDIO_DRIVER_ALSA_DYNAMIC +#undef SDL_AUDIO_DRIVER_ARTS +#undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC +#undef SDL_AUDIO_DRIVER_BAUDIO +#undef SDL_AUDIO_DRIVER_BSD +#undef SDL_AUDIO_DRIVER_COREAUDIO +#undef SDL_AUDIO_DRIVER_DART +#undef SDL_AUDIO_DRIVER_DC +#undef SDL_AUDIO_DRIVER_DISK +#undef SDL_AUDIO_DRIVER_DUMMY +#undef SDL_AUDIO_DRIVER_DMEDIA +#undef SDL_AUDIO_DRIVER_DSOUND +#undef SDL_AUDIO_DRIVER_PULSE +#undef SDL_AUDIO_DRIVER_PULSE_DYNAMIC +#undef SDL_AUDIO_DRIVER_ESD +#undef SDL_AUDIO_DRIVER_ESD_DYNAMIC +#undef SDL_AUDIO_DRIVER_MINT +#undef SDL_AUDIO_DRIVER_MMEAUDIO +#undef SDL_AUDIO_DRIVER_NAS +#undef SDL_AUDIO_DRIVER_OSS +#undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H +#undef SDL_AUDIO_DRIVER_PAUD +#undef SDL_AUDIO_DRIVER_QNXNTO +#undef SDL_AUDIO_DRIVER_SNDMGR +#undef SDL_AUDIO_DRIVER_SUNAUDIO +#undef SDL_AUDIO_DRIVER_WAVEOUT + +/* Enable various cdrom drivers */ +#undef SDL_CDROM_AIX +#undef SDL_CDROM_BEOS +#undef SDL_CDROM_BSDI +#undef SDL_CDROM_DC +#undef SDL_CDROM_DUMMY +#undef SDL_CDROM_FREEBSD +#undef SDL_CDROM_LINUX +#undef SDL_CDROM_MACOS +#undef SDL_CDROM_MACOSX +#undef SDL_CDROM_MINT +#undef SDL_CDROM_OPENBSD +#undef SDL_CDROM_OS2 +#undef SDL_CDROM_OSF +#undef SDL_CDROM_QNX +#undef SDL_CDROM_WIN32 + +/* Enable various input drivers */ +#undef SDL_INPUT_LINUXEV +#undef SDL_INPUT_TSLIB +#undef SDL_JOYSTICK_BEOS +#undef SDL_JOYSTICK_DC +#undef SDL_JOYSTICK_DUMMY +#undef SDL_JOYSTICK_IOKIT +#undef SDL_JOYSTICK_LINUX +#undef SDL_JOYSTICK_MACOS +#undef SDL_JOYSTICK_MINT +#undef SDL_JOYSTICK_OS2 +#undef SDL_JOYSTICK_RISCOS +#undef SDL_JOYSTICK_WINMM +#undef SDL_JOYSTICK_USBHID +#undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H + +/* Enable various shared object loading systems */ +#undef SDL_LOADSO_BEOS +#undef SDL_LOADSO_DLCOMPAT +#undef SDL_LOADSO_DLOPEN +#undef SDL_LOADSO_DUMMY +#undef SDL_LOADSO_LDG +#undef SDL_LOADSO_MACOS +#undef SDL_LOADSO_OS2 +#undef SDL_LOADSO_WIN32 + +/* Enable various threading systems */ +#undef SDL_THREAD_BEOS +#undef SDL_THREAD_DC +#undef SDL_THREAD_OS2 +#undef SDL_THREAD_PTH +#undef SDL_THREAD_PTHREAD +#undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX +#undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP +#undef SDL_THREAD_SPROC +#undef SDL_THREAD_WIN32 + +/* Enable various timer systems */ +#undef SDL_TIMER_BEOS +#undef SDL_TIMER_DC +#undef SDL_TIMER_DUMMY +#undef SDL_TIMER_MACOS +#undef SDL_TIMER_MINT +#undef SDL_TIMER_OS2 +#undef SDL_TIMER_RISCOS +#undef SDL_TIMER_UNIX +#undef SDL_TIMER_WIN32 +#undef SDL_TIMER_WINCE + +/* Enable various video drivers */ +#undef SDL_VIDEO_DRIVER_AALIB +#undef SDL_VIDEO_DRIVER_BWINDOW +#undef SDL_VIDEO_DRIVER_DC +#undef SDL_VIDEO_DRIVER_DDRAW +#undef SDL_VIDEO_DRIVER_DGA +#undef SDL_VIDEO_DRIVER_DIRECTFB +#undef SDL_VIDEO_DRIVER_DRAWSPROCKET +#undef SDL_VIDEO_DRIVER_DUMMY +#undef SDL_VIDEO_DRIVER_FBCON +#undef SDL_VIDEO_DRIVER_GAPI +#undef SDL_VIDEO_DRIVER_GEM +#undef SDL_VIDEO_DRIVER_GGI +#undef SDL_VIDEO_DRIVER_GP2X +#undef SDL_VIDEO_DRIVER_IPOD +#undef SDL_VIDEO_DRIVER_NANOX +#undef SDL_VIDEO_DRIVER_OS2FS +#undef SDL_VIDEO_DRIVER_PHOTON +#undef SDL_VIDEO_DRIVER_PICOGUI +#undef SDL_VIDEO_DRIVER_PS2GS +#undef SDL_VIDEO_DRIVER_QTOPIA +#undef SDL_VIDEO_DRIVER_QUARTZ +#undef SDL_VIDEO_DRIVER_RISCOS +#undef SDL_VIDEO_DRIVER_SVGALIB +#undef SDL_VIDEO_DRIVER_TOOLBOX +#undef SDL_VIDEO_DRIVER_VGL +#undef SDL_VIDEO_DRIVER_WINDIB +#undef SDL_VIDEO_DRIVER_WSCONS +#undef SDL_VIDEO_DRIVER_X11 +#undef SDL_VIDEO_DRIVER_X11_DGAMOUSE +#undef SDL_VIDEO_DRIVER_X11_DPMS +#undef SDL_VIDEO_DRIVER_X11_DYNAMIC +#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT +#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR +#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER +#undef SDL_VIDEO_DRIVER_X11_VIDMODE +#undef SDL_VIDEO_DRIVER_X11_XINERAMA +#undef SDL_VIDEO_DRIVER_X11_XME +#undef SDL_VIDEO_DRIVER_X11_XRANDR +#undef SDL_VIDEO_DRIVER_X11_XV +#undef SDL_VIDEO_DRIVER_XBIOS + +/* Enable OpenGL support */ +#undef SDL_VIDEO_OPENGL +#undef SDL_VIDEO_OPENGL_GLX +#undef SDL_VIDEO_OPENGL_WGL +#undef SDL_VIDEO_OPENGL_OSMESA +#undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC + +/* Enable assembly routines */ +#undef SDL_ASSEMBLY_ROUTINES +#undef SDL_HERMES_BLITTERS +#undef SDL_ALTIVEC_BLITTERS + +#endif /* _SDL_config_h */ Added: trunk/libs/SDL-1.2.13/include/SDL_config_dreamcast.h =================================================================== --- trunk/libs/SDL-1.2.13/include/SDL_config_dreamcast.h (rev 0) +++ trunk/libs/SDL-1.2.13/include/SDL_config_dreamcast.h 2008-08-05 22:34:52 UTC (rev 316) @@ -0,0 +1,106 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + sl...@li... +*/ + +#ifndef _SDL_config_dreamcast_h +#define _SDL_config_dreamcast_h + +#include "SDL_platform.h" + +/* This is a set of defines to configure the SDL features */ + +typedef signed char int8_t; +typedef unsigned char uint8_t; +typedef signed short int16_t; +typedef unsigned short uint16_t; +typedef signed int int32_t; +typedef unsigned int uint32_t; +typedef signed long long int64_t; +typedef unsigned long long uint64_t; +typedef unsigned long uintptr_t; +#define SDL_HAS_64BIT_TYPE 1 + +/* Useful headers */ +#define HAVE_SYS_TYPES_H 1 +#define HAVE_STDIO_H 1 +#define STDC_HEADERS 1 +#define HAVE_STRING_H 1 +#define HAVE_CTYPE_H 1 + +/* C library functions */ +#define HAVE_MALLOC 1 +#define HAVE_CALLOC 1 +#define HAVE_REALLOC 1 +#define HAVE_FREE 1 +#define HAVE_ALLOCA 1 +#define HAVE_GETENV 1 +#define HAVE_PUTENV 1 +#define HAVE_QSORT 1 +#define HAVE_ABS 1 +#define HAVE_BCOPY 1 +#define HAVE_MEMSET 1 +#define HAVE_MEMCPY 1 +#define HAVE_MEMMOVE 1 +#define HAVE_MEMCMP 1 +#define HAVE_STRLEN 1 +#define HAVE_STRDUP 1 +#define HAVE_INDEX 1 +#define HAVE_RINDEX 1 +#define HAVE_STRCHR 1 +#define HAVE_STRRCHR 1 +#define HAVE_STRSTR 1 +#define HAVE_STRTOL 1 +#define HAVE_STRTOD 1 +#define HAVE_ATOI 1 +#define HAVE_ATOF 1 +#define HAVE_STRCMP 1 +#define HAVE_STRNCMP 1 +#define HAVE_STRICMP 1 +#define HAVE_STRCASECMP 1 +#define HAVE_SSCANF 1 +#define HAVE_SNPRINTF 1 +#define HAVE_VSNPRINTF 1 + +/* Enable various audio drivers */ +#define SDL_AUDIO_DRIVER_DC 1 +#define SDL_AUDIO_DRIVER_DISK 1 +#define SDL_AUDIO_DRIVER_DUMMY 1 + +/* Enable various cdrom drivers */ +#define SDL_CDROM_DC 1 + +/* Enable various input drivers */ +#define SDL_JOYSTICK_DC 1 + +/* Enable various shared object loading systems */ +#define SDL_LOADSO_DUMMY 1 + +/* Enable various threading systems */ +#define SDL_THREAD_DC 1 + +/* Enable various timer systems */ +#define SDL_TIMER_DC 1 + +/* Enable various video drivers */ +#define SDL_VIDEO_DRIVER_DC 1 +#define SDL_VIDEO_DRIVER_DUMMY 1 + +#endif /* _SDL_config_dreamcast_h */ Added: trunk/libs/SDL-1.2.13/include/SDL_config_macos.h =================================================================== --- trunk/libs/SDL-1.2.13/include/SDL_config_macos.h (rev 0) +++ trunk/libs/SDL-1.2.13/include/SDL_config_macos.h 2008-08-05 22:34:52 UTC (rev 316) @@ -0,0 +1,112 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + sl...@li... +*/ + +#ifndef _SDL_config_macos_h +#define _SDL_config_macos_h + +#include "SDL_platform.h" + +/* This is a set of defines to configure the SDL features */ + +#include <MacTypes.h> + +typedef SInt8 int8_t; +typedef UInt8 uint8_t; +typedef SInt16 int16_t; +typedef UInt16 uint16_t; +typedef SInt32 int32_t; +typedef UInt32 uint32_t; +typedef SInt64 int64_t; +typedef UInt64 uint64_t; +typedef unsigned long uintptr_t; + +#define SDL_HAS_64BIT_TYPE 1 + +/* Useful headers */ +#define HAVE_STDIO_H 1 +#define STDC_HEADERS 1 +#define HAVE_STRING_H 1 +#define HAVE_CTYPE_H 1 +#define HAVE_MATH_H 1 +#define HAVE_SIGNAL_H 1 + +/* C library functions */ +#define HAVE_MALLOC 1 +#define HAVE_CALLOC 1 +#define HAVE_REALLOC 1 +#define HAVE_FREE 1 +#define HAVE_ALLOCA 1 +#define HAVE_ABS 1 +#define HAVE_MEMSET 1 +#define HAVE_MEMCPY 1 +#define HAVE_MEMMOVE 1 +#define HAVE_MEMCMP 1 +#define HAVE_STRLEN 1 +#define HAVE_STRCHR 1 +#define HAVE_STRRCHR 1 +#define HAVE_STRSTR 1 +#define HAVE_ITOA 1 +#define HAVE_STRTOL 1 +#define HAVE_STRTOD 1 +#define HAVE_ATOI 1 +#define HAVE_ATOF 1 +#define HAVE_STRCMP 1 +#define HAVE_STRNCMP 1 +#define HAVE_SSCANF 1 + +/* Enable various audio drivers */ +#define SDL_AUDIO_DRIVER_SNDMGR 1 +#define SDL_AUDIO_DRIVER_DISK 1 +#define SDL_AUDIO_DRIVER_DUMMY 1 + +/* Enable various cdrom drivers */ +#if TARGET_API_MAC_CARBON +#define SDL_CDROM_DUMMY 1 +#else +#define SDL_CDROM_MACOS 1 +#endif + +/* Enable various input drivers */ +#if TARGET_API_MAC_CARBON +#define SDL_JOYSTICK_DUMMY 1 +#else +#define SDL_JOYSTICK_MACOS 1 +#endif + +/* Enable various shared object loading systems */ +#define SDL_LOADSO_MACOS 1 + +/* Enable various threading systems */ +#define SDL_THREADS_DISABLED 1 + +/* Enable various timer systems */ +#define SDL_TIMER_MACOS 1 + +/* Enable various video drivers */ +#define SDL_VIDEO_DRIVER_DUMMY 1 +#define SDL_VIDEO_DRIVER_DRAWSPROCKET 1 +#define SDL_VIDEO_DRIVER_TOOLBOX 1 + +/* Enable OpenGL support */ +#define SDL_VIDEO_OPENGL 1 + +#endif /* _SDL_config_macos_h */ Added: trunk/libs/SDL-1.2.13/include/SDL_config_macosx.h =================================================================== --- trunk/libs/SDL-1.2.13/include/SDL_config_macosx.h (rev 0) +++ trunk/libs/SDL-1.2.13/include/SDL_config_macosx.h 2008-08-05 22:34:52 UTC (rev 316) @@ -0,0 +1,135 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + sl...@li... +*/ + +#ifndef _SDL_config_macosx_h +#define _SDL_config_macosx_h + +#include "SDL_platform.h" + +/* This gets us MAC_OS_X_VERSION_MIN_REQUIRED... */ +#include <AvailabilityMacros.h> + +/* This is a set of defines to configure the SDL features */ + +#define SDL_HAS_64BIT_TYPE 1 + +/* Useful headers */ +/* If we specified an SDK or have a post-PowerPC chip, then alloca.h exists. */ +#if ( (MAC_OS_X_VERSION_MIN_REQUIRED >= 1030) || (!defined(__POWERPC__)) ) +#define HAVE_ALLOCA_H 1 +#endif +#define HAVE_SYS_TYPES_H 1 +#define HAVE_STDIO_H 1 +#define STDC_HEADERS 1 +#define HAVE_STRING_H 1 +#define HAVE_INTTYPES_H 1 +#define HAVE_STDINT_H 1 +#define HAVE_CTYPE_H 1 +#define HAVE_MATH_H 1 +#define HAVE_SIGNAL_H 1 + +/* C library functions */ +#define HAVE_MALLOC 1 +#define HAVE_CALLOC 1 +#define HAVE_REALLOC 1 +#define HAVE_FREE 1 +#define HAVE_ALLOCA 1 +#define HAVE_GETENV 1 +#define HAVE_PUTENV 1 +#define HAVE_UNSETENV 1 +#define HAVE_QSORT 1 +#define HAVE_ABS 1 +#define HAVE_BCOPY 1 +#define HAVE_MEMSET 1 +#define HAVE_MEMCPY 1 +#define HAVE_MEMMOVE 1 +#define HAVE_MEMCMP 1 +#define HAVE_STRLEN 1 +#define HAVE_STRLCPY 1 +#define HAVE_STRLCAT 1 +#define HAVE_STRDUP 1 +#define HAVE_STRCHR 1 +#define HAVE_STRRCHR 1 +#define HAVE_STRSTR 1 +#define HAVE_STRTOL 1 +#define HAVE_STRTOUL 1 +#define HAVE_STRTOLL 1 +#define HAVE_STRTOULL 1 +#define HAVE_STRTOD 1 +#define HAVE_ATOI 1 +#define HAVE_ATOF 1 +#define HAVE_STRCMP 1 +#define HAVE_STRNCMP 1 +#define HAVE_STRCASECMP 1 +#define HAVE_STRNCASECMP 1 +#define HAVE_SSCANF 1 +#define HAVE_SNPRINTF 1 +#define HAVE_VSNPRINTF 1 +#define HAVE_SIGACTION 1 +#define HAVE_SETJMP 1 +#define HAVE_NANOSLEEP 1 + +/* Enable various audio drivers */ +#define SDL_AUDIO_DRIVER_COREAUDIO 1 +#define SDL_AUDIO_DRIVER_SNDMGR 1 +#define SDL_AUDIO_DRIVER_DISK 1 +#define SDL_AUDIO_DRIVER_DUMMY 1 + +/* Enable various cdrom drivers */ +#define SDL_CDROM_MACOSX 1 + +/* Enable various input drivers */ +#define SDL_JOYSTICK_IOKIT 1 + +/* Enable various shared object loading systems */ +#ifdef __ppc__ +/* For Mac OS X 10.2 compatibility */ +#define SDL_LOADSO_DLCOMPAT 1 +#else +#define SDL_LOADSO_DLOPEN 1 +#endif + +/* Enable various threading systems */ +#define SDL_THREAD_PTHREAD 1 +#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1 + +/* Enable various timer systems */ +#define SDL_TIMER_UNIX 1 + +/* Enable various video drivers */ +#define SDL_VIDEO_DRIVER_DUMMY 1 +#if ((defined TARGET_API_MAC_CARBON) && (TARGET_API_MAC_CARBON)) +#define SDL_VIDEO_DRIVER_TOOLBOX 1 +#else +#define SDL_VIDEO_DRIVER_QUARTZ 1 +#endif + +/* Enable OpenGL support */ +#define SDL_VIDEO_OPENGL 1 + +/* Enable assembly routines */ +#define SDL_ASSEMBLY_ROUTINES 1 +#ifdef __ppc__ +#define SDL_ALTIVEC_BLITTERS 1 +#endif + +#endif /* _SDL_config_macosx_h */ Added: trunk/libs/SDL-1.2.13/include/SDL_config_minimal.h =================================================================== --- trunk/libs/SDL-1.2.13/include/SDL_config_minimal.h (rev 0) +++ trunk/libs/SDL-1.2.13/include/SDL_config_minimal.h 2008-08-05 22:34:52 UTC (rev 316) @@ -0,0 +1,62 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + sl...@li... +*/ + +#ifndef _SDL_config_minimal_h +#define _SDL_config_minimal_h + +#include "SDL_platform.h" + +/* This is the minimal configuration that can be used to build SDL */ + +#include <stdarg.h> + +typedef signed char int8_t; +typedef unsigned char uint8_t; +typedef signed short int16_t; +typedef unsigned short uint16_t; +typedef signed int int32_t; +typedef unsigned int uint32_t; +typedef unsigned int size_t; +typedef unsigned long uintptr_t; + +/* Enable the dummy audio driver (src/audio/dummy/\*.c) */ +#define SDL_AUDIO_DRIVER_DUMMY 1 + +/* Enable the stub cdrom driver (src/cdrom/dummy/\*.c) */ +#define SDL_CDROM_DISABLED 1 + +/* Enable the stub joystick driver (src/joystick/dummy/\*.c) */ +#define SDL_JOYSTICK_DISABLED 1 + +/* Enable the stub shared object loader (src/loadso/dummy/\*.c) */ +#define SDL_LOADSO_DISABLED 1 + +/* Enable the stub thread support (src/thread/generic/\*.c) */ +#define SDL_THREADS_DISABLED 1 + +/* Enable the stub timer support (src/timer/dummy/\*.c) */ +#define SDL_TIMERS_DISABLED 1 + +/* Enable the dummy video driver (src/video/dummy/\*.c) */ +#define SDL_VIDEO_DRIVER_DUMMY 1 + +#endif /* _SDL_config_minimal_h */ Added: trunk/libs/SDL-1.2.13/include/SDL_config_nds.h =================================================================== --- trunk/libs/SDL-1.2.13/include/SDL_config_nds.h (rev 0) +++ trunk/libs/SDL-1.2.13/include/SDL_config_nds.h 2008-08-05 22:34:52 UTC (rev 316) @@ -0,0 +1,115 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + sl...@li... +*/ + +#ifndef _SDL_config_nds_h +#define _SDL_config_nds_h + +#include "SDL_platform.h" + +/* This is a set of defines to configure the SDL features */ + +/* General platform specific identifiers */ +#include "SDL_platform.h" + +/* C datatypes */ +#define SDL_HAS_64BIT_TYPE 1 + +/* Endianness */ +#define SDL_BYTEORDER 1234 + +/* Useful headers */ +#define HAVE_ALLOCA_H 1 +#define HAVE_SYS_TYPES_H 1 +#define HAVE_STDIO_H 1 +#define STDC_HEADERS 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STDARG_H 1 +#define HAVE_MALLOC_H 1 +#define HAVE_STRING_H 1 +#define HAVE_INTTYPES_H 1 +#define HAVE_STDINT_H 1 +#define HAVE_CTYPE_H 1 +#define HAVE_MATH_H 1 +#define HAVE_ICONV_H 1 +#define HAVE_SIGNAL_H 1 + +/* C library functions */ +#define HAVE_MALLOC 1 +#define HAVE_CALLOC 1 +#define HAVE_REALLOC 1 +#define HAVE_FREE 1 +#define HAVE_ALLOCA 1 +#define HAVE_GETENV 1 +#define HAVE_PUTENV 1 +#define HAVE_UNSETENV 1 +#define HAVE_QSORT 1 +#define HAVE_ABS 1 +#define HAVE_BCOPY 1 +#define HAVE_MEMSET 1 +#define HAVE_MEMCPY 1 +#define HAVE_MEMMOVE 1 +#define HAVE_STRLEN 1 +#define HAVE_STRLCPY 1 +#define HAVE_STRLCAT 1 +#define HAVE_STRDUP 1 +#define HAVE_STRCHR 1 +#define HAVE_STRRCHR 1 +#define HAVE_STRSTR 1 +#define HAVE_STRTOL 1 +#define HAVE_STRTOUL 1 +#define HAVE_STRTOLL 1 +#define HAVE_STRTOULL 1 +#define HAVE_ATOI 1 +#define HAVE_ATOF 1 +#define HAVE_STRCMP 1 +#define HAVE_STRNCMP 1 +#define HAVE_STRCASECMP 1 +#define HAVE_STRNCASECMP 1 +#define HAVE_SSCANF 1 +#define HAVE_SNPRINTF 1 +#define HAVE_VSNPRINTF 1 +#define HAVE_SETJMP 1 + +/* Enable various audio drivers */ +#define SDL_AUDIO_DRIVER_NDS 1 +#define SDL_AUDIO_DRIVER_DUMMY 1 + +/* Enable the stub cdrom driver (src/cdrom/dummy/\*.c) */ +#define SDL_CDROM_DISABLED 1 + +/* Enable various input drivers */ +#define SDL_JOYSTICK_NDS 1 + +/* Enable the stub shared object loader (src/loadso/dummy/\*.c) */ +#define SDL_LOADSO_DISABLED 1 + +/* Enable the stub thread support (src/thread/generic/\*.c) */ +#define SDL_THREADS_DISABLED 1 + +/* Enable various timer systems */ +#define SDL_TIMER_NDS 1 + +/* Enable various video drivers */ +#define SDL_VIDEO_DRIVER_NDS 1 +#define SDL_VIDEO_DRIVER_DUMMY 1 + +#endif /* _SDL_config_nds_h */ Added: trunk/libs/SDL-1.2.13/include/SDL_config_os2.h =================================================================== --- trunk/libs/SDL-1.2.13/include/SDL_config_os2.h (rev 0) +++ trunk/libs/SDL-1.2.13/include/SDL_config_os2.h 2008-08-05 22:34:52 UTC (rev 316) @@ -0,0 +1,141 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + sl...@li... +*/ + +#ifndef _SDL_config_os2_h +#define _SDL_config_os2_h + +#include "SDL_platform.h" + +/* This is a set of defines to configure the SDL features */ + +typedef signed char int8_t; +typedef unsigned char uint8_t; +typedef signed short int16_t; +typedef unsigned short uint16_t; +typedef signed int int32_t; +typedef unsigned int uint32_t; +typedef unsigned int size_t; +typedef unsigned long uintptr_t; +typedef signed long long int64_t; +typedef unsigned long long uint64_t; + +#define SDL_HAS_64BIT_TYPE 1 + +/* Use Watcom's LIBC */ +#define HAVE_LIBC 1 + +/* Useful headers */ +#define HAVE_SYS_TYPES_H 1 +#define HAVE_STDIO_H 1 +#define STDC_HEADERS 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STDARG_H 1 +#define HAVE_MALLOC_H 1 +#define HAVE_MEMORY_H 1 +#define HAVE_STRING_H 1 +#define HAVE_STRINGS_H 1 +#define HAVE_INTTYPES_H 1 +#define HAVE_STDINT_H 1 +#define HAVE_CTYPE_H 1 +#define HAVE_MATH_H 1 +#define HAVE_SIGNAL_H 1 + +/* C library functions */ +#define HAVE_MALLOC 1 +#define HAVE_CALLOC 1 +#define HAVE_REALLOC 1 +#define HAVE_FREE 1 +#define HAVE_ALLOCA 1 +#define HAVE_GETENV 1 +#define HAVE_PUTENV 1 +#define HAVE_UNSETENV 1 +#define HAVE_QSORT 1 +#define HAVE_ABS 1 +#define HAVE_BCOPY 1 +#define HAVE_MEMSET 1 +#define HAVE_MEMCPY 1 +#define HAVE_MEMMOVE 1 +#define HAVE_MEMCMP 1 +#define HAVE_STRLEN 1 +#define HAVE_STRLCPY 1 +#define HAVE_STRLCAT 1 +#define HAVE_STRDUP 1 +#define HAVE__STRREV 1 +#define HAVE__STRUPR 1 +#define HAVE__STRLWR 1 +#define HAVE_INDEX 1 +#define HAVE_RINDEX 1 +#define HAVE_STRCHR 1 +#define HAVE_STRRCHR 1 +#define HAVE_STRSTR 1 +#define HAVE_ITOA 1 +#define HAVE__LTOA 1 +#define HAVE__UITOA 1 +#define HAVE__ULTOA 1 +#define HAVE_STRTOL 1 +#define HAVE__I64TOA 1 +#define HAVE__UI64TOA 1 +#define HAVE_STRTOLL 1 +#define HAVE_STRTOD 1 +#define HAVE_ATOI 1 +#define HAVE_ATOF 1 +#define HAVE_STRCMP 1 +#define HAVE_STRNCMP 1 +#define HAVE_STRICMP 1 +#define HAVE_STRCASECMP 1 +#define HAVE_SSCANF 1 +#define HAVE_SNPRINTF 1 +#define HAVE_VSNPRINTF 1 +#define HAVE_SETJMP 1 +#define HAVE_CLOCK_GETTIME 1 + +/* Enable various audio drivers */ +#define SDL_AUDIO_DRIVER_DART 1 +#define SDL_AUDIO_DRIVER_DISK 1 +#define SDL_AUDIO_DRIVER_DUMMY 1 + +/* Enable various cdrom drivers */ +#define SDL_CDROM_OS2 1 + +/* Enable various input drivers */ +#define SDL_JOYSTICK_OS2 1 + +/* Enable various shared object loading systems */ +#define SDL_LOADSO_OS2 1 + +/* Enable various threading systems */ +#define SDL_THREAD_OS2 1 + +/* Enable various timer systems */ +#define SDL_TIMER_OS2 1 + +/* Enable various video drivers */ +#define SDL_VIDEO_DRIVER_DUMMY 1 +#define SDL_VIDEO_DRIVER_OS2FS 1 + +/* Enable OpenGL support */ +/* Nothing here yet for OS/2... :( */ + +/* Enable assembly routines where available */ +#define SDL_ASSEMBLY_ROUTINES 1 + +#endif /* _SDL_config_os2_h */ Added: trunk/libs/SDL-1.2.13/include/SDL_config_symbian.h =================================================================== --- trunk/libs/SDL-1.2.13/include/SDL_config_symbian.h (rev 0) +++ trunk/libs/SDL-1.2.13/include/SDL_config_symbian.h 2008-08-05 22:34:52 UTC (rev 316) @@ -0,0 +1,146 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + sl...@li... +*/ + +/* + +Symbian version Markus Mertama + +*/ + + +#ifndef _SDL_CONFIG_SYMBIAN_H +#define _SDL_CONFIG_SYMBIAN_H + +#include "SDL_platform.h" + +/* This is the minimal configuration that can be used to build SDL */ + + +#include <stdarg.h> +#include <stddef.h> + + +#ifdef __GCCE__ +#define SYMBIAN32_GCCE +#endif + +#ifndef _SIZE_T_DEFINED +typedef unsigned in... [truncated message content] |
From: <sen...@us...> - 2008-08-05 22:29:23
|
Revision: 315 http://open2x.svn.sourceforge.net/open2x/?rev=315&view=rev Author: senquack Date: 2008-08-05 22:28:59 +0000 (Tue, 05 Aug 2008) Log Message: ----------- Update Paeryn's 1.2.9 HW SDL to 1.2.13 Added Paths: ----------- trunk/libs/SDL-1.2.13/src/SDL_error_c.h trunk/libs/SDL-1.2.13/src/SDL_fatal.c trunk/libs/SDL-1.2.13/src/audio/ trunk/libs/SDL-1.2.13/src/audio/SDL_audio.c trunk/libs/SDL-1.2.13/src/audio/SDL_audio_c.h trunk/libs/SDL-1.2.13/src/audio/SDL_audiocvt.c trunk/libs/SDL-1.2.13/src/audio/SDL_audiodev.c trunk/libs/SDL-1.2.13/src/audio/SDL_audiodev_c.h trunk/libs/SDL-1.2.13/src/audio/SDL_audiomem.h trunk/libs/SDL-1.2.13/src/audio/SDL_mixer.c trunk/libs/SDL-1.2.13/src/audio/SDL_mixer_MMX.c trunk/libs/SDL-1.2.13/src/audio/SDL_mixer_MMX.h trunk/libs/SDL-1.2.13/src/audio/SDL_mixer_MMX_VC.c trunk/libs/SDL-1.2.13/src/audio/SDL_mixer_MMX_VC.h trunk/libs/SDL-1.2.13/src/audio/SDL_mixer_m68k.c trunk/libs/SDL-1.2.13/src/audio/SDL_mixer_m68k.h trunk/libs/SDL-1.2.13/src/audio/SDL_sysaudio.h trunk/libs/SDL-1.2.13/src/audio/SDL_wave.c trunk/libs/SDL-1.2.13/src/audio/SDL_wave.h trunk/libs/SDL-1.2.13/src/audio/alsa/ trunk/libs/SDL-1.2.13/src/audio/alsa/SDL_alsa_audio.c trunk/libs/SDL-1.2.13/src/audio/alsa/SDL_alsa_audio.h trunk/libs/SDL-1.2.13/src/audio/arts/ trunk/libs/SDL-1.2.13/src/audio/arts/SDL_artsaudio.c trunk/libs/SDL-1.2.13/src/audio/arts/SDL_artsaudio.h trunk/libs/SDL-1.2.13/src/audio/baudio/ trunk/libs/SDL-1.2.13/src/audio/baudio/SDL_beaudio.cc trunk/libs/SDL-1.2.13/src/audio/baudio/SDL_beaudio.h trunk/libs/SDL-1.2.13/src/audio/bsd/ trunk/libs/SDL-1.2.13/src/audio/bsd/SDL_bsdaudio.c trunk/libs/SDL-1.2.13/src/audio/bsd/SDL_bsdaudio.h trunk/libs/SDL-1.2.13/src/audio/dart/ trunk/libs/SDL-1.2.13/src/audio/dart/SDL_dart.c trunk/libs/SDL-1.2.13/src/audio/dart/SDL_dart.h trunk/libs/SDL-1.2.13/src/audio/dc/ trunk/libs/SDL-1.2.13/src/audio/dc/SDL_dcaudio.c trunk/libs/SDL-1.2.13/src/audio/dc/SDL_dcaudio.h trunk/libs/SDL-1.2.13/src/audio/dc/aica.c trunk/libs/SDL-1.2.13/src/audio/dc/aica.h trunk/libs/SDL-1.2.13/src/audio/disk/ trunk/libs/SDL-1.2.13/src/audio/disk/SDL_diskaudio.c trunk/libs/SDL-1.2.13/src/audio/disk/SDL_diskaudio.h trunk/libs/SDL-1.2.13/src/audio/dma/ trunk/libs/SDL-1.2.13/src/audio/dma/SDL_dmaaudio.c trunk/libs/SDL-1.2.13/src/audio/dma/SDL_dmaaudio.h trunk/libs/SDL-1.2.13/src/audio/dmedia/ trunk/libs/SDL-1.2.13/src/audio/dmedia/SDL_irixaudio.c trunk/libs/SDL-1.2.13/src/audio/dmedia/SDL_irixaudio.h trunk/libs/SDL-1.2.13/src/audio/dsp/ trunk/libs/SDL-1.2.13/src/audio/dsp/SDL_dspaudio.c trunk/libs/SDL-1.2.13/src/audio/dsp/SDL_dspaudio.h trunk/libs/SDL-1.2.13/src/audio/dummy/ trunk/libs/SDL-1.2.13/src/audio/dummy/SDL_dummyaudio.c trunk/libs/SDL-1.2.13/src/audio/dummy/SDL_dummyaudio.h trunk/libs/SDL-1.2.13/src/audio/esd/ trunk/libs/SDL-1.2.13/src/audio/esd/SDL_esdaudio.c trunk/libs/SDL-1.2.13/src/audio/esd/SDL_esdaudio.h trunk/libs/SDL-1.2.13/src/audio/macosx/ trunk/libs/SDL-1.2.13/src/audio/macosx/SDL_coreaudio.c trunk/libs/SDL-1.2.13/src/audio/macosx/SDL_coreaudio.h trunk/libs/SDL-1.2.13/src/audio/macrom/ trunk/libs/SDL-1.2.13/src/audio/macrom/SDL_romaudio.c trunk/libs/SDL-1.2.13/src/audio/macrom/SDL_romaudio.h trunk/libs/SDL-1.2.13/src/audio/mint/ trunk/libs/SDL-1.2.13/src/audio/mint/SDL_mintaudio.c trunk/libs/SDL-1.2.13/src/audio/mint/SDL_mintaudio.h trunk/libs/SDL-1.2.13/src/audio/mint/SDL_mintaudio_dma8.c trunk/libs/SDL-1.2.13/src/audio/mint/SDL_mintaudio_dma8.h trunk/libs/SDL-1.2.13/src/audio/mint/SDL_mintaudio_gsxb.c trunk/libs/SDL-1.2.13/src/audio/mint/SDL_mintaudio_gsxb.h trunk/libs/SDL-1.2.13/src/audio/mint/SDL_mintaudio_it.S trunk/libs/SDL-1.2.13/src/audio/mint/SDL_mintaudio_mcsn.c trunk/libs/SDL-1.2.13/src/audio/mint/SDL_mintaudio_mcsn.h trunk/libs/SDL-1.2.13/src/audio/mint/SDL_mintaudio_stfa.c trunk/libs/SDL-1.2.13/src/audio/mint/SDL_mintaudio_stfa.h trunk/libs/SDL-1.2.13/src/audio/mint/SDL_mintaudio_xbios.c trunk/libs/SDL-1.2.13/src/audio/mme/ trunk/libs/SDL-1.2.13/src/audio/mme/SDL_mmeaudio.c trunk/libs/SDL-1.2.13/src/audio/mme/SDL_mmeaudio.h trunk/libs/SDL-1.2.13/src/audio/nas/ trunk/libs/SDL-1.2.13/src/audio/nas/SDL_nasaudio.c trunk/libs/SDL-1.2.13/src/audio/nas/SDL_nasaudio.h trunk/libs/SDL-1.2.13/src/audio/nds/ trunk/libs/SDL-1.2.13/src/audio/nds/SDL_ndsaudio.c trunk/libs/SDL-1.2.13/src/audio/nds/SDL_ndsaudio.h trunk/libs/SDL-1.2.13/src/audio/nds/sound9.c trunk/libs/SDL-1.2.13/src/audio/nds/soundcommon.h trunk/libs/SDL-1.2.13/src/audio/nto/ trunk/libs/SDL-1.2.13/src/audio/nto/SDL_nto_audio.c trunk/libs/SDL-1.2.13/src/audio/nto/SDL_nto_audio.h trunk/libs/SDL-1.2.13/src/audio/paudio/ trunk/libs/SDL-1.2.13/src/audio/paudio/SDL_paudio.c trunk/libs/SDL-1.2.13/src/audio/paudio/SDL_paudio.h trunk/libs/SDL-1.2.13/src/audio/pulse/ trunk/libs/SDL-1.2.13/src/audio/pulse/SDL_pulseaudio.c trunk/libs/SDL-1.2.13/src/audio/pulse/SDL_pulseaudio.h trunk/libs/SDL-1.2.13/src/audio/sun/ trunk/libs/SDL-1.2.13/src/audio/sun/SDL_sunaudio.c trunk/libs/SDL-1.2.13/src/audio/sun/SDL_sunaudio.h trunk/libs/SDL-1.2.13/src/audio/symbian/ trunk/libs/SDL-1.2.13/src/audio/symbian/SDL_epocaudio.cpp trunk/libs/SDL-1.2.13/src/audio/symbian/SDL_epocaudio.h trunk/libs/SDL-1.2.13/src/audio/symbian/streamplayer.cpp trunk/libs/SDL-1.2.13/src/audio/symbian/streamplayer.h trunk/libs/SDL-1.2.13/src/audio/ums/ trunk/libs/SDL-1.2.13/src/audio/ums/SDL_umsaudio.c trunk/libs/SDL-1.2.13/src/audio/ums/SDL_umsaudio.h trunk/libs/SDL-1.2.13/src/audio/windib/ trunk/libs/SDL-1.2.13/src/audio/windib/SDL_dibaudio.c trunk/libs/SDL-1.2.13/src/audio/windib/SDL_dibaudio.h trunk/libs/SDL-1.2.13/src/audio/windx5/ trunk/libs/SDL-1.2.13/src/audio/windx5/SDL_dx5audio.c trunk/libs/SDL-1.2.13/src/audio/windx5/SDL_dx5audio.h trunk/libs/SDL-1.2.13/src/audio/windx5/directx.h trunk/libs/SDL-1.2.13/src/hermes/ trunk/libs/SDL-1.2.13/src/hermes/COPYING.LIB trunk/libs/SDL-1.2.13/src/hermes/HeadMMX.h trunk/libs/SDL-1.2.13/src/hermes/HeadX86.h trunk/libs/SDL-1.2.13/src/hermes/README trunk/libs/SDL-1.2.13/src/hermes/common.inc trunk/libs/SDL-1.2.13/src/hermes/mmx_main.asm trunk/libs/SDL-1.2.13/src/hermes/mmxp2_32.asm trunk/libs/SDL-1.2.13/src/hermes/x86_main.asm trunk/libs/SDL-1.2.13/src/hermes/x86p_16.asm trunk/libs/SDL-1.2.13/src/hermes/x86p_32.asm trunk/libs/SDL-1.2.13/src/joystick/ trunk/libs/SDL-1.2.13/src/joystick/SDL_joystick.c trunk/libs/SDL-1.2.13/src/joystick/SDL_joystick_c.h trunk/libs/SDL-1.2.13/src/joystick/SDL_sysjoystick.h trunk/libs/SDL-1.2.13/src/joystick/beos/ trunk/libs/SDL-1.2.13/src/joystick/beos/SDL_bejoystick.cc trunk/libs/SDL-1.2.13/src/joystick/bsd/ trunk/libs/SDL-1.2.13/src/joystick/bsd/SDL_sysjoystick.c trunk/libs/SDL-1.2.13/src/joystick/darwin/ trunk/libs/SDL-1.2.13/src/joystick/darwin/10.3.9-FIX/ trunk/libs/SDL-1.2.13/src/joystick/darwin/10.3.9-FIX/IOHIDLib.h trunk/libs/SDL-1.2.13/src/joystick/darwin/SDL_sysjoystick.c trunk/libs/SDL-1.2.13/src/joystick/dc/ trunk/libs/SDL-1.2.13/src/joystick/dc/SDL_sysjoystick.c trunk/libs/SDL-1.2.13/src/joystick/dummy/ trunk/libs/SDL-1.2.13/src/joystick/dummy/SDL_sysjoystick.c trunk/libs/SDL-1.2.13/src/joystick/linux/ trunk/libs/SDL-1.2.13/src/joystick/linux/SDL_sysjoystick.c trunk/libs/SDL-1.2.13/src/joystick/macos/ trunk/libs/SDL-1.2.13/src/joystick/macos/SDL_sysjoystick.c trunk/libs/SDL-1.2.13/src/joystick/mint/ trunk/libs/SDL-1.2.13/src/joystick/mint/SDL_sysjoystick.c trunk/libs/SDL-1.2.13/src/joystick/nds/ trunk/libs/SDL-1.2.13/src/joystick/nds/SDL_sysjoystick.c trunk/libs/SDL-1.2.13/src/joystick/os2/ trunk/libs/SDL-1.2.13/src/joystick/os2/SDL_sysjoystick.c trunk/libs/SDL-1.2.13/src/joystick/os2/joyos2.h trunk/libs/SDL-1.2.13/src/joystick/riscos/ trunk/libs/SDL-1.2.13/src/joystick/riscos/SDL_sysjoystick.c trunk/libs/SDL-1.2.13/src/joystick/win32/ trunk/libs/SDL-1.2.13/src/joystick/win32/SDL_mmjoystick.c trunk/libs/SDL-1.2.13/src/loadso/ trunk/libs/SDL-1.2.13/src/loadso/beos/ trunk/libs/SDL-1.2.13/src/loadso/beos/SDL_sysloadso.c trunk/libs/SDL-1.2.13/src/loadso/dlopen/ trunk/libs/SDL-1.2.13/src/loadso/dlopen/SDL_sysloadso.c trunk/libs/SDL-1.2.13/src/loadso/dummy/ trunk/libs/SDL-1.2.13/src/loadso/dummy/SDL_sysloadso.c trunk/libs/SDL-1.2.13/src/loadso/macos/ trunk/libs/SDL-1.2.13/src/loadso/macos/SDL_sysloadso.c trunk/libs/SDL-1.2.13/src/loadso/macosx/ trunk/libs/SDL-1.2.13/src/loadso/macosx/SDL_dlcompat.c trunk/libs/SDL-1.2.13/src/loadso/mint/ trunk/libs/SDL-1.2.13/src/loadso/mint/SDL_sysloadso.c trunk/libs/SDL-1.2.13/src/loadso/os2/ trunk/libs/SDL-1.2.13/src/loadso/os2/SDL_sysloadso.c trunk/libs/SDL-1.2.13/src/loadso/win32/ trunk/libs/SDL-1.2.13/src/loadso/win32/SDL_sysloadso.c trunk/libs/SDL-1.2.13/src/thread/ trunk/libs/SDL-1.2.13/src/thread/SDL_systhread.h trunk/libs/SDL-1.2.13/src/thread/SDL_thread.c trunk/libs/SDL-1.2.13/src/thread/SDL_thread_c.h trunk/libs/SDL-1.2.13/src/thread/beos/ trunk/libs/SDL-1.2.13/src/thread/beos/SDL_syssem.c trunk/libs/SDL-1.2.13/src/thread/beos/SDL_systhread.c trunk/libs/SDL-1.2.13/src/thread/beos/SDL_systhread_c.h trunk/libs/SDL-1.2.13/src/thread/dc/ trunk/libs/SDL-1.2.13/src/thread/dc/SDL_syscond.c trunk/libs/SDL-1.2.13/src/thread/dc/SDL_syscond_c.h trunk/libs/SDL-1.2.13/src/thread/dc/SDL_sysmutex.c trunk/libs/SDL-1.2.13/src/thread/dc/SDL_sysmutex_c.h trunk/libs/SDL-1.2.13/src/thread/dc/SDL_syssem.c trunk/libs/SDL-1.2.13/src/thread/dc/SDL_syssem_c.h trunk/libs/SDL-1.2.13/src/thread/dc/SDL_systhread.c trunk/libs/SDL-1.2.13/src/thread/dc/SDL_systhread_c.h trunk/libs/SDL-1.2.13/src/thread/generic/ trunk/libs/SDL-1.2.13/src/thread/generic/SDL_syscond.c trunk/libs/SDL-1.2.13/src/thread/generic/SDL_sysmutex.c trunk/libs/SDL-1.2.13/src/thread/generic/SDL_sysmutex_c.h trunk/libs/SDL-1.2.13/src/thread/generic/SDL_syssem.c trunk/libs/SDL-1.2.13/src/thread/generic/SDL_systhread.c trunk/libs/SDL-1.2.13/src/thread/generic/SDL_systhread_c.h trunk/libs/SDL-1.2.13/src/thread/irix/ trunk/libs/SDL-1.2.13/src/thread/irix/SDL_syssem.c trunk/libs/SDL-1.2.13/src/thread/irix/SDL_systhread.c trunk/libs/SDL-1.2.13/src/thread/irix/SDL_systhread_c.h trunk/libs/SDL-1.2.13/src/thread/os2/ trunk/libs/SDL-1.2.13/src/thread/os2/SDL_syscond.c trunk/libs/SDL-1.2.13/src/thread/os2/SDL_syscond_c.h trunk/libs/SDL-1.2.13/src/thread/os2/SDL_sysmutex.c trunk/libs/SDL-1.2.13/src/thread/os2/SDL_syssem.c trunk/libs/SDL-1.2.13/src/thread/os2/SDL_systhread.c trunk/libs/SDL-1.2.13/src/thread/os2/SDL_systhread_c.h trunk/libs/SDL-1.2.13/src/thread/pth/ trunk/libs/SDL-1.2.13/src/thread/pth/SDL_syscond.c trunk/libs/SDL-1.2.13/src/thread/pth/SDL_sysmutex.c trunk/libs/SDL-1.2.13/src/thread/pth/SDL_sysmutex_c.h trunk/libs/SDL-1.2.13/src/thread/pth/SDL_systhread.c trunk/libs/SDL-1.2.13/src/thread/pth/SDL_systhread_c.h trunk/libs/SDL-1.2.13/src/thread/pthread/ trunk/libs/SDL-1.2.13/src/thread/pthread/SDL_syscond.c trunk/libs/SDL-1.2.13/src/thread/pthread/SDL_sysmutex.c trunk/libs/SDL-1.2.13/src/thread/pthread/SDL_sysmutex_c.h trunk/libs/SDL-1.2.13/src/thread/pthread/SDL_syssem.c trunk/libs/SDL-1.2.13/src/thread/pthread/SDL_systhread.c trunk/libs/SDL-1.2.13/src/thread/pthread/SDL_systhread_c.h trunk/libs/SDL-1.2.13/src/thread/riscos/ trunk/libs/SDL-1.2.13/src/thread/riscos/SDL_syscond.c trunk/libs/SDL-1.2.13/src/thread/riscos/SDL_sysmutex.c trunk/libs/SDL-1.2.13/src/thread/riscos/SDL_sysmutex_c.h trunk/libs/SDL-1.2.13/src/thread/riscos/SDL_syssem.c trunk/libs/SDL-1.2.13/src/thread/riscos/SDL_systhread.c trunk/libs/SDL-1.2.13/src/thread/riscos/SDL_systhread_c.h trunk/libs/SDL-1.2.13/src/thread/symbian/ trunk/libs/SDL-1.2.13/src/thread/symbian/SDL_sysmutex.cpp trunk/libs/SDL-1.2.13/src/thread/symbian/SDL_syssem.cpp trunk/libs/SDL-1.2.13/src/thread/symbian/SDL_systhread.cpp trunk/libs/SDL-1.2.13/src/thread/symbian/SDL_systhread_c.h trunk/libs/SDL-1.2.13/src/thread/win32/ trunk/libs/SDL-1.2.13/src/thread/win32/SDL_sysmutex.c trunk/libs/SDL-1.2.13/src/thread/win32/SDL_syssem.c trunk/libs/SDL-1.2.13/src/thread/win32/SDL_systhread.c trunk/libs/SDL-1.2.13/src/thread/win32/SDL_systhread_c.h trunk/libs/SDL-1.2.13/src/thread/win32/win_ce_semaphore.c trunk/libs/SDL-1.2.13/src/thread/win32/win_ce_semaphore.h trunk/libs/SDL-1.2.13/src/timer/ trunk/libs/SDL-1.2.13/src/timer/SDL_systimer.h trunk/libs/SDL-1.2.13/src/timer/SDL_timer.c trunk/libs/SDL-1.2.13/src/timer/SDL_timer_c.h trunk/libs/SDL-1.2.13/src/timer/beos/ trunk/libs/SDL-1.2.13/src/timer/beos/SDL_systimer.c trunk/libs/SDL-1.2.13/src/timer/dc/ trunk/libs/SDL-1.2.13/src/timer/dc/SDL_systimer.c trunk/libs/SDL-1.2.13/src/timer/dummy/ trunk/libs/SDL-1.2.13/src/timer/dummy/SDL_systimer.c trunk/libs/SDL-1.2.13/src/timer/macos/ trunk/libs/SDL-1.2.13/src/timer/macos/FastTimes.c trunk/libs/SDL-1.2.13/src/timer/macos/FastTimes.h trunk/libs/SDL-1.2.13/src/timer/macos/SDL_MPWtimer.c trunk/libs/SDL-1.2.13/src/timer/macos/SDL_systimer.c trunk/libs/SDL-1.2.13/src/timer/mint/ trunk/libs/SDL-1.2.13/src/timer/mint/SDL_systimer.c trunk/libs/SDL-1.2.13/src/timer/mint/SDL_vbltimer.S trunk/libs/SDL-1.2.13/src/timer/mint/SDL_vbltimer_s.h trunk/libs/SDL-1.2.13/src/timer/nds/ trunk/libs/SDL-1.2.13/src/timer/nds/SDL_systimer.c trunk/libs/SDL-1.2.13/src/timer/os2/ trunk/libs/SDL-1.2.13/src/timer/os2/SDL_systimer.c trunk/libs/SDL-1.2.13/src/timer/riscos/ trunk/libs/SDL-1.2.13/src/timer/riscos/SDL_systimer.c trunk/libs/SDL-1.2.13/src/timer/symbian/ trunk/libs/SDL-1.2.13/src/timer/symbian/SDL_systimer.cpp trunk/libs/SDL-1.2.13/src/timer/unix/ trunk/libs/SDL-1.2.13/src/timer/unix/SDL_systimer.c trunk/libs/SDL-1.2.13/src/timer/win32/ trunk/libs/SDL-1.2.13/src/timer/win32/SDL_systimer.c trunk/libs/SDL-1.2.13/src/timer/wince/ trunk/libs/SDL-1.2.13/src/timer/wince/SDL_systimer.c Added: trunk/libs/SDL-1.2.13/src/SDL_error_c.h =================================================================== --- trunk/libs/SDL-1.2.13/src/SDL_error_c.h (rev 0) +++ trunk/libs/SDL-1.2.13/src/SDL_error_c.h 2008-08-05 22:28:59 UTC (rev 315) @@ -0,0 +1,58 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + sl...@li... +*/ +#include "SDL_config.h" + +/* This file defines a structure that carries language-independent + error messages +*/ + +#ifndef _SDL_error_c_h +#define _SDL_error_c_h + +#define ERR_MAX_STRLEN 128 +#define ERR_MAX_ARGS 5 + +typedef struct SDL_error { + /* This is a numeric value corresponding to the current error */ + int error; + + /* This is a key used to index into a language hashtable containing + internationalized versions of the SDL error messages. If the key + is not in the hashtable, or no hashtable is available, the key is + used directly as an error message format string. + */ + char key[ERR_MAX_STRLEN]; + + /* These are the arguments for the error functions */ + int argc; + union { + void *value_ptr; +#if 0 /* What is a character anyway? (UNICODE issues) */ + unsigned char value_c; +#endif + int value_i; + double value_f; + char buf[ERR_MAX_STRLEN]; + } args[ERR_MAX_ARGS]; +} SDL_error; + +#endif /* _SDL_error_c_h */ Added: trunk/libs/SDL-1.2.13/src/SDL_fatal.c =================================================================== --- trunk/libs/SDL-1.2.13/src/SDL_fatal.c (rev 0) +++ trunk/libs/SDL-1.2.13/src/SDL_fatal.c 2008-08-05 22:28:59 UTC (rev 315) @@ -0,0 +1,134 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + sl...@li... +*/ +#include "SDL_config.h" + +/* General fatal signal handling code for SDL */ + +#ifdef HAVE_SIGNAL_H + +#include <signal.h> + +#include "SDL.h" +#include "SDL_fatal.h" + +/* This installs some signal handlers for the more common fatal signals, + so that if the programmer is lazy, the app doesn't die so horribly if + the program crashes. +*/ + +static void SDL_Parachute(int sig) +{ + signal(sig, SIG_DFL); + SDL_Quit(); + raise(sig); +} + +static int SDL_fatal_signals[] = { + SIGSEGV, +#ifdef SIGBUS + SIGBUS, +#endif +#ifdef SIGFPE + SIGFPE, +#endif +#ifdef SIGQUIT + SIGQUIT, +#endif + 0 +}; + +void SDL_InstallParachute(void) +{ + /* Set a handler for any fatal signal not already handled */ + int i; +#ifdef HAVE_SIGACTION + struct sigaction action; + + for ( i=0; SDL_fatal_signals[i]; ++i ) { + sigaction(SDL_fatal_signals[i], NULL, &action); + if ( action.sa_handler == SIG_DFL ) { + action.sa_handler = SDL_Parachute; + sigaction(SDL_fatal_signals[i], &action, NULL); + } + } +#ifdef SIGALRM + /* Set SIGALRM to be ignored -- necessary on Solaris */ + sigaction(SIGALRM, NULL, &action); + if ( action.sa_handler == SIG_DFL ) { + action.sa_handler = SIG_IGN; + sigaction(SIGALRM, &action, NULL); + } +#endif +#else + void (*ohandler)(int); + + for ( i=0; SDL_fatal_signals[i]; ++i ) { + ohandler = signal(SDL_fatal_signals[i], SDL_Parachute); + if ( ohandler != SIG_DFL ) { + signal(SDL_fatal_signals[i], ohandler); + } + } +#endif /* HAVE_SIGACTION */ + return; +} + +void SDL_UninstallParachute(void) +{ + /* Remove a handler for any fatal signal handled */ + int i; +#ifdef HAVE_SIGACTION + struct sigaction action; + + for ( i=0; SDL_fatal_signals[i]; ++i ) { + sigaction(SDL_fatal_signals[i], NULL, &action); + if ( action.sa_handler == SDL_Parachute ) { + action.sa_handler = SIG_DFL; + sigaction(SDL_fatal_signals[i], &action, NULL); + } + } +#else + void (*ohandler)(int); + + for ( i=0; SDL_fatal_signals[i]; ++i ) { + ohandler = signal(SDL_fatal_signals[i], SIG_DFL); + if ( ohandler != SDL_Parachute ) { + signal(SDL_fatal_signals[i], ohandler); + } + } +#endif /* HAVE_SIGACTION */ +} + +#else + +/* No signals on this platform, nothing to do.. */ + +void SDL_InstallParachute(void) +{ + return; +} + +void SDL_UninstallParachute(void) +{ + return; +} + +#endif /* HAVE_SIGNAL_H */ Added: trunk/libs/SDL-1.2.13/src/audio/SDL_audio.c =================================================================== --- trunk/libs/SDL-1.2.13/src/audio/SDL_audio.c (rev 0) +++ trunk/libs/SDL-1.2.13/src/audio/SDL_audio.c 2008-08-05 22:28:59 UTC (rev 315) @@ -0,0 +1,695 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + sl...@li... +*/ +#include "SDL_config.h" + +/* Allow access to a raw mixing buffer */ + +#include "SDL.h" +#include "SDL_audio_c.h" +#include "SDL_audiomem.h" +#include "SDL_sysaudio.h" + +#ifdef __OS2__ +/* We'll need the DosSetPriority() API! */ +#define INCL_DOSPROCESS +#include <os2.h> +#endif + +/* Available audio drivers */ +static AudioBootStrap *bootstrap[] = { +#if SDL_AUDIO_DRIVER_BSD + &BSD_AUDIO_bootstrap, +#endif +#if SDL_AUDIO_DRIVER_OSS + &DSP_bootstrap, + &DMA_bootstrap, +#endif +#if SDL_AUDIO_DRIVER_ALSA + &ALSA_bootstrap, +#endif +#if SDL_AUDIO_DRIVER_PULSE + &PULSE_bootstrap, +#endif +#if SDL_AUDIO_DRIVER_QNXNTO + &QNXNTOAUDIO_bootstrap, +#endif +#if SDL_AUDIO_DRIVER_SUNAUDIO + &SUNAUDIO_bootstrap, +#endif +#if SDL_AUDIO_DRIVER_DMEDIA + &DMEDIA_bootstrap, +#endif +#if SDL_AUDIO_DRIVER_ARTS + &ARTS_bootstrap, +#endif +#if SDL_AUDIO_DRIVER_ESD + &ESD_bootstrap, +#endif +#if SDL_AUDIO_DRIVER_NAS + &NAS_bootstrap, +#endif +#if SDL_AUDIO_DRIVER_DSOUND + &DSOUND_bootstrap, +#endif +#if SDL_AUDIO_DRIVER_WAVEOUT + &WAVEOUT_bootstrap, +#endif +#if SDL_AUDIO_DRIVER_PAUD + &Paud_bootstrap, +#endif +#if SDL_AUDIO_DRIVER_BAUDIO + &BAUDIO_bootstrap, +#endif +#if SDL_AUDIO_DRIVER_COREAUDIO + &COREAUDIO_bootstrap, +#endif +#if SDL_AUDIO_DRIVER_SNDMGR + &SNDMGR_bootstrap, +#endif +#if SDL_AUDIO_DRIVER_MINT + &MINTAUDIO_GSXB_bootstrap, + &MINTAUDIO_MCSN_bootstrap, + &MINTAUDIO_STFA_bootstrap, + &MINTAUDIO_XBIOS_bootstrap, + &MINTAUDIO_DMA8_bootstrap, +#endif +#if SDL_AUDIO_DRIVER_DISK + &DISKAUD_bootstrap, +#endif +#if SDL_AUDIO_DRIVER_DUMMY + &DUMMYAUD_bootstrap, +#endif +#if SDL_AUDIO_DRIVER_DC + &DCAUD_bootstrap, +#endif +#if SDL_AUDIO_DRIVER_NDS + &NDSAUD_bootstrap, +#endif +#if SDL_AUDIO_DRIVER_MMEAUDIO + &MMEAUDIO_bootstrap, +#endif +#if SDL_AUDIO_DRIVER_DART + &DART_bootstrap, +#endif +#if SDL_AUDIO_DRIVER_EPOCAUDIO + &EPOCAudio_bootstrap, +#endif + NULL +}; +SDL_AudioDevice *current_audio = NULL; + +/* Various local functions */ +int SDL_AudioInit(const char *driver_name); +void SDL_AudioQuit(void); + +/* The general mixing thread function */ +int SDLCALL SDL_RunAudio(void *audiop) +{ + SDL_AudioDevice *audio = (SDL_AudioDevice *)audiop; + Uint8 *stream; + int stream_len; + void *udata; + void (SDLCALL *fill)(void *userdata,Uint8 *stream, int len); + int silence; + + /* Perform any thread setup */ + if ( audio->ThreadInit ) { + audio->ThreadInit(audio); + } + audio->threadid = SDL_ThreadID(); + + /* Set up the mixing function */ + fill = audio->spec.callback; + udata = audio->spec.userdata; + + if ( audio->convert.needed ) { + if ( audio->convert.src_format == AUDIO_U8 ) { + silence = 0x80; + } else { + silence = 0; + } + stream_len = audio->convert.len; + } else { + silence = audio->spec.silence; + stream_len = audio->spec.size; + } + +#ifdef __OS2__ + /* Increase the priority of this thread to make sure that + the audio will be continuous all the time! */ +#ifdef USE_DOSSETPRIORITY + if (SDL_getenv("SDL_USE_TIMECRITICAL_AUDIO")) + { +#ifdef DEBUG_BUILD + printf("[SDL_RunAudio] : Setting priority to TimeCritical+0! (TID%d)\n", SDL_ThreadID()); +#endif + DosSetPriority(PRTYS_THREAD, PRTYC_TIMECRITICAL, 0, 0); + } + else + { +#ifdef DEBUG_BUILD + printf("[SDL_RunAudio] : Setting priority to ForegroundServer+0! (TID%d)\n", SDL_ThreadID()); +#endif + DosSetPriority(PRTYS_THREAD, PRTYC_FOREGROUNDSERVER, 0, 0); + } +#endif +#endif + + /* Loop, filling the audio buffers */ + while ( audio->enabled ) { + + /* Fill the current buffer with sound */ + if ( audio->convert.needed ) { + if ( audio->convert.buf ) { + stream = audio->convert.buf; + } else { + continue; + } + } else { + stream = audio->GetAudioBuf(audio); + if ( stream == NULL ) { + stream = audio->fake_stream; + } + } + + SDL_memset(stream, silence, stream_len); + + if ( ! audio->paused ) { + SDL_mutexP(audio->mixer_lock); + (*fill)(udata, stream, stream_len); + SDL_mutexV(audio->mixer_lock); + } + + /* Convert the audio if necessary */ + if ( audio->convert.needed ) { + SDL_ConvertAudio(&audio->convert); + stream = audio->GetAudioBuf(audio); + if ( stream == NULL ) { + stream = audio->fake_stream; + } + SDL_memcpy(stream, audio->convert.buf, + audio->convert.len_cvt); + } + + /* Ready current buffer for play and change current buffer */ + if ( stream != audio->fake_stream ) { + audio->PlayAudio(audio); + } + + /* Wait for an audio buffer to become available */ + if ( stream == audio->fake_stream ) { + SDL_Delay((audio->spec.samples*1000)/audio->spec.freq); + } else { + audio->WaitAudio(audio); + } + } + + /* Wait for the audio to drain.. */ + if ( audio->WaitDone ) { + audio->WaitDone(audio); + } + +#ifdef __OS2__ +#ifdef DEBUG_BUILD + printf("[SDL_RunAudio] : Task exiting. (TID%d)\n", SDL_ThreadID()); +#endif +#endif + return(0); +} + +static void SDL_LockAudio_Default(SDL_AudioDevice *audio) +{ + if ( audio->thread && (SDL_ThreadID() == audio->threadid) ) { + return; + } + SDL_mutexP(audio->mixer_lock); +} + +static void SDL_UnlockAudio_Default(SDL_AudioDevice *audio) +{ + if ( audio->thread && (SDL_ThreadID() == audio->threadid) ) { + return; + } + SDL_mutexV(audio->mixer_lock); +} + +static Uint16 SDL_ParseAudioFormat(const char *string) +{ + Uint16 format = 0; + + switch (*string) { + case 'U': + ++string; + format |= 0x0000; + break; + case 'S': + ++string; + format |= 0x8000; + break; + default: + return 0; + } + switch (SDL_atoi(string)) { + case 8: + string += 1; + format |= 8; + break; + case 16: + string += 2; + format |= 16; + if ( SDL_strcmp(string, "LSB") == 0 +#if SDL_BYTEORDER == SDL_LIL_ENDIAN + || SDL_strcmp(string, "SYS") == 0 +#endif + ) { + format |= 0x0000; + } + if ( SDL_strcmp(string, "MSB") == 0 +#if SDL_BYTEORDER == SDL_BIG_ENDIAN + || SDL_strcmp(string, "SYS") == 0 +#endif + ) { + format |= 0x1000; + } + break; + default: + return 0; + } + return format; +} + +int SDL_AudioInit(const char *driver_name) +{ + SDL_AudioDevice *audio; + int i = 0, idx; + + /* Check to make sure we don't overwrite 'current_audio' */ + if ( current_audio != NULL ) { + SDL_AudioQuit(); + } + + /* Select the proper audio driver */ + audio = NULL; + idx = 0; +#if SDL_AUDIO_DRIVER_ESD + if ( (driver_name == NULL) && (SDL_getenv("ESPEAKER") != NULL) ) { + /* Ahem, we know that if ESPEAKER is set, user probably wants + to use ESD, but don't start it if it's not already running. + This probably isn't the place to do this, but... Shh! :) + */ + for ( i=0; bootstrap[i]; ++i ) { + if ( SDL_strcasecmp(bootstrap[i]->name, "esd") == 0 ) { +#ifdef HAVE_PUTENV + const char *esd_no_spawn; + + /* Don't start ESD if it's not running */ + esd_no_spawn = getenv("ESD_NO_SPAWN"); + if ( esd_no_spawn == NULL ) { + putenv("ESD_NO_SPAWN=1"); + } +#endif + if ( bootstrap[i]->available() ) { + audio = bootstrap[i]->create(0); + break; + } +#ifdef HAVE_UNSETENV + if ( esd_no_spawn == NULL ) { + unsetenv("ESD_NO_SPAWN"); + } +#endif + } + } + } +#endif /* SDL_AUDIO_DRIVER_ESD */ + if ( audio == NULL ) { + if ( driver_name != NULL ) { +#if 0 /* This will be replaced with a better driver selection API */ + if ( SDL_strrchr(driver_name, ':') != NULL ) { + idx = atoi(SDL_strrchr(driver_name, ':')+1); + } +#endif + for ( i=0; bootstrap[i]; ++i ) { + if (SDL_strcasecmp(bootstrap[i]->name, driver_name) == 0) { + if ( bootstrap[i]->available() ) { + audio=bootstrap[i]->create(idx); + break; + } + } + } + } else { + for ( i=0; bootstrap[i]; ++i ) { + if ( bootstrap[i]->available() ) { + audio = bootstrap[i]->create(idx); + if ( audio != NULL ) { + break; + } + } + } + } + if ( audio == NULL ) { + SDL_SetError("No available audio device"); +#if 0 /* Don't fail SDL_Init() if audio isn't available. + SDL_OpenAudio() will handle it at that point. *sigh* + */ + return(-1); +#endif + } + } + current_audio = audio; + if ( current_audio ) { + current_audio->name = bootstrap[i]->name; + if ( !current_audio->LockAudio && !current_audio->UnlockAudio ) { + current_audio->LockAudio = SDL_LockAudio_Default; + current_audio->UnlockAudio = SDL_UnlockAudio_Default; + } + } + return(0); +} + +char *SDL_AudioDriverName(char *namebuf, int maxlen) +{ + if ( current_audio != NULL ) { + SDL_strlcpy(namebuf, current_audio->name, maxlen); + return(namebuf); + } + return(NULL); +} + +int SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpec *obtained) +{ + SDL_AudioDevice *audio; + const char *env; + + /* Start up the audio driver, if necessary */ + if ( ! current_audio ) { + if ( (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0) || + (current_audio == NULL) ) { + return(-1); + } + } + audio = current_audio; + + if (audio->opened) { + SDL_SetError("Audio device is already opened"); + return(-1); + } + + /* Verify some parameters */ + if ( desired->freq == 0 ) { + env = SDL_getenv("SDL_AUDIO_FREQUENCY"); + if ( env ) { + desired->freq = SDL_atoi(env); + } + } + if ( desired->freq == 0 ) { + /* Pick some default audio frequency */ + desired->freq = 22050; + } + if ( desired->format == 0 ) { + env = SDL_getenv("SDL_AUDIO_FORMAT"); + if ( env ) { + desired->format = SDL_ParseAudioFormat(env); + } + } + if ( desired->format == 0 ) { + /* Pick some default audio format */ + desired->format = AUDIO_S16; + } + if ( desired->channels == 0 ) { + env = SDL_getenv("SDL_AUDIO_CHANNELS"); + if ( env ) { + desired->channels = (Uint8)SDL_atoi(env); + } + } + if ( desired->channels == 0 ) { + /* Pick a default number of channels */ + desired->channels = 2; + } + switch ( desired->channels ) { + case 1: /* Mono */ + case 2: /* Stereo */ + case 4: /* surround */ + case 6: /* surround with center and lfe */ + break; + default: + SDL_SetError("1 (mono) and 2 (stereo) channels supported"); + return(-1); + } + if ( desired->samples == 0 ) { + env = SDL_getenv("SDL_AUDIO_SAMPLES"); + if ( env ) { + desired->samples = (Uint16)SDL_atoi(env); + } + } + if ( desired->samples == 0 ) { + /* Pick a default of ~46 ms at desired frequency */ + int samples = (desired->freq / 1000) * 46; + int power2 = 1; + while ( power2 < samples ) { + power2 *= 2; + } + desired->samples = power2; + } + if ( desired->callback == NULL ) { + SDL_SetError("SDL_OpenAudio() passed a NULL callback"); + return(-1); + } + +#if SDL_THREADS_DISABLED + /* Uses interrupt driven audio, without thread */ +#else + /* Create a semaphore for locking the sound buffers */ + audio->mixer_lock = SDL_CreateMutex(); + if ( audio->mixer_lock == NULL ) { + SDL_SetError("Couldn't create mixer lock"); + SDL_CloseAudio(); + return(-1); + } +#endif /* SDL_THREADS_DISABLED */ + + /* Calculate the silence and size of the audio specification */ + SDL_CalculateAudioSpec(desired); + + /* Open the audio subsystem */ + SDL_memcpy(&audio->spec, desired, sizeof(audio->spec)); + audio->convert.needed = 0; + audio->enabled = 1; + audio->paused = 1; + + audio->opened = audio->OpenAudio(audio, &audio->spec)+1; + + if ( ! audio->opened ) { + SDL_CloseAudio(); + return(-1); + } + + /* If the audio driver changes the buffer size, accept it */ + if ( audio->spec.samples != desired->samples ) { + desired->samples = audio->spec.samples; + SDL_CalculateAudioSpec(desired); + } + + /* Allocate a fake audio memory buffer */ + audio->fake_stream = SDL_AllocAudioMem(audio->spec.size); + if ( audio->fake_stream == NULL ) { + SDL_CloseAudio(); + SDL_OutOfMemory(); + return(-1); + } + + /* See if we need to do any conversion */ + if ( obtained != NULL ) { + SDL_memcpy(obtained, &audio->spec, sizeof(audio->spec)); + } else if ( desired->freq != audio->spec.freq || + desired->format != audio->spec.format || + desired->channels != audio->spec.channels ) { + /* Build an audio conversion block */ + if ( SDL_BuildAudioCVT(&audio->convert, + desired->format, desired->channels, + desired->freq, + audio->spec.format, audio->spec.channels, + audio->spec.freq) < 0 ) { + SDL_CloseAudio(); + return(-1); + } + if ( audio->convert.needed ) { + audio->convert.len = (int) ( ((double) desired->size) / + audio->convert.len_ratio ); + audio->convert.buf =(Uint8 *)SDL_AllocAudioMem( + audio->convert.len*audio->convert.len_mult); + if ( audio->convert.buf == NULL ) { + SDL_CloseAudio(); + SDL_OutOfMemory(); + return(-1); + } + } + } + + /* Start the audio thread if necessary */ + switch (audio->opened) { + case 1: + /* Start the audio thread */ +#if (defined(__WIN32__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC) && !defined(__SYMBIAN32__) +#undef SDL_CreateThread + audio->thread = SDL_CreateThread(SDL_RunAudio, audio, NULL, NULL); +#else + audio->thread = SDL_CreateThread(SDL_RunAudio, audio); +#endif + if ( audio->thread == NULL ) { + SDL_CloseAudio(); + SDL_SetError("Couldn't create audio thread"); + return(-1); + } + break; + + default: + /* The audio is now playing */ + break; + } + + return(0); +} + +SDL_audiostatus SDL_GetAudioStatus(void) +{ + SDL_AudioDevice *audio = current_audio; + SDL_audiostatus status; + + status = SDL_AUDIO_STOPPED; + if ( audio && audio->enabled ) { + if ( audio->paused ) { + status = SDL_AUDIO_PAUSED; + } else { + status = SDL_AUDIO_PLAYING; + } + } + return(status); +} + +void SDL_PauseAudio (int pause_on) +{ + SDL_AudioDevice *audio = current_audio; + + if ( audio ) { + audio->paused = pause_on; + } +} + +void SDL_LockAudio (void) +{ + SDL_AudioDevice *audio = current_audio; + + /* Obtain a lock on the mixing buffers */ + if ( audio && audio->LockAudio ) { + audio->LockAudio(audio); + } +} + +void SDL_UnlockAudio (void) +{ + SDL_AudioDevice *audio = current_audio; + + /* Release lock on the mixing buffers */ + if ( audio && audio->UnlockAudio ) { + audio->UnlockAudio(audio); + } +} + +void SDL_CloseAudio (void) +{ + SDL_QuitSubSystem(SDL_INIT_AUDIO); +} + +void SDL_AudioQuit(void) +{ + SDL_AudioDevice *audio = current_audio; + + if ( audio ) { + audio->enabled = 0; + if ( audio->thread != NULL ) { + SDL_WaitThread(audio->thread, NULL); + } + if ( audio->mixer_lock != NULL ) { + SDL_DestroyMutex(audio->mixer_lock); + } + if ( audio->fake_stream != NULL ) { + SDL_FreeAudioMem(audio->fake_stream); + } + if ( audio->convert.needed ) { + SDL_FreeAudioMem(audio->convert.buf); + + } + if ( audio->opened ) { + audio->CloseAudio(audio); + audio->opened = 0; + } + /* Free the driver data */ + audio->free(audio); + current_audio = NULL; + } +} + +#define NUM_FORMATS 6 +static int format_idx; +static int format_idx_sub; +static Uint16 format_list[NUM_FORMATS][NUM_FORMATS] = { + { AUDIO_U8, AUDIO_S8, AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_U16LSB, AUDIO_U16MSB }, + { AUDIO_S8, AUDIO_U8, AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_U16LSB, AUDIO_U16MSB }, + { AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_U16LSB, AUDIO_U16MSB, AUDIO_U8, AUDIO_S8 }, + { AUDIO_S16MSB, AUDIO_S16LSB, AUDIO_U16MSB, AUDIO_U16LSB, AUDIO_U8, AUDIO_S8 }, + { AUDIO_U16LSB, AUDIO_U16MSB, AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_U8, AUDIO_S8 }, + { AUDIO_U16MSB, AUDIO_U16LSB, AUDIO_S16MSB, AUDIO_S16LSB, AUDIO_U8, AUDIO_S8 }, +}; + +Uint16 SDL_FirstAudioFormat(Uint16 format) +{ + for ( format_idx=0; format_idx < NUM_FORMATS; ++format_idx ) { + if ( format_list[format_idx][0] == format ) { + break; + } + } + format_idx_sub = 0; + return(SDL_NextAudioFormat()); +} + +Uint16 SDL_NextAudioFormat(void) +{ + if ( (format_idx == NUM_FORMATS) || (format_idx_sub == NUM_FORMATS) ) { + return(0); + } + return(format_list[format_idx][format_idx_sub++]); +} + +void SDL_CalculateAudioSpec(SDL_AudioSpec *spec) +{ + switch (spec->format) { + case AUDIO_U8: + spec->silence = 0x80; + break; + default: + spec->silence = 0x00; + break; + } + spec->size = (spec->format&0xFF)/8; + spec->size *= spec->channels; + spec->size *= spec->samples; +} Added: trunk/libs/SDL-1.2.13/src/audio/SDL_audio_c.h =================================================================== --- trunk/libs/SDL-1.2.13/src/audio/SDL_audio_c.h (rev 0) +++ trunk/libs/SDL-1.2.13/src/audio/SDL_audio_c.h 2008-08-05 22:28:59 UTC (rev 315) @@ -0,0 +1,34 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + sl...@li... +*/ +#include "SDL_config.h" + +/* Functions and variables exported from SDL_audio.c for SDL_sysaudio.c */ + +/* Functions to get a list of "close" audio formats */ +extern Uint16 SDL_FirstAudioFormat(Uint16 format); +extern Uint16 SDL_NextAudioFormat(void); + +/* Function to calculate the size and silence for a SDL_AudioSpec */ +extern void SDL_CalculateAudioSpec(SDL_AudioSpec *spec); + +/* The actual mixing thread function */ +extern int SDLCALL SDL_RunAudio(void *audiop); Added: trunk/libs/SDL-1.2.13/src/audio/SDL_audiocvt.c =================================================================== --- trunk/libs/SDL-1.2.13/src/audio/SDL_audiocvt.c (rev 0) +++ trunk/libs/SDL-1.2.13/src/audio/SDL_audiocvt.c 2008-08-05 22:28:59 UTC (rev 315) @@ -0,0 +1,1510 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + sl...@li... +*/ +#include "SDL_config.h" + +/* Functions for audio drivers to perform runtime conversion of audio format */ + +#include "SDL_audio.h" + + +/* Effectively mix right and left channels into a single channel */ +void SDLCALL SDL_ConvertMono(SDL_AudioCVT *cvt, Uint16 format) +{ + int i; + Sint32 sample; + +#ifdef DEBUG_CONVERT + fprintf(stderr, "Converting to mono\n"); +#endif + switch (format&0x8018) { + + case AUDIO_U8: { + Uint8 *src, *dst; + + src = cvt->buf; + dst = cvt->buf; + for ( i=cvt->len_cvt/2; i; --i ) { + sample = src[0] + src[1]; + *dst = (Uint8)(sample / 2); + src += 2; + dst += 1; + } + } + break; + + case AUDIO_S8: { + Sint8 *src, *dst; + + src = (Sint8 *)cvt->buf; + dst = (Sint8 *)cvt->buf; + for ( i=cvt->len_cvt/2; i; --i ) { + sample = src[0] + src[1]; + *dst = (Sint8)(sample / 2); + src += 2; + dst += 1; + } + } + break; + + case AUDIO_U16: { + Uint8 *src, *dst; + + src = cvt->buf; + dst = cvt->buf; + if ( (format & 0x1000) == 0x1000 ) { + for ( i=cvt->len_cvt/4; i; --i ) { + sample = (Uint16)((src[0]<<8)|src[1])+ + (Uint16)((src[2]<<8)|src[3]); + sample /= 2; + dst[1] = (sample&0xFF); + sample >>= 8; + dst[0] = (sample&0xFF); + src += 4; + dst += 2; + } + } else { + for ( i=cvt->len_cvt/4; i; --i ) { + sample = (Uint16)((src[1]<<8)|src[0])+ + (Uint16)((src[3]<<8)|src[2]); + sample /= 2; + dst[0] = (sample&0xFF); + sample >>= 8; + dst[1] = (sample&0xFF); + src += 4; + dst += 2; + } + } + } + break; + + case AUDIO_S16: { + Uint8 *src, *dst; + + src = cvt->buf; + dst = cvt->buf; + if ( (format & 0x1000) == 0x1000 ) { + for ( i=cvt->len_cvt/4; i; --i ) { + sample = (Sint16)((src[0]<<8)|src[1])+ + (Sint16)((src[2]<<8)|src[3]); + sample /= 2; + dst[1] = (sample&0xFF); + sample >>= 8; + dst[0] = (sample&0xFF); + src += 4; + dst += 2; + } + } else { + for ( i=cvt->len_cvt/4; i; --i ) { + sample = (Sint16)((src[1]<<8)|src[0])+ + (Sint16)((src[3]<<8)|src[2]); + sample /= 2; + dst[0] = (sample&0xFF); + sample >>= 8; + dst[1] = (sample&0xFF); + src += 4; + dst += 2; + } + } + } + break; + } + cvt->len_cvt /= 2; + if ( cvt->filters[++cvt->filter_index] ) { + cvt->filters[cvt->filter_index](cvt, format); + } +} + +/* Discard top 4 channels */ +void SDLCALL SDL_ConvertStrip(SDL_AudioCVT *cvt, Uint16 format) +{ + int i; + Sint32 lsample, rsample; + +#ifdef DEBUG_CONVERT + fprintf(stderr, "Converting down to stereo\n"); +#endif + switch (format&0x8018) { + + case AUDIO_U8: { + Uint8 *src, *dst; + + src = cvt->buf; + dst = cvt->buf; + for ( i=cvt->len_cvt/6; i; --i ) { + dst[0] = src[0]; + dst[1] = src[1]; + src += 6; + dst += 2; + } + } + break; + + case AUDIO_S8: { + Sint8 *src, *dst; + + src = (Sint8 *)cvt->buf; + dst = (Sint8 *)cvt->buf; + for ( i=cvt->len_cvt/6; i; --i ) { + dst[0] = src[0]; + dst[1] = src[1]; + src += 6; + dst += 2; + } + } + break; + + case AUDIO_U16: { + Uint8 *src, *dst; + + src = cvt->buf; + dst = cvt->buf; + if ( (format & 0x1000) == 0x1000 ) { + for ( i=cvt->len_cvt/12; i; --i ) { + lsample = (Uint16)((src[0]<<8)|src[1]); + rsample = (Uint16)((src[2]<<8)|src[3]); + dst[1] = (lsample&0xFF); + lsample >>= 8; + dst[0] = (lsample&0xFF); + dst[3] = (rsample&0xFF); + rsample >>= 8; + dst[2] = (rsample&0xFF); + src += 12; + dst += 4; + } + } else { + for ( i=cvt->len_cvt/12; i; --i ) { + lsample = (Uint16)((src[1]<<8)|src[0]); + rsample = (Uint16)((src[3]<<8)|src[2]); + dst[0] = (lsample&0xFF); + lsample >>= 8; + dst[1] = (lsample&0xFF); + dst[2] = (rsample&0xFF); + rsample >>= 8; + dst[3] = (rsample&0xFF); + src += 12; + dst += 4; + } + } + } + break; + + case AUDIO_S16: { + Uint8 *src, *dst; + + src = cvt->buf; + dst = cvt->buf; + if ( (format & 0x1000) == 0x1000 ) { + for ( i=cvt->len_cvt/12; i; --i ) { + lsample = (Sint16)((src[0]<<8)|src[1]); + rsample = (Sint16)((src[2]<<8)|src[3]); + dst[1] = (lsample&0xFF); + lsample >>= 8; + dst[0] = (lsample&0xFF); + dst[3] = (rsample&0xFF); + rsample >>= 8; + dst[2] = (rsample&0xFF); + src += 12; + dst += 4; + } + } else { + for ( i=cvt->len_cvt/12; i; --i ) { + lsample = (Sint16)((src[1]<<8)|src[0]); + rsample = (Sint16)((src[3]<<8)|src[2]); + dst[0] = (lsample&0xFF); + lsample >>= 8; + dst[1] = (lsample&0xFF); + dst[2] = (rsample&0xFF); + rsample >>= 8; + dst[3] = (rsample&0xFF); + src += 12; + dst += 4; + } + } + } + break; + } + cvt->len_cvt /= 3; + if ( cvt->filters[++cvt->filter_index] ) { + cvt->filters[cvt->filter_index](cvt, format); + } +} + + +/* Discard top 2 channels of 6 */ +void SDLCALL SDL_ConvertStrip_2(SDL_AudioCVT *cvt, Uint16 format) +{ + int i; + Sint32 lsample, rsample; + +#ifdef DEBUG_CONVERT + fprintf(stderr, "Converting 6 down to quad\n"); +#endif + switch (format&0x8018) { + + case AUDIO_U8: { + Uint8 *src, *dst; + + src = cvt->buf; + dst = cvt->buf; + for ( i=cvt->len_cvt/4; i; --i ) { + dst[0] = src[0]; + dst[1] = src[1]; + src += 4; + dst += 2; + } + } + break; + + case AUDIO_S8: { + Sint8 *src, *dst; + + src = (Sint8 *)cvt->buf; + dst = (Sint8 *)cvt->buf; + for ( i=cvt->len_cvt/4; i; --i ) { + dst[0] = src[0]; + dst[1] = src[1]; + src += 4; + dst += 2; + } + } + break; + + case AUDIO_U16: { + Uint8 *src, *dst; + + src = cvt->buf; + dst = cvt->buf; + if ( (format & 0x1000) == 0x1000 ) { + for ( i=cvt->len_cvt/8; i; --i ) { + lsample = (Uint16)((src[0]<<8)|src[1]); + rsample = (Uint16)((src[2]<<8)|src[3]); + dst[1] = (lsample&0xFF); + lsample >>= 8; + dst[0] = (lsample&0xFF); + dst[3] = (rsample&0xFF); + rsample >>= 8; + dst[2] = (rsample&0xFF); + src += 8; + dst += 4; + } + } else { + for ( i=cvt->len_cvt/8; i; --i ) { + lsample = (Uint16)((src[1]<<8)|src[0]); + rsample = (Uint16)((src[3]<<8)|src[2]); + dst[0] = (lsample&0xFF); + lsample >>= 8; + dst[1] = (lsample&0xFF); + dst[2] = (rsample&0xFF); + rsample >>= 8; + dst[3] = (rsample&0xFF); + src += 8; + dst += 4; + } + } + } + break; + + case AUDIO_S16: { + Uint8 *src, *dst; + + src = cvt->buf; + dst = cvt->buf; + if ( (format & 0x1000) == 0x1000 ) { + for ( i=cvt->len_cvt/8; i; --i ) { + lsample = (Sint16)((src[0]<<8)|src[1]); + rsample = (Sint16)((src[2]<<8)|src[3]); + dst[1] = (lsample&0xFF); + lsample >>= 8; + dst[0] = (lsample&0xFF); + dst[3] = (rsample&0xFF); + rsample >>= 8; + dst[2] = (rsample&0xFF); + src += 8; + dst += 4; + } + } else { + for ( i=cvt->len_cvt/8; i; --i ) { + lsample = (Sint16)((src[1]<<8)|src[0]); + rsample = (Sint16)((src[3]<<8)|src[2]); + dst[0] = (lsample&0xFF); + lsample >>= 8; + dst[1] = (lsample&0xFF); + dst[2] = (rsample&0xFF); + rsample >>= 8; + dst[3] = (rsample&0xFF); + src += 8; + dst += 4; + } + } + } + break; + } + cvt->len_cvt /= 2; + if ( cvt->filters[++cvt->filter_index] ) { + cvt->filters[cvt->filter_index](cvt, format); + } +} + +/* Duplicate a mono channel to both stereo channels */ +void SDLCALL SDL_ConvertStereo(SDL_AudioCVT *cvt, Uint16 format) +{ + int i; + +#ifdef DEBUG_CONVERT + fprintf(stderr, "Converting to stereo\n"); +#endif + if ( (format & 0xFF) == 16 ) { + Uint16 *src, *dst; + + src = (Uint16 *)(cvt->buf+cvt->len_cvt); + dst = (Uint16 *)(cvt->buf+cvt->len_cvt*2); + for ( i=cvt->len_cvt/2; i; --i ) { + dst -= 2; + src -= 1; + dst[0] = src[0]; + dst[1] = src[0]; + } + } else { + Uint8 *src, *dst; + + src = cvt->buf+cvt->len_cvt; + dst = cvt->buf+cvt->len_cvt*2; + for ( i=cvt->len_cvt; i; --i ) { + dst -= 2; + src -= 1; + dst[0] = src[0]; + dst[1] = src[0]; + } + } + cvt->len_cvt *= 2; + if ( cvt->filters[++cvt->filter_index] ) { + cvt->filters[cvt->filter_index](cvt, format); + } +} + + +/* Duplicate a stereo channel to a pseudo-5.1 stream */ +void SDLCALL SDL_ConvertSurround(SDL_AudioCVT *cvt, Uint16 format) +{ + int i; + +#ifdef DEBUG_CONVERT + fprintf(stderr, "Converting stereo to surround\n"); +#endif + switch (format&0x8018) { + + case AUDIO_U8: { + Uint8 *src, *dst, lf, rf, ce; + + src = (Uint8 *)(cvt->buf+cvt->len_cvt); + dst = (Uint8 *)(cvt->buf+cvt->len_cvt*3); + for ( i=cvt->len_cvt; i; --i ) { + dst -= 6; + src -= 2; + lf = src[0]; + rf = src[1]; + ce = (lf/2) + (rf/2); + dst[0] = lf; + dst[1] = rf; + dst[2] = lf - ce; + dst[3] = rf - ce; + dst[4] = ce; + dst[5] = ce; + } + } + break; + + case AUDIO_S8: { + Sint8 *src, *dst, lf, rf, ce; + + src = (Sint8 *)cvt->buf+cvt->len_cvt; + dst = (Sint8 *)cvt->buf+cvt->len_cvt*3; + for ( i=cvt->len_cvt; i; --i ) { + dst -= 6; + src -= 2; + lf = src[0]; + rf = src[1]; + ce = (lf/2) + (rf/2); + dst[0] = lf; + dst[1] = rf; + dst[2] = lf - ce; + dst[3] = rf - ce; + dst[4] = ce; + dst[5] = ce; + } + } + break; + + case AUDIO_U16: { + Uint8 *src, *dst; + Uint16 lf, rf, ce, lr, rr; + + src = cvt->buf+cvt->len_cvt; + dst = cvt->buf+cvt->len_cvt*3; + + if ( (format & 0x1000) == 0x1000 ) { + for ( i=cvt->len_cvt/4; i; --i ) { + dst -= 12; + src -= 4; + lf = (Uint16)((src[0]<<8)|src[1]); + rf = (Uint16)((src[2]<<8)|src[3]); + ce = (lf/2) + (rf/2); + rr = lf - ce; + lr = rf - ce; + dst[1] = (lf&0xFF); + dst[0] = ((lf>>8)&0xFF); + dst[3] = (rf&0xFF); + dst[2] = ((rf>>8)&0xFF); + + dst[1+4] = (lr&0xFF); + dst[0+4] = ((lr>>8)&0xFF); + dst[3+4] = (rr&0xFF); + dst[2+4] = ((rr>>8)&0xFF); + + dst[1+8] = (ce&0xFF); + dst[0+8] = ((ce>>8)&0xFF); + dst[3+8] = (ce&0xFF); + dst[2+8] = ((ce>>8)&0xFF); + } + } else { + for ( i=cvt->len_cvt/4; i; --i ) { + dst -= 12; + src -= 4; + lf = (Uint16)((src[1]<<8)|src[0]); + rf = (Uint16)((src[3]<<8)|src[2]); + ce = (lf/2) + (rf/2); + rr = lf - ce; + lr = rf - ce; + dst[0] = (lf&0xFF); + dst[1] = ((lf>>8)&0xFF); + dst[2] = (rf&0xFF); + dst[3] = ((rf>>8)&0xFF); + + dst[0+4] = (lr&0xFF); + dst[1+4] = ((lr>>8)&0xFF); + dst[2+4] = (rr&0xFF); + dst[3+4] = ((rr>>8)&0xFF); + + dst[0+8] = (ce&0xFF); + dst[1+8] = ((ce>>8)&0xFF); + dst[2+8] = (ce&0xFF); + dst[3+8] = ((ce>>8)&0xFF); + } + } + } + break; + + case AUDIO_S16: { + Uint8 *src, *dst; + Sint16 lf, rf, ce, lr, rr; + + src = cvt->buf+cvt->len_cvt; + dst = cvt->buf+cvt->len_cvt*3; + + if ( (format & 0x1000) == 0x1000 ) { + for ( i=cvt->len_cvt/4; i; --i ) { + dst -= 12; + src -= 4; + lf = (Sint16)((src[0]<<8)|src[1]); + rf = (Sint16)((src[2]<<8)|src[3]); + ce = (lf/2) + (rf/2); + rr = lf - ce; + lr = rf - ce; + dst[1] = (lf&0xFF); + dst[0] = ((lf>>8)&0xFF); + dst[3] = (rf&0xFF); + dst[2] = ((rf>>8)&0xFF); + + dst[1+4] = (lr&0xFF); + dst[0+4] = ((lr>>8)&0xFF); + dst[3+4] = (rr&0xFF); + dst[2+4] = ((rr>>8)&0xFF); + + dst[1+8] = (ce&0xFF); + dst[0+8] = ((ce>>8)&0xFF); + dst[3+8] = (ce&0xFF); + dst[2+8] = ((ce>>8)&0xFF); + } + } else { + for ( i=cvt->len_cvt/4; i; --i ) { + dst -= 12; + src -= 4; + lf = (Sint16)((src[1]<<8)|src[0]); + rf = (Sint16)((src[3]<<8)|src[2]); + ce = (lf/2) + (rf/2); + rr = lf - ce; + lr = rf - ce; + dst[0] = (lf&0xFF); + dst[1] = ((lf>>8)&0xFF); + dst[2] = (rf&0xFF); + dst[3] = ((rf>>8)&0xFF); + + dst[0+4] = (lr&0xFF); + dst[1+4] = ((lr>>8)&0xFF); + dst[2+4] = (rr&0xFF); + dst[3+4] = ((rr>>8)&0xFF); + + dst[0+8] = (ce&0xFF); + dst[1+8] = ((ce>>8)&0xFF); + dst[2+8] = (ce&0xFF); + dst[3+8] = ((ce>>8)&0xFF); + } + } + } + break; + } + cvt->len_cvt *= 3; + if ( cvt->filters[++cvt->filter_index] ) { + cvt->filters[cvt->filter_index](cvt, format); + } +} + + +/* Duplicate a stereo channel to a pseudo-4.0 stream */ +void SDLCALL SDL_ConvertSurround_4(SDL_AudioCVT *cvt, Uint16 format) +{ + int i; + +#ifdef DEBUG_CONVERT + fprintf(stderr, "Converting stereo to quad\n"); +#endif + switch (format&0x8018) { + + case AUDIO_U8: { + Uint8 *src, *dst, lf, rf, ce; + + src = (Uint8 *)(cvt->buf+cvt->len_cvt); + dst = (Uint8 *)(cvt->buf+cvt->len_cvt*2); + for ( i=cvt->len_cvt; i; --i ) { + dst -= 4; + src -= 2; + lf = src[0]; + rf = src[1]; + ce = (lf/2) + (rf/2); + dst[0] = lf; + dst[1] = rf; + dst[2] = lf - ce; + dst[3] = rf - ce; + } + } + break; + + case AUDIO_S8: { + Sint8 *src, *dst, lf, rf, ce; + + src = (Sint8 *)cvt->buf+cvt->len_cvt; + dst = (Sint8 *)cvt->buf+cvt->len_cvt*2; + for ( i=cvt->len_cvt; i; --i ) { + dst -= 4; + src -= 2; + lf = src[0]; + rf = src[1]; + ce = (lf/2) + (rf/2); + dst[0] = lf; + dst[1] = rf; + dst[2] = lf - ce; + dst[3] = rf - ce; + } + } + break; + + case AUDIO_U16: { + Uint8 *src, *dst; + Uint16 lf, rf, ce, lr, rr; + + src = cvt->buf+cvt->len_cvt; + dst = cvt->buf+cvt->len_cvt*2; + + if ( (format & 0x1000) == 0x1000 ) { + for ( i=cvt->len_cvt/4; i; --i ) { + dst -= 8; + src -= 4; + lf = (Uint16)((src[0]<<8)|src[1]); + rf = (Uint16)((src[2]<<8)|src[3]); + ce = (lf/2) + (rf/2); + rr = lf - ce; + lr = rf - ce; + dst[1] = (lf&0xFF); + dst[0] = ((lf>>8)&0xFF); + dst[3] = (rf&0xFF); + dst[2] = ((rf>>8)&0xFF); + + dst[1+4] = (lr&0xFF); + dst[0+4] = ((lr>>8)&0xFF); + dst[3+4] = (rr&0xFF); + dst[2+4] = ((rr>>8)&0xFF); + } + } else { + for ( i=cvt->len_cvt/4; i; --i ) { + dst -= 8; + src -= 4; + lf = (Uint16)((src[1]<<8)|src[0]); + rf = (Uint16)((src[3]<<8)|src[2]); + ce = (lf/2) + (rf/2); + rr = lf - ce; + lr = rf - ce; + dst[0] = (lf&0xFF); + dst[1] = ((lf>>8)&0xFF); + dst[2] = (rf&0xFF); + dst[3] = ((rf>>8)&0xFF); + + dst[0+4] = (lr&0xFF); + dst[1+4] = ((lr>>8)&0xFF); + dst[2+4] = (rr&0xFF); + dst[3+4] = ((rr>>8)&0xFF); + } + } + } + break; + + case AUDIO_S16: { + Uint8 *src, *dst; + Sint16 lf, rf, ce, lr, rr; + + src = cvt->buf+cvt->len_cvt; + dst = cvt->buf+cvt->len_cvt*2; + + if ( (format & 0x1000) == 0x1000 ) { + for ( i=cvt->len_cvt/4; i; --i ) { + dst -= 8; + src -= 4; + lf = (Sint16)((src[0]<<8)|src[1]); + rf = (Sint16)((src[2]<<8)|src[3]); + ce = (lf/2) + (rf/2); + rr = lf - ce; + lr = rf - ce; + dst[1] = (lf&0xFF); + dst[0] = ((lf>>8)&0xFF); + dst[3] = (rf&0xFF); + dst[2] = ((rf>>8)&0xFF); + + dst[1+4] = (lr&0xFF); + dst[0+4] = ((lr>>8)&0xFF); + dst[3+4] = (rr&0xFF); + dst[2+4] = ((rr>>8)&0xFF); + } + } else { + for ( i=cvt->len_cvt/4; i; --i ) { + dst -= 8; + src -= 4; + lf = (Sint16)((src[1]<<8)|src[0]); + rf = (Sint16)((src[3]<<8)|src[2]); + ce = (lf/2) + (rf/2); + rr = lf - ce; + lr = rf - ce; + dst[0] = (lf&0xFF); + dst[1] = ((lf>>8)&0xFF); + dst[2] = (rf&0xFF); + dst[3] = ((rf>>8)&0xFF); + + dst[0+4] = (lr&0xFF); + dst[1+4] = ((lr>>8)&0xFF); + dst[2+4] = (rr&0xFF); + dst[3+4] = ((rr>>8)&0xFF); + } + } + } + break; + } + cvt->len_cvt *= 2; + if ( cvt->filters[++cvt->filter_index] ) { + cvt->filters[cvt->filter_index](cvt, format); + } +} + + +/* Convert 8-bit to 16-bit - LSB */ +void SDLCALL SDL_Convert16LSB(SDL_AudioCVT *cvt, Uint16 format) +{ + int i; + Uint8 *src, *dst; + +#ifdef DEBUG_CONVERT + fprintf(stderr, "Converting to 16-bit LSB\n"); +#endif + src = cvt->buf+cvt->len_cvt; + dst = cvt->buf+cvt->len_cvt*2; + for ( i=cvt->len_cvt; i; --i ) { + src -= 1; + dst -= 2; + dst[1] = *src; + dst[0] = 0; + } + format = ((format & ~0x0008) | AUDIO_U16LSB); + cvt->len_cvt *= 2; + if ( cvt->filters[++cvt->filter_index] ) { + cvt->filters[cvt->filter_index](cvt, format); + } +} +/* Convert 8-bit to 16-bit - MSB */ +void SDLCALL SDL_Convert16MSB(SDL_AudioCVT *cvt, Uint16 format) +{ + int i; + Uint8 *src, *dst; + +#ifdef DEBUG_CONVERT + fprintf(stderr, "Converting to 16-bit MSB\n"); +#endif + src = cvt->buf+cvt->len_cvt; + dst = cvt->buf+cvt->len_cvt*2; + for ( i=cvt->len_cvt; i; --i ) { + src -= 1; + dst -= 2; + dst[0] = *src; + dst[1] = 0; + } + format = ((format & ~0x0008) | AUDIO_U16MSB); + cvt->len_cvt *= 2; + if ( cvt->filters[++cvt->filter_index] ) { + cvt->filters[cvt->filter_index](cvt, format); + } +} + +/* Convert 16-bit to 8-bit */ +void SDLCALL SDL_Convert8(SDL_AudioCVT *cvt, Uint16 format) +{ + int i; + Uint8 *src, *dst; + +#ifdef DEBUG_CONVERT + fprintf(stderr, "Converting to 8-bit\n"); +#endif + src = cvt->buf; + dst = cvt->buf; + if ( (format & 0x1000) != 0x1000 ) { /* Little endian */ + ++src; + } + for ( i=cvt->len_cvt/2; i; --i ) { + *dst = *src; + src += 2; + dst += 1; + } + format = ((format & ~0x9010) | AUDIO_U8); + cvt->len_cvt /= 2; + if ( cvt->filters[++cvt->filter_index] ) { + cvt->filters[cvt->filter_index](cvt, format); + } +} + +/* Toggle signed/unsigned */ +void SDLCALL SDL_ConvertSign(SDL_AudioCVT *cvt, Uint16 format) +{ + int i; + Uint8 *data; + +#ifdef DEBUG_CONVERT + fprintf(stderr, "Converting audio signedness\n"); +#endif + data = cvt->buf; + if ( (format & 0xFF) == 16 ) { + if ( (format & 0x1000) != 0x1000 ) { /* Little endian */ + ++data; + } + for ( i=cvt->len_cvt/2; i; --i ) { + *data ^= 0x80; + data += 2; + } + } else { + for ( i=cvt->len_cvt; i; --i ) { + *data++ ^= 0x80; + } + } + format = (format ^ 0x8000); + if ( cvt->filters[++cvt->filter_index] ) { + cvt->filters[cvt->filter_index](cvt, format); + } +} + +/* Toggle endianness */ +void SDLCALL SDL_ConvertEndian(SDL_AudioCVT *cvt, Uint16 format) +{ + int i; + Uint8 *data, tmp; + +#ifdef DEBUG_CONVERT + fprintf(stderr, "Converting audio endianness\n"); +#endif + data = cvt->buf; + for ( i=cvt->len_cvt/2; i; --i ) { + tmp = data[0]; + data[0] = data[1]; + data[1] = tmp; + data += 2; + } + format = (format ^ 0x1000); + if ( cvt->filters[++cvt->filter_index] ) { + cvt->filters[cvt->filter_index](cvt, format); + } +} + +/* Convert rate up by multiple of 2 */ +void SDLCALL SDL_RateMUL2(SDL_AudioCVT *cvt, Uint16 format) +{ + int i; + Uint8 *src, *dst; + +#ifdef DEBUG_CONVERT + fprintf(stderr, "Converting audio rate * 2\n"); +#endif + src = cvt->buf+cvt->len_cvt; + dst = cvt->buf+cvt->len_cvt*2; + switch (format & 0xFF) { + case 8: + for ( i=cvt->len_cvt; i; --i ) { + src -= 1; + dst -= 2; + dst[0] = src[0]; + dst[1] = src[0]; + } + break; + case 16: + for ( i=cvt->len_cvt/2; i; --i ) { + src -= 2; + dst -= 4; + dst[0] = src[0]; + dst[1] = src[1]; + dst[2] = src[0]; + dst[3] = src[1]; + } + break; + } + cvt->len_cvt *= 2; + if ( cvt->filters[++cvt->filter_index] ) { + cvt->filters[cvt->filter_index](cvt, format); + } +} + + +/* Convert rate up by multiple of 2, for stereo */ +void SDLCALL SDL_RateMUL2_c2(SDL_AudioCVT *cvt, Uint16 format) +{ + int i; + Uint8 *src, *dst; + +#ifdef DEBUG_CONVERT + fprintf(stderr, "Converting audio rate * 2\n"); +#endif + src = cvt->buf+cvt->len_cvt; + dst = cvt->buf+cvt->len_cvt*2; + switch (format & 0xFF) { + case 8: + for ( i=cvt->len_cvt/2; i; --i ) { + src -= 2; + dst -= 4; + dst[0] = src[0]; + dst[1] = src[1]; + dst[2] = src[0]; + dst[3] = src[1]; + } + break; + case 16: + for ( i=cvt->len_cvt/4; i; --i ) { + src -= 4; + dst -= 8; + dst[0] = src[0]; + dst[1] = src[1]; + dst[2] = src[2]; + dst[3] = src[3]; + dst[4] = src[0]; + dst[5] = src[1]; + dst[6] = src[2]; + dst[7] = src[3]; + } ... [truncated message content] |
From: <sen...@us...> - 2008-08-05 22:15:34
|
Revision: 314 http://open2x.svn.sourceforge.net/open2x/?rev=314&view=rev Author: senquack Date: 2008-08-05 22:15:37 +0000 (Tue, 05 Aug 2008) Log Message: ----------- Update Paeryn's 1.2.9 HW SDL to 1.2.13 Added Paths: ----------- trunk/libs/SDL-1.2.13/BUGS trunk/libs/SDL-1.2.13/Borland.html trunk/libs/SDL-1.2.13/Borland.zip trunk/libs/SDL-1.2.13/COPYING trunk/libs/SDL-1.2.13/CREDITS trunk/libs/SDL-1.2.13/MPWmake.sea.bin trunk/libs/SDL-1.2.13/Makefile.dc trunk/libs/SDL-1.2.13/Makefile.in trunk/libs/SDL-1.2.13/Makefile.minimal trunk/libs/SDL-1.2.13/README trunk/libs/SDL-1.2.13/README-SDL.txt trunk/libs/SDL-1.2.13/README.AmigaOS trunk/libs/SDL-1.2.13/README.BeOS trunk/libs/SDL-1.2.13/README.CVS trunk/libs/SDL-1.2.13/README.DC trunk/libs/SDL-1.2.13/README.MacOS trunk/libs/SDL-1.2.13/README.MacOSX trunk/libs/SDL-1.2.13/README.NDS trunk/libs/SDL-1.2.13/README.NanoX trunk/libs/SDL-1.2.13/README.OS2 trunk/libs/SDL-1.2.13/README.PicoGUI trunk/libs/SDL-1.2.13/README.QNX trunk/libs/SDL-1.2.13/README.Qtopia trunk/libs/SDL-1.2.13/README.RISCOS trunk/libs/SDL-1.2.13/README.Symbian trunk/libs/SDL-1.2.13/README.Watcom trunk/libs/SDL-1.2.13/README.wscons trunk/libs/SDL-1.2.13/SDL.qpg.in trunk/libs/SDL-1.2.13/SDL.spec trunk/libs/SDL-1.2.13/SDL.spec.in trunk/libs/SDL-1.2.13/TODO trunk/libs/SDL-1.2.13/VisualC.html trunk/libs/SDL-1.2.13/VisualC.zip trunk/libs/SDL-1.2.13/Watcom-OS2.zip trunk/libs/SDL-1.2.13/Watcom-Win32.zip trunk/libs/SDL-1.2.13/WhatsNew trunk/libs/SDL-1.2.13/acinclude.m4 trunk/libs/SDL-1.2.13/aclocal.m4 trunk/libs/SDL-1.2.13/autogen.sh trunk/libs/SDL-1.2.13/build-scripts/ trunk/libs/SDL-1.2.13/configure trunk/libs/SDL-1.2.13/configure.in trunk/libs/SDL-1.2.13/docs/ trunk/libs/SDL-1.2.13/docs.html trunk/libs/SDL-1.2.13/include/ trunk/libs/SDL-1.2.13/sdl.pc trunk/libs/SDL-1.2.13/sdl.pc.in trunk/libs/SDL-1.2.13/symbian.zip Added: trunk/libs/SDL-1.2.13/BUGS =================================================================== --- trunk/libs/SDL-1.2.13/BUGS (rev 0) +++ trunk/libs/SDL-1.2.13/BUGS 2008-08-05 22:15:37 UTC (rev 314) @@ -0,0 +1,18 @@ + +Bugs are now managed in the SDL bug tracker, here: + + http://bugzilla.libsdl.org/ + +You may report bugs there, and search to see if a given issue has already + been reported, discussed, and maybe even fixed. + + + +You may also find help at the SDL mailing list. Subscription information: + + http://lists.libsdl.org/listinfo.cgi/sdl-libsdl.org + +Bug reports are welcome here, but we really appreciate if you use Bugzilla, as + bugs discussed on the mailing list may be forgotten or missed. + + Added: trunk/libs/SDL-1.2.13/Borland.html =================================================================== --- trunk/libs/SDL-1.2.13/Borland.html (rev 0) +++ trunk/libs/SDL-1.2.13/Borland.html 2008-08-05 22:15:37 UTC (rev 314) @@ -0,0 +1,139 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <title>Building SDL with Borland's C++ compilers</title> + + <meta name="author" + content="David Snopek and updated by Dominique Louis."> +</head> + <body> + <xevol @newtonave.net=""> </xevol> +<h1>Building SDL with Borland's C++ compilers. </h1> + <b> by <a href="mailto:xe...@us..."> David Snopek</a></b> + and updated by <b><a href="mailto:Dom...@Sa...">Dominique + Louis</a></b> ( Last updated : 30th June 2003 ).<br> + <br> + These instructions cover how to compile SDL and its included test +programs using either Borland <a href="#bcbwin">C++ Builder 5, 6 for Windows</a>, + <a href="#k3">C++ Builder for Linux ( AKA Kylix 3 )</a> or the free <a + href="#bccc">Borland C++ command-line compiler</a>. <br> + +<h3> <b> Extract the files </b> </h3> + +<p> Unzip the Borland.zip archive into <b>this</b> directory. Do not unzip + it into any other directory because the makefiles ( *.mak ) and project + files ( *.bpr ) use relative paths to refer to the SDL sources. This should + create a directory named "Borland" inside of the top level SDL source directory. + </p> + +<h3> <b><a name="bcbwin"></a> Using Borland C++ Builder 5, 6 for Windows </b> +</h3> + +<p> Inside of the "Borland" directory there is a "bcb6" directory that contains + a number of Builder project files. Double-click on the "libSDL.bpg" file + icon. Once Builder has started click on the "<u>P</u>rojects" menu on +the menu-bar and go down to "B<u>u</u>ild All Projects" option. <br> + This will proceed to build SDL ( with Borland's calling convention ), +SDLmain, and all the <a href="#tests">test programs</a>. Currently, all +the <a href="#tests">test programs</a> are dynamically linked to Sam Lantinga's +SDL.dll.</p> + +<p><b>NOTE :</b> Borland's "lib" format and Microsoft's "lib" format are incompatible. + <br> + If you wish to dynamically link to the SDL library supplied by Sam Lantinga + in each release, I have created the correct *.libs for SDL 1.2.4 and they + exist in the "/lib" directory.<br> + If you would like to create the *.lib files yourself, you will need to +make use of Borland's "implib.exe" utility.<br> + </p> + +<p><tt>IMPLIB</tt> works like this: </p> + +<pre> IMPLIB (destination lib name) (source dll)<br></pre> + +<p> For example,</p> + +<pre> IMPLIB SDL.lib SDL.dll<br></pre> + +<p>This assumes that SDL.dll was compiled with Visual C++ or similar.<br> + </p> + +<p>To learn more about the difference between Borland's and Microsoft's *.lib + format please read the article <a + href="http://www.bcbdev.com/articles/vcdll.htm">here</a>.<br> + </p> + +<p> <b><br> + NOTE :</b> The C++ Builder for Windows project format, is not compatible + with the Kylix 3 project format, hence the reason why they are in separate + directories.</p> + +<h3> <b><a name="bccc"></a> Using the free Borland C++ command-line compiler + </b> </h3> + +<p> The free Borland compiler can be downloaded at no charge from <a + href="http://www.borland.com/bcppbuilder/freecompiler/"> the Borland website + </a>. Make sure that it is installed and properly configured. </p> + +<p> Open an MS-DOS Prompt. Change to the "Borland\freebcc" directory under + the SDL source directory. Type "make -f SDL.mak" to build SDL and "make + -f SDLmain.mak". There are also makefiles for all of the <a + href="#tests">test programs</a>, if you wish to build them. All .exes and +DLLs are created in the "test" SDL directory. Ify ou would like to create +the DLL and all the test applications, I have thrown together a basic batchfile +called "makeall.bat" which should create everything in the right order. </p> + +<h3> <b> Output files </b> </h3> + No matter which compiler you used, three important files should have + been produced: +<ul> + <li> SDL.dll ( Borland format ) </li> + <li> SDL.lib ( Borland format ) </li> + <li> SDLmain.lib ( Borland format ) </li> + +</ul> + Both of the *.lib files will need to be added to all the projects +that use SDL and SDL.dll must be placed some where the Windows dynamic +linker can find it (either in your project directory or on the system +path, C:\WINDOWS\SYSTEM). +<h3> <b><a name="k3"></a> Using Borland C++ Builder for Linux ( AKA Kylix + 3 ) </b> </h3> + +<p> Inside of the "Borland" directory there is a "k3" directory that contains + a number of Builder project files. Double-click on the "libSDL.bpg" file + icon. Once Builder has started click on the "<u>P</u>rojects" menu on +the menu-bar and go down to "B<u>u</u>ild All Projects" option. This will +proceed to build all the <a href="#tests">test programs</a>. <br> + Linux users do not need *.lib files as the Shared Object is linked right + into the project ( very neat actually, Windows should do this sort of thing + as it is a lot easier for the developer ). <br> + <b>NOTE :</b> The C++ Builder for Windows project format, is not + compatible with the Kylix 3 project format, hence the reason why they are + in separate directories.</p> + +<p> On Mandrake 8.1 the shared objects for SDL are located in the /usr/lib + directory as libSDL_*.so and the Mesa OpenGL shared objects are located +in /usr/X11R6/lib as libGL*.so<br> + <br> + So if your setup is different you may need to change the project file + so that they re-link to the ones on your system.<br> + <br> + On Mandrake 8.1 the headers files are located at /usr/include/SDL/. + So if you you have not installed the development RPMs ( usually named libSDL-devel* + ) for SDL ( not included ) you may have to change the include directory + within some of the projects.<br> + </p> + +<h3> Known Problems</h3> + The only known problem is that I ( Dominique Louis ), was unable to +create the projects that rebuilt the SDL shared objects under Linux, due +to time constraints and my lack of intimate knowledge of Linux. +<h3><a name="tests"><b> Test programs </b> </a></h3> + Some of the test programs require included media files ( *.wav; *.bmp +etc ). All the test programs are now created in the "test" directory, where +the media files are ( usually ) so they should be ready to go. <br> + <br> + <br> + <br> +</body> +</html> Property changes on: trunk/libs/SDL-1.2.13/Borland.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/libs/SDL-1.2.13/COPYING =================================================================== --- trunk/libs/SDL-1.2.13/COPYING (rev 0) +++ trunk/libs/SDL-1.2.13/COPYING 2008-08-05 22:15:37 UTC (rev 314) @@ -0,0 +1,458 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS Added: trunk/libs/SDL-1.2.13/CREDITS =================================================================== --- trunk/libs/SDL-1.2.13/CREDITS (rev 0) +++ trunk/libs/SDL-1.2.13/CREDITS 2008-08-05 22:15:37 UTC (rev 314) @@ -0,0 +1,92 @@ + +Simple DirectMedia Layer CREDITS +Thanks to everyone who made this possible, including: + +* Cliff Matthews, for giving me a reason to start this project. :) + -- Executor rocks! *grin* + +* Scott Call, for making a home for SDL on the 'Net... Thanks! :) + +* The Linux Fund, C Magazine, Educational Technology Resources Inc., + Gareth Noyce, Jesse Pavel, Keith Kitchin, Jeremy Horvath, Thomas Nicholson, + Hans-Peter Gygax, the Eternal Lands Development Team, Lars Brubaker, + and Phoenix Kokido for financial contributions + +* Ga\xEBtan de Menten for writing the PHP and SQL behind the SDL website + +* Tim Jones for the new look of the SDL website + +* Marco Kraus for setting up SDL merchandise + +* Martin Donlon for his work on the SDL Documentation Project + +* Ryan Gordon for helping everybody out and keeping the dream alive. :) + +* Mattias Engdeg\xE5rd, for help with the Solaris port and lots of other help + +* Max Watson, Matt Slot, and Kyle for help with the MacOS Classic port + +* Stan Shebs, for the initial Mac OS X port + +* Eric Wing, Max Horn, and Darrell Walisser for unflagging work on the Mac OS X port + +* Patrick Trainor, Jim Boucher, and Mike Gorchak for the QNX Neutrino port + +* Carsten Griwodz for the AIX port + +* Gabriele Greco, for the Amiga port + +* Patrice Mandin, for the Atari port + +* Hannu Viitala for the EPOC port + +* Marcus Mertama for the S60 port. + +* Peter Valchev for nagging me about the OpenBSD port until I got it right. :) + +* Kent B Mein, for a place to do the IRIX port + +* Ash, for a place to do the OSF/1 Alpha port + +* David Sowsy, for help with the BeOS port + +* Eugenia Loli, for endless work on porting SDL games to BeOS + +* Jon Taylor for the GGI front-end + +* Paulus Esterhazy, for the Visual C++ testing and libraries + +* Brenda Tantzen, for Metrowerks CodeWarrior on MacOS + +* Chris Nentwich, for the Hermes assembly blitters + +* Michael Vance and Jim Kutter for the X11 OpenGL support + +* Stephane Peter, for the AAlib front-end and multi-threaded timer idea. + +* Jon Atkins for SDL_image, SDL_mixer and SDL_net documentation + +* Peter Wiklund, for the 1998 winning SDL logo, + and Arto Hamara, Steven Wong, and Kent Mein for other logo entries. + +* Arne Claus, for the 2004 winning SDL logo, + and Shandy Brown, Jac, Alex Lyman, Mikkel Gjoel, #Guy, Jonas Hartmann, + Daniel Liljeberg, Ronald Sowa, DocD, Pekka Jaervinen, Patrick Avella, + Erkki Kontilla, Levon Gavalian, Hal Emerich, David Wiktorsson, + S. Schury and F. Hufsky, Ciska de Ruyver, Shredweat, Tyler Montbriand, + Martin Andersson, Merlyn Wysard, Fernando Ibanez, David Miller, + Andre Bommele, lovesby.com, Francisco Camenforte Torres, and David Igreja + for other logo entries. + +* Bob Pendleton and David Olofson for being long time contributors to + the SDL mailing list. + +* Everybody at Loki Software, Inc. for their great contributions! + + And a big hand to everyone else who gave me appreciation, advice, + and suggestions, especially the good folks on the SDL mailing list. + +THANKS! :) + + -- Sam Lantinga <sl...@li...> + Property changes on: trunk/libs/SDL-1.2.13/MPWmake.sea.bin ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/libs/SDL-1.2.13/Makefile.dc =================================================================== --- trunk/libs/SDL-1.2.13/Makefile.dc (rev 0) +++ trunk/libs/SDL-1.2.13/Makefile.dc 2008-08-05 22:15:37 UTC (rev 314) @@ -0,0 +1,111 @@ +#GL=1 + +CC = sh-elf-gcc +AR = sh-elf-ar + +ifdef GL +DEFS += -DSDL_VIDEO_OPENGL=1 +TARGET = libSDL_gl.a +else +TARGET = libSDL.a +endif + +CFLAGS=$(KOS_CFLAGS) $(DEFS) -Iinclude + +SRCS = \ + src/audio/dc/SDL_dcaudio.c \ + src/audio/dc/aica.c \ + src/audio/dummy/SDL_dummyaudio.c \ + src/audio/SDL_audio.c \ + src/audio/SDL_audiocvt.c \ + src/audio/SDL_audiodev.c \ + src/audio/SDL_mixer.c \ + src/audio/SDL_wave.c \ + src/cdrom/dc/SDL_syscdrom.c \ + src/cdrom/SDL_cdrom.c \ + src/events/SDL_active.c \ + src/events/SDL_events.c \ + src/events/SDL_expose.c \ + src/events/SDL_keyboard.c \ + src/events/SDL_mouse.c \ + src/events/SDL_quit.c \ + src/events/SDL_resize.c \ + src/file/SDL_rwops.c \ + src/joystick/dc/SDL_sysjoystick.c \ + src/joystick/SDL_joystick.c \ + src/loadso/dummy/SDL_sysloadso.c \ + src/SDL.c \ + src/SDL_error.c \ + src/SDL_fatal.c \ + src/stdlib/SDL_getenv.c \ + src/stdlib/SDL_iconv.c \ + src/stdlib/SDL_malloc.c \ + src/stdlib/SDL_qsort.c \ + src/stdlib/SDL_stdlib.c \ + src/stdlib/SDL_string.c \ + src/thread/dc/SDL_syscond.c \ + src/thread/dc/SDL_sysmutex.c \ + src/thread/dc/SDL_syssem.c \ + src/thread/dc/SDL_systhread.c \ + src/thread/SDL_thread.c \ + src/timer/dc/SDL_systimer.c \ + src/timer/SDL_timer.c \ + src/video/dc/SDL_dcevents.c \ + src/video/dc/SDL_dcvideo.c \ + src/video/dummy/SDL_nullevents.c \ + src/video/dummy/SDL_nullmouse.c \ + src/video/dummy/SDL_nullvideo.c \ + src/video/SDL_blit.c \ + src/video/SDL_blit_0.c \ + src/video/SDL_blit_1.c \ + src/video/SDL_blit_A.c \ + src/video/SDL_blit_N.c \ + src/video/SDL_bmp.c \ + src/video/SDL_cursor.c \ + src/video/SDL_gamma.c \ + src/video/SDL_pixels.c \ + src/video/SDL_RLEaccel.c \ + src/video/SDL_stretch.c \ + src/video/SDL_surface.c \ + src/video/SDL_video.c \ + src/video/SDL_yuv.c \ + src/video/SDL_yuv_sw.c \ + +OBJS = $(SRCS:.c=.o) + +TEST = \ + test/checkkeys.c \ + test/graywin.c \ + test/loopwave.c \ + test/testalpha.c \ + test/testbitmap.c \ + test/testcdrom.c \ + test/testerror.c \ + test/testgamma.c \ + test/testgl.c \ + test/testhread.c \ + test/testjoystick.c \ + test/testkeys.c \ + test/testlock.c \ + test/testoverlay.c \ + test/testpalette.c \ + test/testsem.c \ + test/testsprite.c \ + test/testtimer.c \ + test/testtypes.c \ + test/testver.c \ + test/testvidinfo.c \ + test/testwin.c \ + test/testwm.c \ + test/threadwin.c \ + test/torturethread.c \ + +$(TARGET): copy_config \ + $(OBJS) + $(AR) rcs $(TARGET) $(OBJS) + +copy_config: + @cp include/SDL_config.h.default include/SDL_config.h + +clean: + rm -f include/SDL_config.h $(OBJS) Added: trunk/libs/SDL-1.2.13/Makefile.in =================================================================== --- trunk/libs/SDL-1.2.13/Makefile.in (rev 0) +++ trunk/libs/SDL-1.2.13/Makefile.in 2008-08-05 22:15:37 UTC (rev 314) @@ -0,0 +1,182 @@ +# Makefile to build and install the SDL library + +top_builddir = . +srcdir = @srcdir@ +objects = build +depend = build-deps +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +libdir = @libdir@ +includedir = @includedir@ +datarootdir = @datarootdir@ +datadir = @datadir@ +mandir = @mandir@ +auxdir = @ac_aux_dir@ +distpath = $(srcdir)/.. +distdir = SDL-@SDL_VERSION@ +distfile = $(distdir).tar.gz + +@SET_MAKE@ +SHELL = @SHELL@ +CC = @CC@ +INCLUDE = @INCLUDE@ +CFLAGS = @BUILD_CFLAGS@ +EXTRA_CFLAGS = @EXTRA_CFLAGS@ +LDFLAGS = @BUILD_LDFLAGS@ +EXTRA_LDFLAGS = @EXTRA_LDFLAGS@ +LIBTOOL = @LIBTOOL@ +INSTALL = @INSTALL@ +NASM = @NASM@ @NASMFLAGS@ +AR = @AR@ +RANLIB = @RANLIB@ +WINDRES = @WINDRES@ + +TARGET = libSDL.la +SOURCES = @SOURCES@ +OBJECTS = @OBJECTS@ + +SDLMAIN_TARGET = libSDLmain.a +SDLMAIN_SOURCES = @SDLMAIN_SOURCES@ +SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@ + +DIST = acinclude.m4 autogen.sh Borland.html Borland.zip BUGS build-scripts configure configure.in COPYING CREDITS CWprojects.sea.bin docs docs.html include INSTALL Makefile.dc Makefile.minimal Makefile.in MPWmake.sea.bin README* sdl-config.in sdl.m4 sdl.pc.in SDL.qpg.in SDL.spec SDL.spec.in src test TODO VisualCE.zip VisualC.html VisualC.zip Watcom-OS2.zip Watcom-Win32.zip symbian.zip WhatsNew Xcode.tar.gz + +HDRS = SDL.h SDL_active.h SDL_audio.h SDL_byteorder.h SDL_cdrom.h SDL_cpuinfo.h SDL_endian.h SDL_error.h SDL_events.h SDL_getenv.h SDL_joystick.h SDL_keyboard.h SDL_keysym.h SDL_loadso.h SDL_main.h SDL_mouse.h SDL_mutex.h SDL_name.h SDL_opengl.h SDL_platform.h SDL_quit.h SDL_rwops.h SDL_stdinc.h SDL_syswm.h SDL_thread.h SDL_timer.h SDL_types.h SDL_version.h SDL_video.h begin_code.h close_code.h + +LT_AGE = @LT_AGE@ +LT_CURRENT = @LT_CURRENT@ +LT_RELEASE = @LT_RELEASE@ +LT_REVISION = @LT_REVISION@ +LT_LDFLAGS = -no-undefined -rpath $(DESTDIR)$(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + +all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) + +$(srcdir)/configure: $(srcdir)/configure.in + @echo "Warning, configure.in is out of date" + #(cd $(srcdir) && sh autogen.sh && sh configure) + @sleep 3 + +Makefile: $(srcdir)/Makefile.in + $(SHELL) config.status $@ + +$(objects): + $(SHELL) $(auxdir)/mkinstalldirs $@ + +.PHONY: all depend install install-bin install-hdrs install-lib install-data install-man uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data uninstall-man clean distclean dist +depend: + @SOURCES="$(SOURCES)" INCLUDE="$(INCLUDE)" output="$(depend)" \ + $(SHELL) $(auxdir)/makedep.sh + @for src in $(SDLMAIN_SOURCES); do \ + obj=`echo $$src | sed -e 's|.*/||' -e 's|\.[^\.]*$$|.o|'`; \ + echo "\$$(objects)/$$obj: $$src" >>$(depend); \ + echo " \$$(CC) \$$(CFLAGS) \$$(EXTRA_CFLAGS) -c $$src -o \$$@" >>$(depend); \ + done + +include $(depend) + +$(objects)/$(TARGET): $(OBJECTS) + $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) + +$(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) + $(AR) cru $@ $(SDLMAIN_OBJECTS) + $(RANLIB) $@ + +install: all install-bin install-hdrs install-lib install-data install-man +install-bin: + $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(bindir) + $(INSTALL) -m 755 sdl-config $(DESTDIR)$(bindir)/sdl-config +install-hdrs: + $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(includedir)/SDL + for file in $(HDRS); do \ + $(INSTALL) -m 644 $(srcdir)/include/$$file $(DESTDIR)$(includedir)/SDL/$$file; \ + done + $(INSTALL) -m 644 include/SDL_config.h $(DESTDIR)$(includedir)/SDL/SDL_config.h +install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) + $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir) + $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(DESTDIR)$(libdir)/$(TARGET) + $(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET) + $(RANLIB) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET) +install-data: + $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(datadir)/aclocal + $(INSTALL) -m 644 $(srcdir)/sdl.m4 $(DESTDIR)$(datadir)/aclocal/sdl.m4 + $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir)/pkgconfig + $(INSTALL) -m 644 sdl.pc $(DESTDIR)$(libdir)/pkgconfig +install-man: + $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(mandir)/man3 + for src in $(srcdir)/docs/man3/*.3; do \ + file=`echo $$src | sed -e 's|^.*/||'`; \ + $(INSTALL) -m 644 $$src $(DESTDIR)$(mandir)/man3/$$file; \ + done + +uninstall: uninstall-bin uninstall-hdrs uninstall-lib uninstall-data uninstall-man +uninstall-bin: + rm -f $(DESTDIR)$(bindir)/sdl-config +uninstall-hdrs: + for file in $(HDRS); do \ + rm -f $(DESTDIR)$(includedir)/SDL/$$file; \ + done + rm -f $(DESTDIR)$(includedir)/SDL/SDL_config.h + -rmdir $(DESTDIR)$(includedir)/SDL +uninstall-lib: + $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(TARGET) + rm -f $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET) +uninstall-data: + rm -f $(DESTDIR)$(datadir)/aclocal/sdl.m4 +uninstall-man: + for src in $(srcdir)/docs/man3/*.3; do \ + file=`echo $$src | sed -e 's|^.*/||'`; \ + rm -f $(DESTDIR)$(mandir)/man3/$$file; \ + done + +clean: + rm -rf $(objects) + if test -f test/Makefile; then (cd test; $(MAKE) $@); fi + +distclean: clean + rm -f Makefile include/SDL_config.h sdl-config + rm -f SDL.qpg + rm -f config.status config.cache config.log libtool $(depend) + rm -rf $(srcdir)/autom4te* + rm -rf $(srcdir)/test/autom4te* + find $(srcdir) \( \ + -name '*~' -o \ + -name '*.bak' -o \ + -name '*.old' -o \ + -name '*.rej' -o \ + -name '*.orig' -o \ + -name '.#*' \) \ + -exec rm -f {} \; + cp $(srcdir)/include/SDL_config.h.default $(srcdir)/include/SDL_config.h + if test -f test/Makefile; then (cd test; $(MAKE) $@); fi + +dist $(distfile): + $(SHELL) $(auxdir)/mkinstalldirs $(distdir) + tar cf - $(DIST) | (cd $(distdir); tar xf -) + cp $(distdir)/include/SDL_config.h.default $(distdir)/include/SDL_config.h + rm -rf `find $(distdir) -name .svn` + rm -rf $(distdir)/test/autom4te* + find $(distdir) \( \ + -name '*~' -o \ + -name '*.bak' -o \ + -name '*.old' -o \ + -name '*.rej' -o \ + -name '*.orig' -o \ + -name '.#*' \) \ + -exec rm -f {} \; + if test -f $(distdir)/test/Makefile; then (cd $(distdir)/test && make distclean); fi + tar cvf - $(distdir) | gzip --best >$(distfile) + rm -rf $(distdir) + +rpm: $(distfile) + rpmbuild -ta $? + +# Create a SVN snapshot that people can run update on +snapshot: + svn co http://svn.libsdl.org/branches/SDL-1.2 + (cd SDL-1.2 && ./autogen.sh && rm -rf autom4te.cache) + cp SDL-1.2/include/SDL_config.h.default SDL-1.2/include/SDL_config.h + tar zcf $(HOME)/SDL-1.2.tar.gz SDL-1.2 + rm -f $(HOME)/SDL-1.2.zip + zip -r $(HOME)/SDL-1.2.zip SDL-1.2 + rm -rf SDL-1.2 Added: trunk/libs/SDL-1.2.13/Makefile.minimal =================================================================== --- trunk/libs/SDL-1.2.13/Makefile.minimal (rev 0) +++ trunk/libs/SDL-1.2.13/Makefile.minimal 2008-08-05 22:15:37 UTC (rev 314) @@ -0,0 +1,42 @@ +# Makefile to build the SDL library + +INCLUDE = -I./include +CFLAGS = -g -O2 $(INCLUDE) +AR = ar +RANLIB = ranlib + +CONFIG_H = include/SDL_config.h +TARGET = libSDL.a +SOURCES = \ + src/*.c \ + src/audio/*.c \ + src/cdrom/*.c \ + src/cpuinfo/*.c \ + src/events/*.c \ + src/file/*.c \ + src/joystick/*.c \ + src/stdlib/*.c \ + src/thread/*.c \ + src/timer/*.c \ + src/video/*.c \ + src/audio/dummy/*.c \ + src/video/dummy/*.c \ + src/joystick/dummy/*.c \ + src/cdrom/dummy/*.c \ + src/thread/generic/*.c \ + src/timer/dummy/*.c \ + src/loadso/dummy/*.c \ + +OBJECTS = $(shell echo $(SOURCES) | sed -e 's,\.c,\.o,g') + +all: $(TARGET) + +$(TARGET): $(CONFIG_H) $(OBJECTS) + $(AR) crv $@ $^ + $(RANLIB) $@ + +$(CONFIG_H): + cp $(CONFIG_H).default $(CONFIG_H) + +clean: + rm -f $(TARGET) $(OBJECTS) Added: trunk/libs/SDL-1.2.13/README =================================================================== --- trunk/libs/SDL-1.2.13/README (rev 0) +++ trunk/libs/SDL-1.2.13/README 2008-08-05 22:15:37 UTC (rev 314) @@ -0,0 +1,49 @@ + + Simple DirectMedia Layer + + (SDL) + + Version 1.2 + +--- +http://www.libsdl.org/ + +This is the Simple DirectMedia Layer, a general API that provides low +level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, +and 2D framebuffer across multiple platforms. + +The current version supports Linux, Windows CE/95/98/ME/XP/Vista, BeOS, +MacOS Classic, Mac OS X, FreeBSD, NetBSD, OpenBSD, BSD/OS, Solaris, IRIX, +and QNX. The code contains support for Dreamcast, Atari, AIX, OSF/Tru64, +RISC OS, SymbianOS, Nintendo DS, and OS/2, but these are not officially +supported. + +SDL is written in C, but works with C++ natively, and has bindings to +several other languages, including Ada, C#, Eiffel, Erlang, Euphoria, +Guile, Haskell, Java, Lisp, Lua, ML, Objective C, Pascal, Perl, PHP, +Pike, Pliant, Python, Ruby, and Smalltalk. + +This library is distributed under GNU LGPL version 2, which can be +found in the file "COPYING". This license allows you to use SDL +freely in commercial programs as long as you link with the dynamic +library. + +The best way to learn how to use SDL is to check out the header files in +the "include" subdirectory and the programs in the "test" subdirectory. +The header files and test programs are well commented and always up to date. +More documentation is available in HTML format in "docs/index.html", and +a documentation wiki is available online at: + http://www.libsdl.org/cgi/docwiki.cgi + +The test programs in the "test" subdirectory are in the public domain. + +Frequently asked questions are answered online: + http://www.libsdl.org/faq.php + +If you need help with the library, or just want to discuss SDL related +issues, you can join the developers mailing list: + http://www.libsdl.org/mailing-list.php + +Enjoy! + Sam Lantinga (sl...@li...) + Added: trunk/libs/SDL-1.2.13/README-SDL.txt =================================================================== --- trunk/libs/SDL-1.2.13/README-SDL.txt (rev 0) +++ trunk/libs/SDL-1.2.13/README-SDL.txt 2008-08-05 22:15:37 UTC (rev 314) @@ -0,0 +1,13 @@ + +Please distribute this file with the SDL runtime environment: + +The Simple DirectMedia Layer (SDL for short) is a cross-platfrom library +designed to make it easy to write multi-media software, such as games and +emulators. + +The Simple DirectMedia Layer library source code is available from: +http://www.libsdl.org/ + +This library is distributed under the terms of the GNU LGPL license: +http://www.gnu.org/copyleft/lesser.html + Added: trunk/libs/SDL-1.2.13/README.AmigaOS =================================================================== --- trunk/libs/SDL-1.2.13/README.AmigaOS (rev 0) +++ trunk/libs/SDL-1.2.13/README.AmigaOS 2008-08-05 22:15:37 UTC (rev 314) @@ -0,0 +1,12 @@ +The AmigaOS code has been removed from SDL, since it had been broken for a + long time and had a few bits of fairly invasive code #ifdef'd into the + SDL core. + +However, there is an OS4 version of SDL here: + http://www.rcdrummond.net/amiga/index.html + +And a MorphOS version here: + http://www.lehtoranta.net/powersdl/ + +--ryan. + Added: trunk/libs/SDL-1.2.13/README.BeOS =================================================================== --- trunk/libs/SDL-1.2.13/README.BeOS (rev 0) +++ trunk/libs/SDL-1.2.13/README.BeOS 2008-08-05 22:15:37 UTC (rev 314) @@ -0,0 +1,13 @@ + +SDL on BeOS R5 +============== + +You can build SDL on BeOS like any other GNU style package. +e.g. ./configure && make && make install +By default it is installed in /boot/develop/tools/gnupro/{bin,lib,etc.} + +Once you install SDL, you need to copy libSDL.so to /boot/home/config/lib, +so it can be found by the dynamic linker. + +Enjoy! + Sam Lantinga (sl...@li...) Added: trunk/libs/SDL-1.2.13/README.CVS =================================================================== --- trunk/libs/SDL-1.2.13/README.CVS (rev 0) +++ trunk/libs/SDL-1.2.13/README.CVS 2008-08-05 22:15:37 UTC (rev 314) @@ -0,0 +1,4 @@ + +SDL is no longer hosted in a CVS repository. Please see README.SVN for +information on accessing our Subversion repository. + Added: trunk/libs/SDL-1.2.13/README.DC =================================================================== --- trunk/libs/SDL-1.2.13/README.DC (rev 0) +++ trunk/libs/SDL-1.2.13/README.DC 2008-08-05 22:15:37 UTC (rev 314) @@ -0,0 +1,32 @@ +SDL for Dreamcast (beta2) + + BERO + ber...@us... + + http://www.geocities.co.jp/Playtown/2004/ + +this work with kos-newlib +http://sourceforge.net/projects/dcquake/ + +compile +- source environ.sh (from the KOS distribution) +- make -f Makefile.dc + +compile with gl support +- install latest libgl from http://sourceforge.net/projects/dcquake/ +- uncomment GL=1 in Makefile.dc +- make -f Makefile.dc clean +- make -f Makefile.dc + +install +- copy include/*.h and libSDL.a or libSDL_gl.a for your enviroment + +changelog: + +beta2 +- OpenGL support +- Hardware page flip support + +beta +- thread, timer don't tested so much. +- not support OpenGL Added: trunk/libs/SDL-1.2.13/README.MacOS =================================================================== --- trunk/libs/SDL-1.2.13/README.MacOS (rev 0) +++ trunk/libs/SDL-1.2.13/README.MacOS 2008-08-05 22:15:37 UTC (rev 314) @@ -0,0 +1,63 @@ + +============================================================================== +Using the Simple DirectMedia Layer with MacOS 7,8,9 on PPC +============================================================================== + +These instructions are for people using the Apple MPW environment: +http://developer.apple.com/tools/mpw-tools/ + +CodeWarrior projects are available in the CWprojects directory. + +============================================================================== +I. Building the Simple DirectMedia Layer libraries: + (This step isn't necessary if you have the SDL binary distribution) + + First, unpack the MPWmake.sea.hqx archive and move SDL.make into the + SDL directory. + + Start MPW + + Set the current directory within MPW to the SDL toplevel directory. + + Build "SDL" (Type Command-B and enter "SDL" in the dialog) + + If everything compiles successfully, you now have the PPC libraries + "SDL" and "SDLmain.o" in the 'lib' subdirectory. + +============================================================================== +II. Building the Simple DirectMedia Layer test programs: + + First, unpack the MPWmake.sea.hqx archive, move the new rsrc directory to + the main SDL directory, and move the makefiles in the new test subdirectory + to the SDL 'test' subdirectory. + + Start MPW + + Set the current directory within MPW to the SDL 'test' subdirectory. + + Build the programs that have an associated MPW makefile (file ending + with .make), including "testwin", "testalpha", and "graywin". + + Copy the SDL library file into the test directory, and run! + +============================================================================== +III. Building the Simple DirectMedia Layer demo programs: + + Copy one of the test program Makefiles to the demo directory + and modify it to match the sources in the demo. + +============================================================================== +IV. Enjoy! :) + + If you have a project you'd like me to know about, or want to ask questions, + go ahead and join the SDL developer's mailing list by sending e-mail to: + + sdl...@li... + + and put "subscribe" into the subject of the message. Or alternatively you + can use the web interface: + + http://www.libsdl.org/mailman/listinfo/sdl + +============================================================================== + Added: trunk/libs/SDL-1.2.13/README.MacOSX =================================================================== --- trunk/libs/SDL-1.2.13/README.MacOSX (rev 0) +++ trunk/libs/SDL-1.2.13/README.MacOSX 2008-08-05 22:15:37 UTC (rev 314) @@ -0,0 +1,186 @@ +============================================================================== +Using the Simple DirectMedia Layer with Mac OS X +============================================================================== + +These instructions are for people using Apple's Mac OS X (pronounced +"ten"). + +From the developer's point of view, OS X is a sort of hybrid Mac and +Unix system, and you have the option of using either traditional +command line tools or Apple's IDE Xcode. + +To build SDL using the command line, use the standard configure and make +process: + + ./configure + make + sudo make install + +You can also build SDL as a Universal library (a single binary for both +PowerPC and Intel architectures), on Mac OS X 10.4 and newer, by using +the fatbuild.sh script in build-scripts: + sh build-scripts/fatbuild.sh + sudo build-scripts/fatbuild.sh install +This script builds SDL with 10.2 ABI compatibility on PowerPC and 10.4 +ABI compatibility on Intel architectures. For best compatibility you +should compile your application the same way. A script which wraps +gcc to make this easy is provided in test/gcc-fat.sh + +To use the library once it's built, you essential have two possibilities: +use the traditional autoconf/automake/make method, or use Xcode. + +============================================================================== +Using the Simple DirectMedia Layer with a traditional Makefile +============================================================================== + +An existing autoconf/automake build system for your SDL app has good chances +to work almost unchanged on OS X. However, to produce a "real" Mac OS X binary +that you can distribute to users, you need to put the generated binary into a +so called "bundle", which basically is a fancy folder with a name like +"MyCoolGame.app". + +To get this build automatically, add something like the following rule to +your Makefile.am: + +bundle_contents = APP_NAME.app/Contents +APP_NAME_bundle: EXE_NAME + mkdir -p $(bundle_contents)/MacOS + mkdir -p $(bundle_contents)/Resources + echo "APPL????" > $(bundle_contents)/PkgInfo + $(INSTALL_PROGRAM) $< $(bundle_contents)/MacOS/ + +You should replace EXE_NAME with the name of the executable. APP_NAME is what +will be visible to the user in the Finder. Usually it will be the same +as EXE_NAME but capitalized. E.g. if EXE_NAME is "testgame" then APP_NAME +usually is "TestGame". You might also want to use @PACKAGE@ to use the package +name as specified in your configure.in file. + +If your project builds more than one application, you will have to do a bit +more. For each of your target applications, you need a seperate rule. + +If you want the created bundle... [truncated message content] |
From: <sen...@us...> - 2008-08-05 16:08:12
|
Revision: 313 http://open2x.svn.sourceforge.net/open2x/?rev=313&view=rev Author: senquack Date: 2008-08-05 16:06:33 +0000 (Tue, 05 Aug 2008) Log Message: ----------- Update Paeryn's 1.2.9 HW SDL to 1.2.13 Added Paths: ----------- trunk/libs/SDL-1.2.13/ trunk/libs/SDL-1.2.13/CWprojects.sea.bin trunk/libs/SDL-1.2.13/INSTALL trunk/libs/SDL-1.2.13/README.MiNT trunk/libs/SDL-1.2.13/README.Porting trunk/libs/SDL-1.2.13/README.SVN trunk/libs/SDL-1.2.13/README.WinCE trunk/libs/SDL-1.2.13/VisualCE.zip trunk/libs/SDL-1.2.13/Xcode.tar.gz trunk/libs/SDL-1.2.13/sdl-config.in trunk/libs/SDL-1.2.13/sdl.m4 trunk/libs/SDL-1.2.13/src/ trunk/libs/SDL-1.2.13/src/SDL.c trunk/libs/SDL-1.2.13/src/SDL_error.c trunk/libs/SDL-1.2.13/src/SDL_fatal.h trunk/libs/SDL-1.2.13/src/cdrom/ trunk/libs/SDL-1.2.13/src/cdrom/SDL_cdrom.c trunk/libs/SDL-1.2.13/src/cdrom/SDL_syscdrom.h trunk/libs/SDL-1.2.13/src/cdrom/aix/ trunk/libs/SDL-1.2.13/src/cdrom/aix/SDL_syscdrom.c trunk/libs/SDL-1.2.13/src/cdrom/beos/ trunk/libs/SDL-1.2.13/src/cdrom/beos/SDL_syscdrom.cc trunk/libs/SDL-1.2.13/src/cdrom/bsdi/ trunk/libs/SDL-1.2.13/src/cdrom/bsdi/SDL_syscdrom.c trunk/libs/SDL-1.2.13/src/cdrom/dc/ trunk/libs/SDL-1.2.13/src/cdrom/dc/SDL_syscdrom.c trunk/libs/SDL-1.2.13/src/cdrom/dummy/ trunk/libs/SDL-1.2.13/src/cdrom/dummy/SDL_syscdrom.c trunk/libs/SDL-1.2.13/src/cdrom/freebsd/ trunk/libs/SDL-1.2.13/src/cdrom/freebsd/SDL_syscdrom.c trunk/libs/SDL-1.2.13/src/cdrom/linux/ trunk/libs/SDL-1.2.13/src/cdrom/linux/SDL_syscdrom.c trunk/libs/SDL-1.2.13/src/cdrom/macos/ trunk/libs/SDL-1.2.13/src/cdrom/macos/SDL_syscdrom.c trunk/libs/SDL-1.2.13/src/cdrom/macos/SDL_syscdrom_c.h trunk/libs/SDL-1.2.13/src/cdrom/macosx/ trunk/libs/SDL-1.2.13/src/cdrom/macosx/AudioFilePlayer.c trunk/libs/SDL-1.2.13/src/cdrom/macosx/AudioFilePlayer.h trunk/libs/SDL-1.2.13/src/cdrom/macosx/AudioFileReaderThread.c trunk/libs/SDL-1.2.13/src/cdrom/macosx/CDPlayer.c trunk/libs/SDL-1.2.13/src/cdrom/macosx/CDPlayer.h trunk/libs/SDL-1.2.13/src/cdrom/macosx/SDLOSXCAGuard.c trunk/libs/SDL-1.2.13/src/cdrom/macosx/SDLOSXCAGuard.h trunk/libs/SDL-1.2.13/src/cdrom/macosx/SDL_syscdrom.c trunk/libs/SDL-1.2.13/src/cdrom/macosx/SDL_syscdrom_c.h trunk/libs/SDL-1.2.13/src/cdrom/mint/ trunk/libs/SDL-1.2.13/src/cdrom/mint/SDL_syscdrom.c trunk/libs/SDL-1.2.13/src/cdrom/openbsd/ trunk/libs/SDL-1.2.13/src/cdrom/openbsd/SDL_syscdrom.c trunk/libs/SDL-1.2.13/src/cdrom/os2/ trunk/libs/SDL-1.2.13/src/cdrom/os2/SDL_syscdrom.c trunk/libs/SDL-1.2.13/src/cdrom/osf/ trunk/libs/SDL-1.2.13/src/cdrom/osf/SDL_syscdrom.c trunk/libs/SDL-1.2.13/src/cdrom/qnx/ trunk/libs/SDL-1.2.13/src/cdrom/qnx/SDL_syscdrom.c trunk/libs/SDL-1.2.13/src/cdrom/win32/ trunk/libs/SDL-1.2.13/src/cdrom/win32/SDL_syscdrom.c trunk/libs/SDL-1.2.13/src/cpuinfo/ trunk/libs/SDL-1.2.13/src/cpuinfo/SDL_cpuinfo.c trunk/libs/SDL-1.2.13/src/events/ trunk/libs/SDL-1.2.13/src/events/SDL_active.c trunk/libs/SDL-1.2.13/src/events/SDL_events.c trunk/libs/SDL-1.2.13/src/events/SDL_events_c.h trunk/libs/SDL-1.2.13/src/events/SDL_expose.c trunk/libs/SDL-1.2.13/src/events/SDL_keyboard.c trunk/libs/SDL-1.2.13/src/events/SDL_mouse.c trunk/libs/SDL-1.2.13/src/events/SDL_quit.c trunk/libs/SDL-1.2.13/src/events/SDL_resize.c trunk/libs/SDL-1.2.13/src/events/SDL_sysevents.h trunk/libs/SDL-1.2.13/src/file/ trunk/libs/SDL-1.2.13/src/file/SDL_rwops.c trunk/libs/SDL-1.2.13/src/main/ trunk/libs/SDL-1.2.13/src/main/beos/ trunk/libs/SDL-1.2.13/src/main/beos/SDL_BeApp.cc trunk/libs/SDL-1.2.13/src/main/beos/SDL_BeApp.h trunk/libs/SDL-1.2.13/src/main/dummy/ trunk/libs/SDL-1.2.13/src/main/dummy/SDL_dummy_main.c trunk/libs/SDL-1.2.13/src/main/macos/ trunk/libs/SDL-1.2.13/src/main/macos/SDL.r trunk/libs/SDL-1.2.13/src/main/macos/SDL.shlib.r trunk/libs/SDL-1.2.13/src/main/macos/SDL_main.c trunk/libs/SDL-1.2.13/src/main/macos/SIZE.r trunk/libs/SDL-1.2.13/src/main/macos/exports/ trunk/libs/SDL-1.2.13/src/main/macos/exports/Makefile trunk/libs/SDL-1.2.13/src/main/macos/exports/SDL.x trunk/libs/SDL-1.2.13/src/main/macos/exports/gendef.pl trunk/libs/SDL-1.2.13/src/main/macosx/ trunk/libs/SDL-1.2.13/src/main/macosx/Info.plist.in trunk/libs/SDL-1.2.13/src/main/macosx/SDLMain.h trunk/libs/SDL-1.2.13/src/main/macosx/SDLMain.m trunk/libs/SDL-1.2.13/src/main/macosx/SDLMain.nib/ trunk/libs/SDL-1.2.13/src/main/macosx/SDLMain.nib/classes.nib trunk/libs/SDL-1.2.13/src/main/macosx/SDLMain.nib/info.nib trunk/libs/SDL-1.2.13/src/main/macosx/SDLMain.nib/objects.nib trunk/libs/SDL-1.2.13/src/main/macosx/info.nib trunk/libs/SDL-1.2.13/src/main/qtopia/ trunk/libs/SDL-1.2.13/src/main/qtopia/SDL_qtopia_main.cc trunk/libs/SDL-1.2.13/src/main/symbian/ trunk/libs/SDL-1.2.13/src/main/symbian/EKA1/ trunk/libs/SDL-1.2.13/src/main/symbian/EKA1/SDL_main.cpp trunk/libs/SDL-1.2.13/src/main/symbian/EKA2/ trunk/libs/SDL-1.2.13/src/main/symbian/EKA2/SDL_main.cpp trunk/libs/SDL-1.2.13/src/main/symbian/EKA2/sdlexe.cpp trunk/libs/SDL-1.2.13/src/main/symbian/EKA2/sdllib.cpp trunk/libs/SDL-1.2.13/src/main/symbian/EKA2/vectorbuffer.cpp trunk/libs/SDL-1.2.13/src/main/symbian/EKA2/vectorbuffer.h trunk/libs/SDL-1.2.13/src/main/win32/ trunk/libs/SDL-1.2.13/src/main/win32/SDL_win32_main.c trunk/libs/SDL-1.2.13/src/main/win32/version.rc trunk/libs/SDL-1.2.13/src/stdlib/ trunk/libs/SDL-1.2.13/src/stdlib/SDL_getenv.c trunk/libs/SDL-1.2.13/src/stdlib/SDL_iconv.c trunk/libs/SDL-1.2.13/src/stdlib/SDL_malloc.c trunk/libs/SDL-1.2.13/src/stdlib/SDL_qsort.c trunk/libs/SDL-1.2.13/src/stdlib/SDL_stdlib.c trunk/libs/SDL-1.2.13/src/stdlib/SDL_string.c trunk/libs/SDL-1.2.13/src/video/ trunk/libs/SDL-1.2.13/src/video/ARM_blit1to2.S trunk/libs/SDL-1.2.13/src/video/SDL_RLEaccel.c trunk/libs/SDL-1.2.13/src/video/SDL_RLEaccel_c.h trunk/libs/SDL-1.2.13/src/video/SDL_blit.c trunk/libs/SDL-1.2.13/src/video/SDL_blit.h trunk/libs/SDL-1.2.13/src/video/SDL_blit_0.c trunk/libs/SDL-1.2.13/src/video/SDL_blit_1.c trunk/libs/SDL-1.2.13/src/video/SDL_blit_A.c trunk/libs/SDL-1.2.13/src/video/SDL_blit_N.c trunk/libs/SDL-1.2.13/src/video/SDL_bmp.c trunk/libs/SDL-1.2.13/src/video/SDL_cursor.c trunk/libs/SDL-1.2.13/src/video/SDL_cursor_c.h trunk/libs/SDL-1.2.13/src/video/SDL_gamma.c trunk/libs/SDL-1.2.13/src/video/SDL_glfuncs.h trunk/libs/SDL-1.2.13/src/video/SDL_leaks.h trunk/libs/SDL-1.2.13/src/video/SDL_pixels.c trunk/libs/SDL-1.2.13/src/video/SDL_pixels_c.h trunk/libs/SDL-1.2.13/src/video/SDL_stretch.c trunk/libs/SDL-1.2.13/src/video/SDL_stretch_c.h trunk/libs/SDL-1.2.13/src/video/SDL_surface.c trunk/libs/SDL-1.2.13/src/video/SDL_sysvideo.h trunk/libs/SDL-1.2.13/src/video/SDL_video.c trunk/libs/SDL-1.2.13/src/video/SDL_yuv.c trunk/libs/SDL-1.2.13/src/video/SDL_yuv_mmx.c trunk/libs/SDL-1.2.13/src/video/SDL_yuv_sw.c trunk/libs/SDL-1.2.13/src/video/SDL_yuv_sw_c.h trunk/libs/SDL-1.2.13/src/video/SDL_yuvfuncs.h trunk/libs/SDL-1.2.13/src/video/Xext/ trunk/libs/SDL-1.2.13/src/video/Xext/README trunk/libs/SDL-1.2.13/src/video/Xext/XME/ trunk/libs/SDL-1.2.13/src/video/Xext/XME/xme.c trunk/libs/SDL-1.2.13/src/video/Xext/Xinerama/ trunk/libs/SDL-1.2.13/src/video/Xext/Xinerama/Xinerama.c trunk/libs/SDL-1.2.13/src/video/Xext/Xv/ trunk/libs/SDL-1.2.13/src/video/Xext/Xv/Xv.c trunk/libs/SDL-1.2.13/src/video/Xext/Xv/Xvlibint.h trunk/libs/SDL-1.2.13/src/video/Xext/Xxf86dga/ trunk/libs/SDL-1.2.13/src/video/Xext/Xxf86dga/XF86DGA.c trunk/libs/SDL-1.2.13/src/video/Xext/Xxf86dga/XF86DGA2.c trunk/libs/SDL-1.2.13/src/video/Xext/Xxf86vm/ trunk/libs/SDL-1.2.13/src/video/Xext/Xxf86vm/XF86VMode.c trunk/libs/SDL-1.2.13/src/video/Xext/extensions/ trunk/libs/SDL-1.2.13/src/video/Xext/extensions/Xext.h trunk/libs/SDL-1.2.13/src/video/Xext/extensions/Xinerama.h trunk/libs/SDL-1.2.13/src/video/Xext/extensions/Xv.h trunk/libs/SDL-1.2.13/src/video/Xext/extensions/Xvlib.h trunk/libs/SDL-1.2.13/src/video/Xext/extensions/Xvproto.h trunk/libs/SDL-1.2.13/src/video/Xext/extensions/extutil.h trunk/libs/SDL-1.2.13/src/video/Xext/extensions/panoramiXext.h trunk/libs/SDL-1.2.13/src/video/Xext/extensions/panoramiXproto.h trunk/libs/SDL-1.2.13/src/video/Xext/extensions/xf86dga.h trunk/libs/SDL-1.2.13/src/video/Xext/extensions/xf86dga1.h trunk/libs/SDL-1.2.13/src/video/Xext/extensions/xf86dga1str.h trunk/libs/SDL-1.2.13/src/video/Xext/extensions/xf86dgastr.h trunk/libs/SDL-1.2.13/src/video/Xext/extensions/xf86vmode.h trunk/libs/SDL-1.2.13/src/video/Xext/extensions/xf86vmstr.h trunk/libs/SDL-1.2.13/src/video/Xext/extensions/xme.h trunk/libs/SDL-1.2.13/src/video/aalib/ trunk/libs/SDL-1.2.13/src/video/aalib/SDL_aaevents.c trunk/libs/SDL-1.2.13/src/video/aalib/SDL_aaevents_c.h trunk/libs/SDL-1.2.13/src/video/aalib/SDL_aamouse.c trunk/libs/SDL-1.2.13/src/video/aalib/SDL_aamouse_c.h trunk/libs/SDL-1.2.13/src/video/aalib/SDL_aavideo.c trunk/libs/SDL-1.2.13/src/video/aalib/SDL_aavideo.h trunk/libs/SDL-1.2.13/src/video/ataricommon/ trunk/libs/SDL-1.2.13/src/video/ataricommon/SDL_ataric2p.S trunk/libs/SDL-1.2.13/src/video/ataricommon/SDL_ataric2p_s.h trunk/libs/SDL-1.2.13/src/video/ataricommon/SDL_ataridevmouse.c trunk/libs/SDL-1.2.13/src/video/ataricommon/SDL_ataridevmouse_c.h trunk/libs/SDL-1.2.13/src/video/ataricommon/SDL_atarieddi.S trunk/libs/SDL-1.2.13/src/video/ataricommon/SDL_atarieddi_s.h trunk/libs/SDL-1.2.13/src/video/ataricommon/SDL_atarievents.c trunk/libs/SDL-1.2.13/src/video/ataricommon/SDL_atarievents_c.h trunk/libs/SDL-1.2.13/src/video/ataricommon/SDL_atarigl.c trunk/libs/SDL-1.2.13/src/video/ataricommon/SDL_atarigl_c.h trunk/libs/SDL-1.2.13/src/video/ataricommon/SDL_atarikeys.h trunk/libs/SDL-1.2.13/src/video/ataricommon/SDL_atarimxalloc.c trunk/libs/SDL-1.2.13/src/video/ataricommon/SDL_atarimxalloc_c.h trunk/libs/SDL-1.2.13/src/video/ataricommon/SDL_biosevents.c trunk/libs/SDL-1.2.13/src/video/ataricommon/SDL_biosevents_c.h trunk/libs/SDL-1.2.13/src/video/ataricommon/SDL_gemdosevents.c trunk/libs/SDL-1.2.13/src/video/ataricommon/SDL_gemdosevents_c.h trunk/libs/SDL-1.2.13/src/video/ataricommon/SDL_ikbdevents.c trunk/libs/SDL-1.2.13/src/video/ataricommon/SDL_ikbdevents_c.h trunk/libs/SDL-1.2.13/src/video/ataricommon/SDL_ikbdinterrupt.S trunk/libs/SDL-1.2.13/src/video/ataricommon/SDL_ikbdinterrupt_s.h trunk/libs/SDL-1.2.13/src/video/ataricommon/SDL_xbiosevents.c trunk/libs/SDL-1.2.13/src/video/ataricommon/SDL_xbiosevents_c.h trunk/libs/SDL-1.2.13/src/video/ataricommon/SDL_xbiosinterrupt.S trunk/libs/SDL-1.2.13/src/video/ataricommon/SDL_xbiosinterrupt_s.h trunk/libs/SDL-1.2.13/src/video/blank_cursor.h trunk/libs/SDL-1.2.13/src/video/bwindow/ trunk/libs/SDL-1.2.13/src/video/bwindow/SDL_BView.h trunk/libs/SDL-1.2.13/src/video/bwindow/SDL_BWin.h trunk/libs/SDL-1.2.13/src/video/bwindow/SDL_lowvideo.h trunk/libs/SDL-1.2.13/src/video/bwindow/SDL_sysevents.cc trunk/libs/SDL-1.2.13/src/video/bwindow/SDL_sysevents_c.h trunk/libs/SDL-1.2.13/src/video/bwindow/SDL_sysmouse.cc trunk/libs/SDL-1.2.13/src/video/bwindow/SDL_sysmouse_c.h trunk/libs/SDL-1.2.13/src/video/bwindow/SDL_sysvideo.cc trunk/libs/SDL-1.2.13/src/video/bwindow/SDL_syswm.cc trunk/libs/SDL-1.2.13/src/video/bwindow/SDL_syswm_c.h trunk/libs/SDL-1.2.13/src/video/bwindow/SDL_sysyuv.cc trunk/libs/SDL-1.2.13/src/video/bwindow/SDL_sysyuv.h trunk/libs/SDL-1.2.13/src/video/dc/ trunk/libs/SDL-1.2.13/src/video/dc/SDL_dcevents.c trunk/libs/SDL-1.2.13/src/video/dc/SDL_dcevents_c.h trunk/libs/SDL-1.2.13/src/video/dc/SDL_dcmouse.c trunk/libs/SDL-1.2.13/src/video/dc/SDL_dcmouse_c.h trunk/libs/SDL-1.2.13/src/video/dc/SDL_dcvideo.c trunk/libs/SDL-1.2.13/src/video/dc/SDL_dcvideo.h trunk/libs/SDL-1.2.13/src/video/default_cursor.h trunk/libs/SDL-1.2.13/src/video/dga/ trunk/libs/SDL-1.2.13/src/video/dga/SDL_dgaevents.c trunk/libs/SDL-1.2.13/src/video/dga/SDL_dgaevents_c.h trunk/libs/SDL-1.2.13/src/video/dga/SDL_dgamouse.c trunk/libs/SDL-1.2.13/src/video/dga/SDL_dgamouse_c.h trunk/libs/SDL-1.2.13/src/video/dga/SDL_dgavideo.c trunk/libs/SDL-1.2.13/src/video/dga/SDL_dgavideo.h trunk/libs/SDL-1.2.13/src/video/directfb/ trunk/libs/SDL-1.2.13/src/video/directfb/SDL_DirectFB_events.c trunk/libs/SDL-1.2.13/src/video/directfb/SDL_DirectFB_events.h trunk/libs/SDL-1.2.13/src/video/directfb/SDL_DirectFB_keys.h trunk/libs/SDL-1.2.13/src/video/directfb/SDL_DirectFB_video.c trunk/libs/SDL-1.2.13/src/video/directfb/SDL_DirectFB_video.h trunk/libs/SDL-1.2.13/src/video/directfb/SDL_DirectFB_yuv.c trunk/libs/SDL-1.2.13/src/video/directfb/SDL_DirectFB_yuv.h trunk/libs/SDL-1.2.13/src/video/dummy/ trunk/libs/SDL-1.2.13/src/video/dummy/SDL_nullevents.c trunk/libs/SDL-1.2.13/src/video/dummy/SDL_nullevents_c.h trunk/libs/SDL-1.2.13/src/video/dummy/SDL_nullmouse.c trunk/libs/SDL-1.2.13/src/video/dummy/SDL_nullmouse_c.h trunk/libs/SDL-1.2.13/src/video/dummy/SDL_nullvideo.c trunk/libs/SDL-1.2.13/src/video/dummy/SDL_nullvideo.h trunk/libs/SDL-1.2.13/src/video/e_log.h trunk/libs/SDL-1.2.13/src/video/e_pow.h trunk/libs/SDL-1.2.13/src/video/e_sqrt.h trunk/libs/SDL-1.2.13/src/video/fbcon/ trunk/libs/SDL-1.2.13/src/video/fbcon/3dfx_mmio.h trunk/libs/SDL-1.2.13/src/video/fbcon/3dfx_regs.h trunk/libs/SDL-1.2.13/src/video/fbcon/SDL_fb3dfx.c trunk/libs/SDL-1.2.13/src/video/fbcon/SDL_fb3dfx.h trunk/libs/SDL-1.2.13/src/video/fbcon/SDL_fbelo.c trunk/libs/SDL-1.2.13/src/video/fbcon/SDL_fbelo.h trunk/libs/SDL-1.2.13/src/video/fbcon/SDL_fbevents.c trunk/libs/SDL-1.2.13/src/video/fbcon/SDL_fbevents_c.h trunk/libs/SDL-1.2.13/src/video/fbcon/SDL_fbkeys.h trunk/libs/SDL-1.2.13/src/video/fbcon/SDL_fbmatrox.c trunk/libs/SDL-1.2.13/src/video/fbcon/SDL_fbmatrox.h trunk/libs/SDL-1.2.13/src/video/fbcon/SDL_fbmouse.c trunk/libs/SDL-1.2.13/src/video/fbcon/SDL_fbmouse_c.h trunk/libs/SDL-1.2.13/src/video/fbcon/SDL_fbriva.c trunk/libs/SDL-1.2.13/src/video/fbcon/SDL_fbriva.h trunk/libs/SDL-1.2.13/src/video/fbcon/SDL_fbvideo.c trunk/libs/SDL-1.2.13/src/video/fbcon/SDL_fbvideo.h trunk/libs/SDL-1.2.13/src/video/fbcon/matrox_mmio.h trunk/libs/SDL-1.2.13/src/video/fbcon/matrox_regs.h trunk/libs/SDL-1.2.13/src/video/fbcon/riva_mmio.h trunk/libs/SDL-1.2.13/src/video/fbcon/riva_regs.h trunk/libs/SDL-1.2.13/src/video/gapi/ trunk/libs/SDL-1.2.13/src/video/gapi/SDL_gapivideo.c trunk/libs/SDL-1.2.13/src/video/gapi/SDL_gapivideo.h trunk/libs/SDL-1.2.13/src/video/gem/ trunk/libs/SDL-1.2.13/src/video/gem/SDL_gemevents.c trunk/libs/SDL-1.2.13/src/video/gem/SDL_gemevents_c.h trunk/libs/SDL-1.2.13/src/video/gem/SDL_gemmouse.c trunk/libs/SDL-1.2.13/src/video/gem/SDL_gemmouse_c.h trunk/libs/SDL-1.2.13/src/video/gem/SDL_gemvideo.c trunk/libs/SDL-1.2.13/src/video/gem/SDL_gemvideo.h trunk/libs/SDL-1.2.13/src/video/gem/SDL_gemwm.c trunk/libs/SDL-1.2.13/src/video/gem/SDL_gemwm_c.h trunk/libs/SDL-1.2.13/src/video/ggi/ trunk/libs/SDL-1.2.13/src/video/ggi/SDL_ggievents.c trunk/libs/SDL-1.2.13/src/video/ggi/SDL_ggievents_c.h trunk/libs/SDL-1.2.13/src/video/ggi/SDL_ggikeys.h trunk/libs/SDL-1.2.13/src/video/ggi/SDL_ggimouse.c trunk/libs/SDL-1.2.13/src/video/ggi/SDL_ggimouse_c.h trunk/libs/SDL-1.2.13/src/video/ggi/SDL_ggivideo.c trunk/libs/SDL-1.2.13/src/video/ggi/SDL_ggivideo.h trunk/libs/SDL-1.2.13/src/video/gp2x/ trunk/libs/SDL-1.2.13/src/video/gp2x/.deps/ trunk/libs/SDL-1.2.13/src/video/gp2x/.deps/SDL_gp2xevents.Plo trunk/libs/SDL-1.2.13/src/video/gp2x/.deps/SDL_gp2xmouse.Plo trunk/libs/SDL-1.2.13/src/video/gp2x/.deps/SDL_gp2xvideo.Plo trunk/libs/SDL-1.2.13/src/video/gp2x/.deps/gp2x_tslib.Plo trunk/libs/SDL-1.2.13/src/video/gp2x/SDL_fbmmsp2.c trunk/libs/SDL-1.2.13/src/video/gp2x/SDL_fbmmsp2.h trunk/libs/SDL-1.2.13/src/video/gp2x/SDL_fbvideo.c.disabled trunk/libs/SDL-1.2.13/src/video/gp2x/SDL_gp2xevents.c trunk/libs/SDL-1.2.13/src/video/gp2x/SDL_gp2xevents.c.recentbak trunk/libs/SDL-1.2.13/src/video/gp2x/SDL_gp2xevents_c.h trunk/libs/SDL-1.2.13/src/video/gp2x/SDL_gp2xkeys.h trunk/libs/SDL-1.2.13/src/video/gp2x/SDL_gp2xmouse.c trunk/libs/SDL-1.2.13/src/video/gp2x/SDL_gp2xmouse_c.h trunk/libs/SDL-1.2.13/src/video/gp2x/SDL_gp2xvideo.c trunk/libs/SDL-1.2.13/src/video/gp2x/SDL_gp2xvideo.h trunk/libs/SDL-1.2.13/src/video/gp2x/gp2x_tslib.c trunk/libs/SDL-1.2.13/src/video/gp2x/mmsp2_mmio.h trunk/libs/SDL-1.2.13/src/video/gp2x/mmsp2_regs.h trunk/libs/SDL-1.2.13/src/video/gp2x/tslib.h trunk/libs/SDL-1.2.13/src/video/ipod/ trunk/libs/SDL-1.2.13/src/video/ipod/SDL_ipodvideo.c trunk/libs/SDL-1.2.13/src/video/ipod/SDL_ipodvideo.h trunk/libs/SDL-1.2.13/src/video/maccommon/ trunk/libs/SDL-1.2.13/src/video/maccommon/SDL_lowvideo.h trunk/libs/SDL-1.2.13/src/video/maccommon/SDL_macevents.c trunk/libs/SDL-1.2.13/src/video/maccommon/SDL_macevents_c.h trunk/libs/SDL-1.2.13/src/video/maccommon/SDL_macgl.c trunk/libs/SDL-1.2.13/src/video/maccommon/SDL_macgl_c.h trunk/libs/SDL-1.2.13/src/video/maccommon/SDL_mackeys.h trunk/libs/SDL-1.2.13/src/video/maccommon/SDL_macmouse.c trunk/libs/SDL-1.2.13/src/video/maccommon/SDL_macmouse_c.h trunk/libs/SDL-1.2.13/src/video/maccommon/SDL_macwm.c trunk/libs/SDL-1.2.13/src/video/maccommon/SDL_macwm_c.h trunk/libs/SDL-1.2.13/src/video/macdsp/ trunk/libs/SDL-1.2.13/src/video/macdsp/SDL_dspvideo.c trunk/libs/SDL-1.2.13/src/video/macdsp/SDL_dspvideo.h trunk/libs/SDL-1.2.13/src/video/macrom/ trunk/libs/SDL-1.2.13/src/video/macrom/SDL_romvideo.c trunk/libs/SDL-1.2.13/src/video/macrom/SDL_romvideo.h trunk/libs/SDL-1.2.13/src/video/math_private.h trunk/libs/SDL-1.2.13/src/video/mmx.h trunk/libs/SDL-1.2.13/src/video/nanox/ trunk/libs/SDL-1.2.13/src/video/nanox/SDL_nxevents.c trunk/libs/SDL-1.2.13/src/video/nanox/SDL_nxevents_c.h trunk/libs/SDL-1.2.13/src/video/nanox/SDL_nximage.c trunk/libs/SDL-1.2.13/src/video/nanox/SDL_nximage_c.h trunk/libs/SDL-1.2.13/src/video/nanox/SDL_nxmodes.c trunk/libs/SDL-1.2.13/src/video/nanox/SDL_nxmodes_c.h trunk/libs/SDL-1.2.13/src/video/nanox/SDL_nxmouse.c trunk/libs/SDL-1.2.13/src/video/nanox/SDL_nxmouse_c.h trunk/libs/SDL-1.2.13/src/video/nanox/SDL_nxvideo.c trunk/libs/SDL-1.2.13/src/video/nanox/SDL_nxvideo.h trunk/libs/SDL-1.2.13/src/video/nanox/SDL_nxwm.c trunk/libs/SDL-1.2.13/src/video/nanox/SDL_nxwm_c.h trunk/libs/SDL-1.2.13/src/video/nds/ trunk/libs/SDL-1.2.13/src/video/nds/SDL_ndsevents.c trunk/libs/SDL-1.2.13/src/video/nds/SDL_ndsevents_c.h trunk/libs/SDL-1.2.13/src/video/nds/SDL_ndsmouse.c trunk/libs/SDL-1.2.13/src/video/nds/SDL_ndsmouse_c.h trunk/libs/SDL-1.2.13/src/video/nds/SDL_ndsvideo.c trunk/libs/SDL-1.2.13/src/video/nds/SDL_ndsvideo.h trunk/libs/SDL-1.2.13/src/video/os2fslib/ trunk/libs/SDL-1.2.13/src/video/os2fslib/SDL_os2fslib.c trunk/libs/SDL-1.2.13/src/video/os2fslib/SDL_os2fslib.h trunk/libs/SDL-1.2.13/src/video/os2fslib/SDL_vkeys.h trunk/libs/SDL-1.2.13/src/video/photon/ trunk/libs/SDL-1.2.13/src/video/photon/SDL_ph_events.c trunk/libs/SDL-1.2.13/src/video/photon/SDL_ph_events_c.h trunk/libs/SDL-1.2.13/src/video/photon/SDL_ph_gl.c trunk/libs/SDL-1.2.13/src/video/photon/SDL_ph_gl.h trunk/libs/SDL-1.2.13/src/video/photon/SDL_ph_image.c trunk/libs/SDL-1.2.13/src/video/photon/SDL_ph_image_c.h trunk/libs/SDL-1.2.13/src/video/photon/SDL_ph_modes.c trunk/libs/SDL-1.2.13/src/video/photon/SDL_ph_modes_c.h trunk/libs/SDL-1.2.13/src/video/photon/SDL_ph_mouse.c trunk/libs/SDL-1.2.13/src/video/photon/SDL_ph_mouse_c.h trunk/libs/SDL-1.2.13/src/video/photon/SDL_ph_video.c trunk/libs/SDL-1.2.13/src/video/photon/SDL_ph_video.h trunk/libs/SDL-1.2.13/src/video/photon/SDL_ph_wm.c trunk/libs/SDL-1.2.13/src/video/photon/SDL_ph_wm_c.h trunk/libs/SDL-1.2.13/src/video/photon/SDL_phyuv.c trunk/libs/SDL-1.2.13/src/video/photon/SDL_phyuv_c.h trunk/libs/SDL-1.2.13/src/video/picogui/ trunk/libs/SDL-1.2.13/src/video/picogui/SDL_pgevents.c trunk/libs/SDL-1.2.13/src/video/picogui/SDL_pgevents_c.h trunk/libs/SDL-1.2.13/src/video/picogui/SDL_pgvideo.c trunk/libs/SDL-1.2.13/src/video/picogui/SDL_pgvideo.h trunk/libs/SDL-1.2.13/src/video/ps2gs/ trunk/libs/SDL-1.2.13/src/video/ps2gs/SDL_gsevents.c trunk/libs/SDL-1.2.13/src/video/ps2gs/SDL_gsevents_c.h trunk/libs/SDL-1.2.13/src/video/ps2gs/SDL_gskeys.h trunk/libs/SDL-1.2.13/src/video/ps2gs/SDL_gsmouse.c trunk/libs/SDL-1.2.13/src/video/ps2gs/SDL_gsmouse_c.h trunk/libs/SDL-1.2.13/src/video/ps2gs/SDL_gsvideo.c trunk/libs/SDL-1.2.13/src/video/ps2gs/SDL_gsvideo.h trunk/libs/SDL-1.2.13/src/video/ps2gs/SDL_gsyuv.c trunk/libs/SDL-1.2.13/src/video/ps2gs/SDL_gsyuv_c.h trunk/libs/SDL-1.2.13/src/video/qtopia/ trunk/libs/SDL-1.2.13/src/video/qtopia/SDL_QPEApp.cc trunk/libs/SDL-1.2.13/src/video/qtopia/SDL_QPEApp.h trunk/libs/SDL-1.2.13/src/video/qtopia/SDL_QWin.cc trunk/libs/SDL-1.2.13/src/video/qtopia/SDL_QWin.h trunk/libs/SDL-1.2.13/src/video/qtopia/SDL_lowvideo.h trunk/libs/SDL-1.2.13/src/video/qtopia/SDL_sysevents.cc trunk/libs/SDL-1.2.13/src/video/qtopia/SDL_sysevents_c.h trunk/libs/SDL-1.2.13/src/video/qtopia/SDL_sysmouse.cc trunk/libs/SDL-1.2.13/src/video/qtopia/SDL_sysmouse_c.h trunk/libs/SDL-1.2.13/src/video/qtopia/SDL_sysvideo.cc trunk/libs/SDL-1.2.13/src/video/qtopia/SDL_syswm.cc trunk/libs/SDL-1.2.13/src/video/qtopia/SDL_syswm_c.h trunk/libs/SDL-1.2.13/src/video/quartz/ trunk/libs/SDL-1.2.13/src/video/quartz/CGS.h trunk/libs/SDL-1.2.13/src/video/quartz/SDL_QuartzEvents.m trunk/libs/SDL-1.2.13/src/video/quartz/SDL_QuartzGL.m trunk/libs/SDL-1.2.13/src/video/quartz/SDL_QuartzKeys.h trunk/libs/SDL-1.2.13/src/video/quartz/SDL_QuartzVideo.h trunk/libs/SDL-1.2.13/src/video/quartz/SDL_QuartzVideo.m trunk/libs/SDL-1.2.13/src/video/quartz/SDL_QuartzWM.h trunk/libs/SDL-1.2.13/src/video/quartz/SDL_QuartzWM.m trunk/libs/SDL-1.2.13/src/video/quartz/SDL_QuartzWindow.h trunk/libs/SDL-1.2.13/src/video/quartz/SDL_QuartzWindow.m trunk/libs/SDL-1.2.13/src/video/quartz/SDL_QuartzYUV.m trunk/libs/SDL-1.2.13/src/video/riscos/ trunk/libs/SDL-1.2.13/src/video/riscos/SDL_riscosASM.S trunk/libs/SDL-1.2.13/src/video/riscos/SDL_riscosFullScreenVideo.c trunk/libs/SDL-1.2.13/src/video/riscos/SDL_riscosevents.c trunk/libs/SDL-1.2.13/src/video/riscos/SDL_riscosevents_c.h trunk/libs/SDL-1.2.13/src/video/riscos/SDL_riscosmouse.c trunk/libs/SDL-1.2.13/src/video/riscos/SDL_riscosmouse_c.h trunk/libs/SDL-1.2.13/src/video/riscos/SDL_riscossprite.c trunk/libs/SDL-1.2.13/src/video/riscos/SDL_riscostask.c trunk/libs/SDL-1.2.13/src/video/riscos/SDL_riscostask.h trunk/libs/SDL-1.2.13/src/video/riscos/SDL_riscosvideo.c trunk/libs/SDL-1.2.13/src/video/riscos/SDL_riscosvideo.h trunk/libs/SDL-1.2.13/src/video/riscos/SDL_wimppoll.c trunk/libs/SDL-1.2.13/src/video/riscos/SDL_wimpvideo.c trunk/libs/SDL-1.2.13/src/video/svga/ trunk/libs/SDL-1.2.13/src/video/svga/SDL_svgaevents.c trunk/libs/SDL-1.2.13/src/video/svga/SDL_svgaevents_c.h trunk/libs/SDL-1.2.13/src/video/svga/SDL_svgamouse.c trunk/libs/SDL-1.2.13/src/video/svga/SDL_svgamouse_c.h trunk/libs/SDL-1.2.13/src/video/svga/SDL_svgavideo.c trunk/libs/SDL-1.2.13/src/video/svga/SDL_svgavideo.h trunk/libs/SDL-1.2.13/src/video/symbian/ trunk/libs/SDL-1.2.13/src/video/symbian/EKA1/ trunk/libs/SDL-1.2.13/src/video/symbian/EKA1/SDL_epocevents.cpp trunk/libs/SDL-1.2.13/src/video/symbian/EKA1/SDL_epocvideo.cpp trunk/libs/SDL-1.2.13/src/video/symbian/EKA1/SDL_epocvideo.h trunk/libs/SDL-1.2.13/src/video/symbian/EKA2/ trunk/libs/SDL-1.2.13/src/video/symbian/EKA2/SDL_epocevents.cpp trunk/libs/SDL-1.2.13/src/video/symbian/EKA2/SDL_epocvideo.cpp trunk/libs/SDL-1.2.13/src/video/symbian/EKA2/SDL_epocvideo.h trunk/libs/SDL-1.2.13/src/video/symbian/EKA2/dsa.cpp trunk/libs/SDL-1.2.13/src/video/symbian/EKA2/dsa_new.cpp trunk/libs/SDL-1.2.13/src/video/symbian/EKA2/dsa_old.cpp trunk/libs/SDL-1.2.13/src/video/symbian/SDL_epocevents_c.h trunk/libs/SDL-1.2.13/src/video/vgl/ trunk/libs/SDL-1.2.13/src/video/vgl/SDL_vglevents.c trunk/libs/SDL-1.2.13/src/video/vgl/SDL_vglevents_c.h trunk/libs/SDL-1.2.13/src/video/vgl/SDL_vglmouse.c trunk/libs/SDL-1.2.13/src/video/vgl/SDL_vglmouse_c.h trunk/libs/SDL-1.2.13/src/video/vgl/SDL_vglvideo.c trunk/libs/SDL-1.2.13/src/video/vgl/SDL_vglvideo.h trunk/libs/SDL-1.2.13/src/video/wincommon/ trunk/libs/SDL-1.2.13/src/video/wincommon/SDL_lowvideo.h trunk/libs/SDL-1.2.13/src/video/wincommon/SDL_sysevents.c trunk/libs/SDL-1.2.13/src/video/wincommon/SDL_sysmouse.c trunk/libs/SDL-1.2.13/src/video/wincommon/SDL_sysmouse_c.h trunk/libs/SDL-1.2.13/src/video/wincommon/SDL_syswm.c trunk/libs/SDL-1.2.13/src/video/wincommon/SDL_syswm_c.h trunk/libs/SDL-1.2.13/src/video/wincommon/SDL_wingl.c trunk/libs/SDL-1.2.13/src/video/wincommon/SDL_wingl_c.h trunk/libs/SDL-1.2.13/src/video/wincommon/wmmsg.h trunk/libs/SDL-1.2.13/src/video/windib/ trunk/libs/SDL-1.2.13/src/video/windib/SDL_dibevents.c trunk/libs/SDL-1.2.13/src/video/windib/SDL_dibevents_c.h trunk/libs/SDL-1.2.13/src/video/windib/SDL_dibvideo.c trunk/libs/SDL-1.2.13/src/video/windib/SDL_dibvideo.h trunk/libs/SDL-1.2.13/src/video/windib/SDL_vkeys.h trunk/libs/SDL-1.2.13/src/video/windx5/ trunk/libs/SDL-1.2.13/src/video/windx5/SDL_dx5events.c trunk/libs/SDL-1.2.13/src/video/windx5/SDL_dx5events_c.h trunk/libs/SDL-1.2.13/src/video/windx5/SDL_dx5video.c trunk/libs/SDL-1.2.13/src/video/windx5/SDL_dx5video.h trunk/libs/SDL-1.2.13/src/video/windx5/SDL_dx5yuv.c trunk/libs/SDL-1.2.13/src/video/windx5/SDL_dx5yuv_c.h trunk/libs/SDL-1.2.13/src/video/windx5/directx.h trunk/libs/SDL-1.2.13/src/video/wscons/ trunk/libs/SDL-1.2.13/src/video/wscons/SDL_wsconsevents.c trunk/libs/SDL-1.2.13/src/video/wscons/SDL_wsconsevents_c.h trunk/libs/SDL-1.2.13/src/video/wscons/SDL_wsconsmouse.c trunk/libs/SDL-1.2.13/src/video/wscons/SDL_wsconsmouse_c.h trunk/libs/SDL-1.2.13/src/video/wscons/SDL_wsconsvideo.c trunk/libs/SDL-1.2.13/src/video/wscons/SDL_wsconsvideo.h trunk/libs/SDL-1.2.13/src/video/x11/ trunk/libs/SDL-1.2.13/src/video/x11/SDL_x11dga.c trunk/libs/SDL-1.2.13/src/video/x11/SDL_x11dga_c.h trunk/libs/SDL-1.2.13/src/video/x11/SDL_x11dyn.c trunk/libs/SDL-1.2.13/src/video/x11/SDL_x11dyn.h trunk/libs/SDL-1.2.13/src/video/x11/SDL_x11events.c trunk/libs/SDL-1.2.13/src/video/x11/SDL_x11events_c.h trunk/libs/SDL-1.2.13/src/video/x11/SDL_x11gamma.c trunk/libs/SDL-1.2.13/src/video/x11/SDL_x11gamma_c.h trunk/libs/SDL-1.2.13/src/video/x11/SDL_x11gl.c trunk/libs/SDL-1.2.13/src/video/x11/SDL_x11gl_c.h trunk/libs/SDL-1.2.13/src/video/x11/SDL_x11image.c trunk/libs/SDL-1.2.13/src/video/x11/SDL_x11image_c.h trunk/libs/SDL-1.2.13/src/video/x11/SDL_x11modes.c trunk/libs/SDL-1.2.13/src/video/x11/SDL_x11modes_c.h trunk/libs/SDL-1.2.13/src/video/x11/SDL_x11mouse.c trunk/libs/SDL-1.2.13/src/video/x11/SDL_x11mouse_c.h trunk/libs/SDL-1.2.13/src/video/x11/SDL_x11sym.h trunk/libs/SDL-1.2.13/src/video/x11/SDL_x11video.c trunk/libs/SDL-1.2.13/src/video/x11/SDL_x11video.h trunk/libs/SDL-1.2.13/src/video/x11/SDL_x11wm.c trunk/libs/SDL-1.2.13/src/video/x11/SDL_x11wm_c.h trunk/libs/SDL-1.2.13/src/video/x11/SDL_x11yuv.c trunk/libs/SDL-1.2.13/src/video/x11/SDL_x11yuv_c.h trunk/libs/SDL-1.2.13/src/video/xbios/ trunk/libs/SDL-1.2.13/src/video/xbios/SDL_xbios.c trunk/libs/SDL-1.2.13/src/video/xbios/SDL_xbios.h trunk/libs/SDL-1.2.13/src/video/xbios/SDL_xbios_blowup.c trunk/libs/SDL-1.2.13/src/video/xbios/SDL_xbios_blowup.h trunk/libs/SDL-1.2.13/src/video/xbios/SDL_xbios_centscreen.c trunk/libs/SDL-1.2.13/src/video/xbios/SDL_xbios_centscreen.h trunk/libs/SDL-1.2.13/src/video/xbios/SDL_xbios_sb3.c trunk/libs/SDL-1.2.13/src/video/xbios/SDL_xbios_sb3.h trunk/libs/SDL-1.2.13/src/video/xbios/SDL_xbios_tveille.c trunk/libs/SDL-1.2.13/src/video/xbios/SDL_xbios_tveille.h trunk/libs/SDL-1.2.13/test/ trunk/libs/SDL-1.2.13/test/COPYING trunk/libs/SDL-1.2.13/test/Makefile.in trunk/libs/SDL-1.2.13/test/README trunk/libs/SDL-1.2.13/test/acinclude.m4 trunk/libs/SDL-1.2.13/test/aclocal.m4 trunk/libs/SDL-1.2.13/test/autogen.sh trunk/libs/SDL-1.2.13/test/checkkeys.c trunk/libs/SDL-1.2.13/test/configure trunk/libs/SDL-1.2.13/test/configure.in trunk/libs/SDL-1.2.13/test/gcc-fat.sh trunk/libs/SDL-1.2.13/test/graywin.c trunk/libs/SDL-1.2.13/test/icon.bmp trunk/libs/SDL-1.2.13/test/loopwave.c trunk/libs/SDL-1.2.13/test/moose.dat trunk/libs/SDL-1.2.13/test/picture.xbm trunk/libs/SDL-1.2.13/test/sail.bmp trunk/libs/SDL-1.2.13/test/sample.bmp trunk/libs/SDL-1.2.13/test/sample.wav trunk/libs/SDL-1.2.13/test/testalpha.c trunk/libs/SDL-1.2.13/test/testbitmap.c trunk/libs/SDL-1.2.13/test/testblitspeed.c trunk/libs/SDL-1.2.13/test/testcdrom.c trunk/libs/SDL-1.2.13/test/testcursor.c trunk/libs/SDL-1.2.13/test/testdyngl.c trunk/libs/SDL-1.2.13/test/testerror.c trunk/libs/SDL-1.2.13/test/testfile.c trunk/libs/SDL-1.2.13/test/testgamma.c trunk/libs/SDL-1.2.13/test/testgl.c trunk/libs/SDL-1.2.13/test/testhread.c trunk/libs/SDL-1.2.13/test/testiconv.c trunk/libs/SDL-1.2.13/test/testjoystick.c trunk/libs/SDL-1.2.13/test/testkeys.c trunk/libs/SDL-1.2.13/test/testloadso.c trunk/libs/SDL-1.2.13/test/testlock.c trunk/libs/SDL-1.2.13/test/testoverlay.c trunk/libs/SDL-1.2.13/test/testoverlay2.c trunk/libs/SDL-1.2.13/test/testpalette.c trunk/libs/SDL-1.2.13/test/testplatform.c trunk/libs/SDL-1.2.13/test/testsem.c trunk/libs/SDL-1.2.13/test/testsprite.c trunk/libs/SDL-1.2.13/test/testtimer.c trunk/libs/SDL-1.2.13/test/testver.c trunk/libs/SDL-1.2.13/test/testvidinfo.c trunk/libs/SDL-1.2.13/test/testwin.c trunk/libs/SDL-1.2.13/test/testwm.c trunk/libs/SDL-1.2.13/test/threadwin.c trunk/libs/SDL-1.2.13/test/torturethread.c trunk/libs/SDL-1.2.13/test/utf8.txt Property changes on: trunk/libs/SDL-1.2.13/CWprojects.sea.bin ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/libs/SDL-1.2.13/INSTALL =================================================================== --- trunk/libs/SDL-1.2.13/INSTALL (rev 0) +++ trunk/libs/SDL-1.2.13/INSTALL 2008-08-05 16:06:33 UTC (rev 313) @@ -0,0 +1,23 @@ + +To compile and install SDL: + + 1. Run './configure; make; make install' + + If you are compiling for Windows using gcc, read the FAQ at: + http://www.libsdl.org/faq.php?action=listentries&category=4#42 + + If you are compiling using Visual C++ on Win32, you should read + the file VisualC.html + + 2. Look at the example programs in ./test, and check out the HTML + documentation in ./docs to see how to use the SDL library. + + 3. Join the SDL developer mailing list by sending E-mail to + sdl...@li... + and put "subscribe" in the subject of the message. + + Or alternatively you can use the web interface: + http://www.libsdl.org/mailing-list.php + +That's it! +Sam Lantinga <sl...@li...> Added: trunk/libs/SDL-1.2.13/README.MiNT =================================================================== --- trunk/libs/SDL-1.2.13/README.MiNT (rev 0) +++ trunk/libs/SDL-1.2.13/README.MiNT 2008-08-05 16:06:33 UTC (rev 313) @@ -0,0 +1,248 @@ +============================================================================== +Using the Simple DirectMedia Layer on Atari +============================================================================== + + + If you want to build SDL from sources to create SDL programs on Atari: + see sections I - II. + + If you want to create SDL programs on Atari using SDL binary build, + download it from my web site (URL at end of this file). + + If you want to configure a program using SDL on Atari, + see sections IV - VI. + + +============================================================================== +I. Building the Simple DirectMedia Layer libraries: + (This step isn't necessary if you have the SDL binary distribution) + + Do the classic configure, with --disable-shared --enable-static and: + + Tos version (should run everywhere): + --disable-threads + Tos does not support threads. + + MiNT version (maybe Magic, only for multitasking OS): + --disable-pthreads --enable-pth + Mint and Magic may supports threads, so audio can be used with current + devices, like Sun audio, or disk-writing support. Like Tos, interrupt + audio without threads is more suited for Atari machines. + + Then you can make ; make install it. + +============================================================================== +II. Building the Simple DirectMedia Layer test programs: + + Do the classic configure, then make. + + Run them ! + +============================================================================== +III. Enjoy! :) + + If you have a project you'd like me to know about, or want to ask questions, + go ahead and join the SDL developer's mailing list by sending e-mail to: + + sdl...@li... + + and put "subscribe" into the subject of the message. Or alternatively you + can use the web interface: + + http://www.libsdl.org/mailman/listinfo/sdl + +============================================================================== +IV. What is supported: + +Keyboard (GEMDOS, BIOS, GEM, Ikbd) +Mouse (XBIOS, GEM, Ikbd, /dev/mouse (non working atm, disabled)) +Video (XBIOS (Fullscreen), GEM (Windowed and Fullscreen)) +Timer (VBL vector, GNU pth library) +Joysticks and joypads (Ikbd, Hardware) +Audio (Hardware, XBIOS, GSXB, MCSN, STFA, /dev/audio if threads enabled) +Threads (Multitasking OS only via GNU pth library) +Shared object loader (using LDG library from http://ldg.atari.org/) +Audio CD (MetaDOS) +OpenGL (using Mesa offscreen rendering driver) + +- Dependent driver combinations: +Video Kbd Mouse Timer Joysticks +xbios ikbd ikbd vbl(2) ikbd +xbios gemdos xbios vbl(2) xbios +xbios bios xbios vbl(2) xbios +gem gem gem(1) vbl(2) xbios + +Audio O/S Misc +dma8 All Uses MFP Timer A interrupt +xbios TOS Uses MFP Timer A interrupt +xbios MiNT Uses MFP Timer A interrupt +xbios Magic Disabled +stfa All Uses MFP interrupt +mcsn TOS Uses MFP Timer A interrupt +mcsn MiNT Uses MiNT thread +mcsn Magic Disabled +gsxb All Uses GSXB callback + +Joypad driver always uses hardware access. +OpenGL driver always uses OSMesa. + +(1) GEM does not report relative mouse motion, so xbios mouse driver is used +to report this type event. +A preliminary driver for /dev/mouse device driver is present, but is disabled +till it can be used with other applications simultaneously. + +(2) If you build SDL with threads using the GNU pth library, timers are +supported via the pth library. + +============================================================================== +V. Environment variables: + +SDL_VIDEODRIVER: + Set to 'xbios' to force xbios video driver + Set to 'gem' to force gem video driver + +SDL_VIDEO_GL_DRIVER: + Set to filename to load as OpenGL library, if you use SDL_GL_LoadLibrary() + +SDL_AUDIODRIVER: + Set to 'mint_gsxb' to force Atari GSXB audio driver + Set to 'mint_mcsn' to force Atari MCSN audio driver + Set to 'mint_stfa' to force Atari STFA audio driver + Set to 'mint_xbios' to force Atari Xbios audio driver + Set to 'mint_dma8' to force Atari 8 bits DMA audio driver + Set to 'audio' to force Sun /dev/audio audio driver + Set to 'disk' to force disk-writing audio driver + +SDL_ATARI_EVENTSDRIVER + Set to 'ikbd' to force IKBD 6301 keyboard driver + Set to 'gemdos' to force gemdos keyboard driver + Set to 'bios' to force bios keyboard driver + +SDL_JOYSTICK_ATARI: + Use any of these strings in the environment variable to enable or + disable a joystick: + + 'ikbd-joy1-[on|off]' for IKBD joystick on port 1 (hardware access) + 'xbios-joy1-[on|off]' for IKBD joystick on port 1 (xbios access) + 'porta-pad-[on|off]' for joypad and/or teamtap on port A + 'porta-joy0-[on|off]' for joystick 0 on port A + 'porta-joy1-[on|off]' for joystick 1 on port A + 'porta-lp-[on|off]' for lightpen on port A + 'porta-anpad-[on|off]' for analog paddle on port A + 'portb-pad-[on|off]' for joypad and/or teamtap on port B + 'portb-joy0-[on|off]' for joystick 0 on port B + 'portb-joy1-[on|off]' for joystick 1 on port B + 'portb-anpad-[on|off]' for analog paddle on port B + + Default configuration is: + 'ikbd-joy1-on' (if IKBD events driver enabled) + 'xbios-joy1-on' (if gemdos/bios/gem events driver enabled) + 'porta-pad-on portb-pad-on' (if available on the machine) + + port[a|b]-[pad|joy?|lp|anpad]-* strings are mutually exclusives. + On such a port, you can only use a joypad OR 1 or 2 joysticks OR + a lightpen OR an analog paddle. You must disable joypad before + setting another controller. + + The second joystick port on IKBD is used by the mouse, so not usable. + Another problem with the IKBD: mouse buttons and joystick fire buttons + are wired together at the hardware level, it means: + port 0 port 0 port 1 + mouse left button = joystick fire 0 = joystick fire 1 + mouse right button = joystick fire 1 = joystick fire 0 + + Descriptions of joysticks/joypads: + - Joypads: 1 hat, 17 buttons (Atari Jaguar console-like). + - Joysticks: 1 hat, 1 button. + - Lightpen, analog paddles: 2 axis, 2 buttons. The 2 buttons are those + affected to 1 button joysticks on the same port. + +============================================================================== +VI. More informations about drivers: + +OpenGL: + The default is to use the Mesa offscreen driver (osmesa.ldg). If you want + to use an older OpenGL implementation, like mesa_gl.ldg or tiny_gl.ldg, + your program must use SDL_GL_LoadLibrary() to do so, and retrieve the + needed function pointers with SDL_LoadFunction(). In all cases, the OpenGL + context is taken care of by SDL itself, you just have to use gl* functions. + + However, there is one OpenGL call that has a different prototype in the old + implementations: glOrtho(). In the old implementations, it has 6 float as + parameters, in the standard one, it has 6 double parameters. If you want + to compile testdyngl, or any other SDL program that loads its OpenGL + library, you must change the glOrtho() prototype used in this program. In + osmesa.ldg, you can retrieve a glOrtho() with double parameters, by + searching for the function "glOrtho6d". + +Xbios video: + Video chip is detected using the _VDO cookie. + Screen enhancers are not supported, but could be if you know how to + use them. + + ST, STE, Mega ST, Mega STE: + 320x200x4 bits, shades of grey, available only for the purpose + of testing SDL. + TT: + 320x480x8 and 320x240x8 (software double-lined mode). + Falcon: + All modes supported by the current monitor (RVB or VGA). + BlowUp and Centscreen extended modes, ScreenBlaster 3 current mode. + Clones and any machine with monochrome monitor: + Not supported. + +Gem video: + Automatically used if xbios not available. + + All machines: + Only the current resolution, if 8 bits or higher depth. + +IKBD keyboard, mouse and joystick driver: + Available if _MCH cookie is ST, Mega ST, STE, Mega STE, TT or Falcon. + + Hades has an IKBD, but xbios is not available for video, so IKBD + driver is disabled. + +Gemdos and bios keyboard driver: + Available on all machines. + +Mouse and joystick xbios driver: + Available on all machines (I think). + +Joypad driver: + Available if _MCH cookie is STE or Falcon. Supports teamtap. + +PTH timer driver: + Available with multitasking OS. + +VBL timer driver: + Available on all machines (I think). + +Audio drivers: + Cookies _SND, MCSN, STFA and GSXB used to detect supported audio + capabilities. + + STE, Mega STE, TT: + 8 bits DMA (hardware access) + STFA, MCSN or GSXB driver if installed + Falcon: + 8 bits DMA (hardware access) + Xbios functions + STFA, MCSN or GSXB driver if installed + Other machines: + STFA, MCSN or GSXB driver if installed + + STFA driver: + http://removers.free.fr/softs/stfa.html + GSXB driver: + http://assemsoft.atari.org/gsxb/ + MacSound driver: + http://jf.omnis.ch/software/tos/ + MagicSound driver (MCSN,GSXB compatible): + http://perso.wanadoo.fr/didierm/ + X-Sound driver (GSXB compatible): + http://www.uni-ulm.de/~s_thuth/atari/xsound_e.html + +-- +Patrice Mandin <pm...@ca...> +http://pmandin.atari.org/ Added: trunk/libs/SDL-1.2.13/README.Porting =================================================================== --- trunk/libs/SDL-1.2.13/README.Porting (rev 0) +++ trunk/libs/SDL-1.2.13/README.Porting 2008-08-05 16:06:33 UTC (rev 313) @@ -0,0 +1,56 @@ + +* Porting To A New Platform + + The first thing you have to do when porting to a new platform, is look at +include/SDL_platform.h and create an entry there for your operating system. +The standard format is __PLATFORM__, where PLATFORM is the name of the OS. +Ideally SDL_platform.h will be able to auto-detect the system it's building +on based on C preprocessor symbols. + +There are two basic ways of building SDL at the moment: + +1. The "UNIX" way: ./configure; make; make install + + If you have a GNUish system, then you might try this. Edit configure.in, + take a look at the large section labelled: + "Set up the configuration based on the target platform!" + Add a section for your platform, and then re-run autogen.sh and build! + +2. Using an IDE: + + If you're using an IDE or other non-configure build system, you'll probably + want to create a custom SDL_config.h for your platform. Edit SDL_config.h, + add a section for your platform, and create a custom SDL_config_{platform}.h, + based on SDL_config.h.minimal and SDL_config.h.in + + Add the top level include directory to the header search path, and then add + the following sources to the project: + src/*.c + src/audio/*.c + src/cdrom/*.c + src/cpuinfo/*.c + src/events/*.c + src/file/*.c + src/joystick/*.c + src/stdlib/*.c + src/thread/*.c + src/timer/*.c + src/video/*.c + src/audio/disk/*.c + src/video/dummy/*.c + src/joystick/dummy/*.c + src/cdrom/dummy/*.c + src/thread/generic/*.c + src/timer/dummy/*.c + src/loadso/dummy/*.c + + +Once you have a working library without any drivers, you can go back to each +of the major subsystems and start implementing drivers for your platform. + +If you have any questions, don't hesitate to ask on the SDL mailing list: + http://www.libsdl.org/mailing-list.php + +Enjoy! + Sam Lantinga (sl...@li...) + Added: trunk/libs/SDL-1.2.13/README.SVN =================================================================== --- trunk/libs/SDL-1.2.13/README.SVN (rev 0) +++ trunk/libs/SDL-1.2.13/README.SVN 2008-08-05 16:06:33 UTC (rev 313) @@ -0,0 +1,20 @@ + +The latest development version of SDL is available via Subversion. +Subversion allows you to get up-to-the-minute fixes and enhancements; +as a developer works on a source tree, you can use svn to mirror that +source tree instead of waiting for an official release. Please look +at the Subversion website ( http://subversion.tigris.org/ ) for more +information on using svn, where you can also download software for +MacOS, Windows, and Unix systems. + + svn checkout http://svn.libsdl.org/branches/SDL-1.2 + +If you are building SDL with an IDE, you will need to copy the file +include/SDL_config.h.default to include/SDL_config.h before building. + +If you are building SDL via configure, you will need to run autogen.sh +before running configure. + +There is a web interface to the subversion repository at: + http://www.libsdl.org/cgi/viewvc.cgi + Added: trunk/libs/SDL-1.2.13/README.WinCE =================================================================== --- trunk/libs/SDL-1.2.13/README.WinCE (rev 0) +++ trunk/libs/SDL-1.2.13/README.WinCE 2008-08-05 16:06:33 UTC (rev 313) @@ -0,0 +1,55 @@ + +Project files for embedded Visual C++ 3.0, 4.0 and +Visual Studio 2005 can be found in VisualCE.zip + +SDL supports GAPI and WinDib output for Windows CE. + +GAPI driver supports: + +- all possible WinCE devices (Pocket PC, Smartphones, HPC) + with different orientations of video memory and resolutions. +- 4, 8 and 16 bpp devices +- special handling of 8bpp on 8bpp devices +- VGA mode, you can even switch between VGA and GAPI in runtime + (between 240x320 and 480x640 for example). On VGA devices you can + use either GAPI or VGA. +- Landscape mode and automatic rotation of buttons and stylus coordinates. + To enable landscape mode make width of video screen bigger than height. + For example: + SDL_SetVideoMode(320,240,16,SDL_FULLSCREEN) +- WM2005 +- SDL_ListModes + +NOTE: +There are several SDL features not available in the WinCE port of SDL. + +- DirectX is not yet available +- Semaphores are not available +- Joystick support is not available +- CD-ROM control is not available + +In addition, there are several features that run in "degraded" mode: + +Preprocessor Symbol Effect +=================== ================================= + +SDL_systimer.c: +USE_GETTICKCOUNT Less accurate values for SDL time functions +USE_SETTIMER Use only a single marginally accurate timer + +SDL_syswm.c: +DISABLE_ICON_SUPPORT Can't set the runtime window icon + +SDL_sysmouse.c: +USE_STATIC_CURSOR Only the arrow cursor is available + +SDL_sysevents.c: +NO_GETKEYBOARDSTATE Can't get modifier state on keyboard focus + +SDL_dibevents.c: +NO_GETKEYBOARDSTATE Very limited keycode translation + +SDL_dibvideo.c: +NO_GETDIBITS Can't distinguish between 15 bpp and 16 bpp +NO_CHANGEDISPLAYSETTINGS No fullscreen support +NO_GAMMA_SUPPORT Gamma correction not available Property changes on: trunk/libs/SDL-1.2.13/VisualCE.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/libs/SDL-1.2.13/Xcode.tar.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/libs/SDL-1.2.13/sdl-config.in =================================================================== --- trunk/libs/SDL-1.2.13/sdl-config.in (rev 0) +++ trunk/libs/SDL-1.2.13/sdl-config.in 2008-08-05 16:06:33 UTC (rev 313) @@ -0,0 +1,60 @@ +#!/bin/sh + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +exec_prefix_set=no +libdir=@libdir@ + +@ENABLE_STATIC_FALSE@usage="\ +@ENABLE_STATIC_FALSE@Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]" +@ENABLE_STATIC_TRUE@usage="\ +@ENABLE_STATIC_TRUE@Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]" + +if test $# -eq 0; then + echo "${usage}" 1>&2 + exit 1 +fi + +while test $# -gt 0; do + case "$1" in + -*=*) optarg=`echo "$1" | LC_ALL="C" sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + case $1 in + --prefix=*) + prefix=$optarg + if test $exec_prefix_set = no ; then + exec_prefix=$optarg + fi + ;; + --prefix) + echo $prefix + ;; + --exec-prefix=*) + exec_prefix=$optarg + exec_prefix_set=yes + ;; + --exec-prefix) + echo $exec_prefix + ;; + --version) + echo @SDL_VERSION@ + ;; + --cflags) + echo -I@includedir@/SDL @SDL_CFLAGS@ + ;; +@ENABLE_SHARED_TRUE@ --libs) +@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@ +@ENABLE_SHARED_TRUE@ ;; +@ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs) +@ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs) +@ENABLE_STATIC_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@ +@ENABLE_STATIC_TRUE@ ;; + *) + echo "${usage}" 1>&2 + exit 1 + ;; + esac + shift +done Added: trunk/libs/SDL-1.2.13/sdl.m4 =================================================================== --- trunk/libs/SDL-1.2.13/sdl.m4 (rev 0) +++ trunk/libs/SDL-1.2.13/sdl.m4 2008-08-05 16:06:33 UTC (rev 313) @@ -0,0 +1,181 @@ +# Configure paths for SDL +# Sam Lantinga 9/21/99 +# stolen from Manish Singh +# stolen back from Frank Belew +# stolen from Manish Singh +# Shamelessly stolen from Owen Taylor + +dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS +dnl +AC_DEFUN([AM_PATH_SDL], +[dnl +dnl Get the cflags and libraries from the sdl-config script +dnl +AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], + sdl_prefix="$withval", sdl_prefix="") +AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], + sdl_exec_prefix="$withval", sdl_exec_prefix="") +AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], + , enable_sdltest=yes) + + if test x$sdl_exec_prefix != x ; then + sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix" + if test x${SDL_CONFIG+set} != xset ; then + SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config + fi + fi + if test x$sdl_prefix != x ; then + sdl_config_args="$sdl_config_args --prefix=$sdl_prefix" + if test x${SDL_CONFIG+set} != xset ; then + SDL_CONFIG=$sdl_prefix/bin/sdl-config + fi + fi + + if test "x$prefix" != xNONE; then + PATH="$prefix/bin:$prefix/usr/bin:$PATH" + fi + AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) + min_sdl_version=ifelse([$1], ,0.11.0,$1) + AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) + no_sdl="" + if test "$SDL_CONFIG" = "no" ; then + no_sdl=yes + else + SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags` + SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs` + + sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_sdltest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_CXXFLAGS="$CXXFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $SDL_CFLAGS" + CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" + LIBS="$LIBS $SDL_LIBS" +dnl +dnl Now check if the installed SDL is sufficiently new. (Also sanity +dnl checks the results of sdl-config to some extent +dnl + rm -f conf.sdltest + AC_TRY_RUN([ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include "SDL.h" + +char* +my_strdup (char *str) +{ + char *new_str; + + if (str) + { + new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); + strcpy (new_str, str); + } + else + new_str = NULL; + + return new_str; +} + +int main (int argc, char *argv[]) +{ + int major, minor, micro; + char *tmp_version; + + /* This hangs on some systems (?) + system ("touch conf.sdltest"); + */ + { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = my_strdup("$min_sdl_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_sdl_version"); + exit(1); + } + + if (($sdl_major_version > major) || + (($sdl_major_version == major) && ($sdl_minor_version > minor)) || + (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); + printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); + printf("*** best to upgrade to the required version.\n"); + printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); + printf("*** to point to the correct copy of sdl-config, and remove the file\n"); + printf("*** config.cache before re-running configure\n"); + return 1; + } +} + +],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + CXXFLAGS="$ac_save_CXXFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_sdl" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$SDL_CONFIG" = "no" ; then + echo "*** The sdl-config script installed by SDL could not be found" + echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the SDL_CONFIG environment variable to the" + echo "*** full path to sdl-config." + else + if test -f conf.sdltest ; then + : + else + echo "*** Could not run SDL test program, checking why..." + CFLAGS="$CFLAGS $SDL_CFLAGS" + CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" + LIBS="$LIBS $SDL_LIBS" + AC_TRY_LINK([ +#include <stdio.h> +#include "SDL.h" + +int main(int argc, char *argv[]) +{ return 0; } +#undef main +#define main K_and_R_C_main +], [ return 0; ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding SDL or finding the wrong" + echo "*** version of SDL. If it is not finding SDL, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means SDL was incorrectly installed" + echo "*** or that you have moved SDL since it was installed. In the latter case, you" + echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + CXXFLAGS="$ac_save_CXXFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + SDL_CFLAGS="" + SDL_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(SDL_CFLAGS) + AC_SUBST(SDL_LIBS) + rm -f conf.sdltest +]) Added: trunk/libs/SDL-1.2.13/src/SDL.c =================================================================== --- trunk/libs/SDL-1.2.13/src/SDL.c (rev 0) +++ trunk/libs/SDL-1.2.13/src/SDL.c 2008-08-05 16:06:33 UTC (rev 313) @@ -0,0 +1,353 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + sl...@li... +*/ +#include "SDL_config.h" + +/* Initialization code for SDL */ + +#include "SDL.h" +#include "SDL_fatal.h" +#if !SDL_VIDEO_DISABLED +#include "video/SDL_leaks.h" +#endif + +#if SDL_THREAD_PTH +#include <pth.h> +#endif + +/* Initialization/Cleanup routines */ +#if !SDL_JOYSTICK_DISABLED +extern int SDL_JoystickInit(void); +extern void SDL_JoystickQuit(void); +#endif +#if !SDL_CDROM_DISABLED +extern int SDL_CDROMInit(void); +extern void SDL_CDROMQuit(void); +#endif +#if !SDL_TIMERS_DISABLED +extern void SDL_StartTicks(void); +extern int SDL_TimerInit(void); +extern void SDL_TimerQuit(void); +#endif + +/* The current SDL version */ +static SDL_version version = + { SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL }; + +/* The initialized subsystems */ +static Uint32 SDL_initialized = 0; +#if !SDL_TIMERS_DISABLED +static Uint32 ticks_started = 0; +#endif + +#ifdef CHECK_LEAKS +int surfaces_allocated = 0; +#endif + +int SDL_InitSubSystem(Uint32 flags) +{ +#if !SDL_VIDEO_DISABLED + /* Initialize the video/event subsystem */ + if ( (flags & SDL_INIT_VIDEO) && !(SDL_initialized & SDL_INIT_VIDEO) ) { + if ( SDL_VideoInit(SDL_getenv("SDL_VIDEODRIVER"), + (flags&SDL_INIT_EVENTTHREAD)) < 0 ) { + return(-1); + } + SDL_initialized |= SDL_INIT_VIDEO; + } +#else + if ( flags & SDL_INIT_VIDEO ) { + SDL_SetError("SDL not built with video support"); + return(-1); + } +#endif + +#if !SDL_AUDIO_DISABLED + /* Initialize the audio subsystem */ + if ( (flags & SDL_INIT_AUDIO) && !(SDL_initialized & SDL_INIT_AUDIO) ) { + if ( SDL_AudioInit(SDL_getenv("SDL_AUDIODRIVER")) < 0 ) { + return(-1); + } + SDL_initialized |= SDL_INIT_AUDIO; + } +#else + if ( flags & SDL_INIT_AUDIO ) { + SDL_SetError("SDL not built with audio support"); + return(-1); + } +#endif + +#if !SDL_TIMERS_DISABLED + /* Initialize the timer subsystem */ + if ( ! ticks_started ) { + SDL_StartTicks(); + ticks_started = 1; + } + if ( (flags & SDL_INIT_TIMER) && !(SDL_initialized & SDL_INIT_TIMER) ) { + if ( SDL_TimerInit() < 0 ) { + return(-1); + } + SDL_initialized |= SDL_INIT_TIMER; + } +#else + if ( flags & SDL_INIT_TIMER ) { + SDL_SetError("SDL not built with timer support"); + return(-1); + } +#endif + +#if !SDL_JOYSTICK_DISABLED + /* Initialize the joystick subsystem */ + if ( (flags & SDL_INIT_JOYSTICK) && + !(SDL_initialized & SDL_INIT_JOYSTICK) ) { + if ( SDL_JoystickInit() < 0 ) { + return(-1); + } + SDL_initialized |= SDL_INIT_JOYSTICK; + } +#else + if ( flags & SDL_INIT_JOYSTICK ) { + SDL_SetError("SDL not built with joystick support"); + return(-1); + } +#endif + +#if !SDL_CDROM_DISABLED + /* Initialize the CD-ROM subsystem */ +#ifdef GP2X_DEBUG + fputs("SDL_GP2X: Initializing CDROM subsystem, but it should have been disabled.\n", stderr); +#endif + if ( (flags & SDL_INIT_CDROM) && !(SDL_initialized & SDL_INIT_CDROM) ) { + if ( SDL_CDROMInit() < 0 ) { + return(-1); + } + SDL_initialized |= SDL_INIT_CDROM; + } +#else + if ( flags & SDL_INIT_CDROM ) { + SDL_SetError("SDL not built with cdrom support"); + return(-1); + } +#endif + return(0); +} + +int SDL_Init(Uint32 flags) +{ +#if !SDL_THREADS_DISABLED && SDL_THREAD_PTH + if (!pth_init()) { + return -1; + } +... [truncated message content] |
From: <sen...@us...> - 2008-07-30 19:54:09
|
Revision: 312 http://open2x.svn.sourceforge.net/open2x/?rev=312&view=rev Author: senquack Date: 2008-07-30 19:54:16 +0000 (Wed, 30 Jul 2008) Log Message: ----------- Adding volume scaling adjustment utility Added Paths: ----------- trunk/utils/volumescale/ trunk/utils/volumescale/Makefile trunk/utils/volumescale/open2x_volumescale.c Added: trunk/utils/volumescale/Makefile =================================================================== --- trunk/utils/volumescale/Makefile (rev 0) +++ trunk/utils/volumescale/Makefile 2008-07-30 19:54:16 UTC (rev 312) @@ -0,0 +1,35 @@ +CFLAGS=-c -O2 -g -Wall -DPLATFORM_GP2X -mcpu=arm920t -mtune=arm920 -ffast-math -W -Wall -pthread -msoft-float + +LDFLAGS=-L/opt/open2x/gcc-4.1.1-glibc-2.3.6/lib -Wl,-rpath,/opt/open2x/gcc-4.1.1-glibc-2.3.6/lib -static -lgcc -lm -lc -ldl -larmmem -msoft-float -O2 + +SOURCES=open2x_volumescale.c + + +OBJECTS=$(SOURCES:.c=.o) +EXECUTABLEGP=open2x_volumescale.gpe + +CC=arm-open2x-linux-gcc +CFLAGS+=-I/opt/open2x/gcc-4.1.1-glibc-2.3.6/include/ \ + -I/opt/open2x/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux/include/ \ + -I/opt/open2x/gcc-4.1.1-glibc-2.3.6/include/SDL -D_REENTRANT \ + -msoft-float -DPLATFORM_GP2X + +all: + make gpversion + +gpversion: $(SOURCES) $(EXECUTABLEGP) + + +$(EXECUTABLEGP): $(OBJECTS) + $(CC) $(LDFLAGS) -static $(OBJECTS) -o $@ $(GPLDFLAGS) + + +.c.o: + $(CC) $(CFLAGS) $< -o $@ + +cleanobjs: + rm -f $(OBJECTS) + +clean: + -rm -f open2x_volumescale open2x_volumescale.gpe *~ *.o *.bak + Added: trunk/utils/volumescale/open2x_volumescale.c =================================================================== --- trunk/utils/volumescale/open2x_volumescale.c (rev 0) +++ trunk/utils/volumescale/open2x_volumescale.c 2008-07-30 19:54:16 UTC (rev 312) @@ -0,0 +1,142 @@ +#include <stdlib.h> + +#include <stdio.h> + +#include <sys/ioctl.h> +#include <sys/soundcard.h> +#include <unistd.h> +#include <fcntl.h> + +const int max_scale_factor = 200; + +void gp2x_set_volume(int newvol) +{ + if ((newvol >= 0) && (newvol <= 100)) { + unsigned long soundDev = open("/dev/mixer", O_RDWR); + if (soundDev) + { + int vol = ((newvol << 8) | newvol); + ioctl(soundDev, SOUND_MIXER_WRITE_PCM, &vol); + close(soundDev); + } + } +} + +//DKS - new, called at startup so we can +// set it back to what it was when we exit. +// Returns 0-100, current mixer volume, -1 on error. +int gp2x_get_volume(void) +{ + int vol = -1; + unsigned long soundDev = open("/dev/mixer", O_RDONLY); + if (soundDev) + { + ioctl(soundDev, SOUND_MIXER_READ_PCM, &vol); + close(soundDev); + if (vol != -1) { + //just return one channel , not both channels, they're hopefully the same anyways + return (vol & 0xFF); + } + } + return vol; +} + +int gp2x_get_scalefactor(void) +{ + int currentscalefactor = -1; + unsigned long soundDev = open("/dev/mixer", O_RDONLY); + if (soundDev) + { + ioctl(soundDev, SOUND_MIXER_PRIVATE1, ¤tscalefactor); + close(soundDev); + } + return currentscalefactor; +} + +void gp2x_set_scalefactor(int newfactor) +{ + if ((newfactor >= 0) && (newfactor <= max_scale_factor)) { + unsigned long soundDev = open("/dev/mixer", O_WRONLY); + if (soundDev) + { + ioctl(soundDev, SOUND_MIXER_PRIVATE2, &newfactor); + close(soundDev); + } + } +} + +// Entry point +int main(int argc, char *argv[]) +{ + + if (argc > 1) { + // We have been passed command-line parameters + switch (argv[1][1]) { + case 'h': + // display help: + printf("GP2X master volume scaling/muting utility written by Senor Quack v1.0\n"); + printf("GPL license, free for copying and use under GPL terms.\n\n"); + printf("OPTIONS:\n"); + printf("-h\t\t\t:\tDisplay this help and version info\n\n"); + printf("-sSCALEFACTOR\t\t:\tSet the overriding scale factor to a number between 0 and 200.\n"); + printf("\t\t\t\t(Returns immediately, return status is 0 on success.)\n"); + printf("\tSCALEFACTOR is stored in the kernel audio driver and all values\n"); + printf("\twritten to /dev/mixer involving volume changes get scaled to this\n"); + printf("\tpercentage. Therefore a value of 100 would cause no overall changes.\n"); + printf("\tA value of 50 would cause all values sent to be half their original value.\n"); + printf("\tA value of 0 will mute the entire system until the scale factor is set\n"); + printf("\tdifferently.\n\n"); + printf("\tValues > %d will be clipped to %d.\n", max_scale_factor, max_scale_factor); + printf("\tValues < 0 will be clipped to 0.\n\n"); + printf("* The current mixer value is read and then set to a new scaled value if\n"); + printf("\tthe -s option was used to set a new scaling factor, so changes take\n"); + printf("\tplace immediately.\n"); + printf("* Program will return the resulting scale factor as its return value, \n"); + printf("\tor, if no arguments were passed, the current factor, or -1 on error..\n"); + break; + case 's': + // caller wants to set a new volume scale factor + if (argv[1][2] == '\0') { + //caller didn't supply required argument to -s + printf("Error: -s requires a parameter, see help by passing -h\n"); + return -1; + } else { + int newscalefactor = atoi(&argv[1][2]); + if (newscalefactor < 0) { + //caller supplied scale factor that is out of range + newscalefactor = 0; + } else if (newscalefactor > max_scale_factor) { + //caller supplied scale factor that is out of range + newscalefactor = max_scale_factor; + } + + // set scaling factor, then read and write back current mixer value to + // make changes effective immediately + gp2x_set_scalefactor(newscalefactor); + + int current_vol; + current_vol = gp2x_get_volume(); + if ((current_vol >= 0) && (current_vol <= 100)) { + gp2x_set_volume(current_vol); + } + + return gp2x_get_scalefactor(); + + } + break; + default: + // invalid parameter + printf("Error: invalid parameter passed, see help by passing -h\n"); + return -1; + } // switch + } else { + // we were not passed any parameters, just return the current scalefactor + return gp2x_get_scalefactor(); + } + + // if we get here, something odd happened, return an error + return -1; + + +} + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sen...@us...> - 2008-07-30 19:38:12
|
Revision: 311 http://open2x.svn.sourceforge.net/open2x/?rev=311&view=rev Author: senquack Date: 2008-07-30 19:37:59 +0000 (Wed, 30 Jul 2008) Log Message: ----------- Modified Paths: -------------- trunk/kernel/linux-open2x-2.4.26_FW2-3/.config trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/config.in trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/mach-mmsp2/proto_gpio.c trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/block/ll_rw_blk.c trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/Config.in trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/Makefile trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/mmsp2-key.c trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/mmsp2_batt.c trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/media/video/mmsp2_cx25874.c trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/mmcsd/mmcsd_slot_mmsp2.c trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_hapn4800.h trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/sound/Config.in trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/sound/ac97_codec.c trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/sound/ac97_plugin_wm97xx.c trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/sound/mp2520f-ac97.c trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/sound/mp2520f-audio.c trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/video/mmsp2fb.c trunk/kernel/linux-open2x-2.4.26_FW2-3/include/linux/ac97_codec.h trunk/kernel/linux-open2x-2.4.26_FW2-3/include/linux/blkdev.h trunk/kernel/linux-open2x-2.4.26_FW2-3/include/linux/miscdevice.h trunk/kernel/linux-open2x-2.4.26_FW2-3/include/linux/soundcard.h trunk/kernel/linux-open2x-2.4.26_FW2-3/kernel/sys.c Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/.config =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/.config 2008-07-29 18:34:38 UTC (rev 310) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/.config 2008-07-30 19:37:59 UTC (rev 311) @@ -135,7 +135,10 @@ # CONFIG_MACH_MMSP2_DTK3 is not set CONFIG_MACH_MMSP2_DTK4=y CONFIG_MACH_GP2X=y +# CONFIG_MACH_GP2XF200 is not set # CONFIG_MACH_GP2X_DEBUG is not set +# CONFIG_MACH_GP2X_SVIDEO_NTSC is not set +# CONFIG_MACH_GP2X_SVIDEO_PAL is not set CONFIG_MMSP2_USBDEV=m CONFIG_MMSP2_USBDEV_NETLINK=m # CONFIG_ARCH_ACORN is not set @@ -174,6 +177,7 @@ # CONFIG_ZBOOT_ROM is not set CONFIG_ZBOOT_ROM_TEXT=0 CONFIG_ZBOOT_ROM_BSS=0 +CONFIG_KEXEC=y CONFIG_HOTPLUG=y # @@ -279,6 +283,8 @@ CONFIG_MTD_NAND=y # CONFIG_MTD_NAND_VERIFY_WRITE is not set # CONFIG_MTD_NAND_BONFS is not set +# CONFIG_MTD_OPEN2X_SINGLE_PARTITION is not set +# CONFIG_OPEN2X_IGNORE_BB_ERASE is not set # CONFIG_MTD_NAND_SPIA is not set # CONFIG_MTD_NAND_TOTO is not set # CONFIG_MTD_NAND_AUTCPU12 is not set @@ -307,7 +313,7 @@ # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_NBD=y +CONFIG_BLK_DEV_NBD=m # CONFIG_BLK_DEV_RAM is not set # CONFIG_BLK_DEV_INITRD is not set # CONFIG_BLK_STATS is not set @@ -327,12 +333,12 @@ # # Networking options # -CONFIG_PACKET=y +CONFIG_PACKET=m # CONFIG_PACKET_MMAP is not set # CONFIG_NETLINK_DEV is not set # CONFIG_NETFILTER is not set CONFIG_FILTER=y -CONFIG_UNIX=y +CONFIG_UNIX=m CONFIG_INET=y CONFIG_IP_MULTICAST=y # CONFIG_IP_ADVANCED_ROUTER is not set @@ -386,83 +392,9 @@ # # Network device support # -CONFIG_NETDEVICES=y +# CONFIG_NETDEVICES is not set # -# ARCnet devices -# -# CONFIG_ARCNET is not set -# CONFIG_DUMMY is not set -# CONFIG_BONDING is not set -# CONFIG_EQUALIZER is not set -# CONFIG_TUN is not set -# CONFIG_ETHERTAP is not set - -# -# Ethernet (10 or 100Mbit) -# -CONFIG_NET_ETHERNET=y -# CONFIG_ARM_AM79C961A is not set -# CONFIG_CS89x0 is not set -# CONFIG_ARM_CIRRUS is not set -# CONFIG_SUNLANCE is not set -# CONFIG_SUNBMAC is not set -# CONFIG_SUNQE is not set -# CONFIG_SUNGEM is not set -# CONFIG_NET_VENDOR_3COM is not set -# CONFIG_LANCE is not set -# CONFIG_NET_VENDOR_SMC is not set -# CONFIG_NET_VENDOR_RACAL is not set -# CONFIG_NET_ISA is not set -# CONFIG_NET_PCI is not set -# CONFIG_NET_POCKET is not set - -# -# Ethernet (1000 Mbit) -# -# CONFIG_ACENIC is not set -# CONFIG_DL2K is not set -# CONFIG_E1000 is not set -# CONFIG_MYRI_SBUS is not set -# CONFIG_NS83820 is not set -# CONFIG_HAMACHI is not set -# CONFIG_YELLOWFIN is not set -# CONFIG_R8169 is not set -# CONFIG_SK98LIN is not set -# CONFIG_TIGON3 is not set -# CONFIG_FDDI is not set -# CONFIG_HIPPI is not set -# CONFIG_PLIP is not set -# CONFIG_PPP is not set -# CONFIG_SLIP is not set - -# -# Wireless LAN (non-hamradio) -# -CONFIG_NET_RADIO=y -# CONFIG_STRIP is not set -# CONFIG_WAVELAN is not set -# CONFIG_ARLAN is not set -# CONFIG_AIRONET4500 is not set -# CONFIG_AIRONET4500_NONCS is not set -# CONFIG_AIRONET4500_PROC is not set -# CONFIG_HERMES is not set -# CONFIG_NET_WIRELESS is not set - -# -# Token Ring devices -# -# CONFIG_TR is not set -# CONFIG_NET_FC is not set -# CONFIG_RCPCI is not set -# CONFIG_SHAPER is not set - -# -# Wan interfaces -# -# CONFIG_WAN is not set - -# # Amateur Radio support # # CONFIG_HAMRADIO is not set @@ -557,9 +489,10 @@ # CONFIG_MMSP2_TPC is not set CONFIG_MMSP2_DUALCPU=m CONFIG_MMSP2_VPP=y -CONFIG_MMSP2_ISP=m +CONFIG_MMSP2_ISP=y CONFIG_MMSP2_KEY=y CONFIG_MMSP_GPX_BATT=y +# CONFIG_MMSP_GP2X_ADC is not set # # L3 serial bus support @@ -732,7 +665,7 @@ CONFIG_JFFS2_FS=m CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_NAND=y -CONFIG_CRAMFS=m +CONFIG_CRAMFS=y CONFIG_TMPFS=y CONFIG_RAMFS=y CONFIG_ISO9660_FS=m @@ -842,7 +775,7 @@ # CONFIG_NLS_CODEPAGE_936 is not set # CONFIG_NLS_CODEPAGE_950 is not set # CONFIG_NLS_CODEPAGE_932 is not set -CONFIG_NLS_CODEPAGE_949=m +# CONFIG_NLS_CODEPAGE_949 is not set # CONFIG_NLS_CODEPAGE_874 is not set # CONFIG_NLS_ISO8859_8 is not set # CONFIG_NLS_CODEPAGE_1250 is not set @@ -935,7 +868,6 @@ CONFIG_SOUND_MP2520F_AC97=y # CONFIG_SOUND_TVMIXER is not set # CONFIG_SOUND_AD1980 is not set -# CONFIG_SOUND_WM97XX is not set # # Multimedia Capabilities Port drivers @@ -1062,6 +994,7 @@ # CONFIG_MMCSD=y # CONFIG_MMCSD_DEBUG is not set +# CONFIG_OPEN2X_SD_AUTOMOUNT is not set CONFIG_MMCSD_DISK=y CONFIG_MMCSD_SLOT=y @@ -1112,6 +1045,6 @@ # Library routines # # CONFIG_CRC32 is not set -CONFIG_ZLIB_INFLATE=m +CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m # CONFIG_FW_LOADER is not set Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/config.in =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/config.in 2008-07-29 18:34:38 UTC (rev 310) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/config.in 2008-07-30 19:37:59 UTC (rev 311) @@ -183,6 +183,18 @@ endmenu +#DKS - disabling in favor of options pulled from GPH source +#mainmenu_option next_comment +#comment 'MMSP2 Implementation' +#dep_bool ' enable SHADOW' CONFIG_MMSP2_SHADOW_ENABLE $CONFIG_ARCH_MMSP2 +#dep_bool ' MDK(MB2520F or E-PLAY) by MagicEyes.' CONFIG_MACH_MMSP2_MDK $CONFIG_ARCH_MMSP2 +#dep_bool ' DTK 3 board by MagicEyes.' CONFIG_MACH_MMSP2_DTK3 $CONFIG_ARCH_MMSP2 +#dep_bool ' DTK 4 board by MagicEyes.' CONFIG_MACH_MMSP2_DTK4 $CONFIG_ARCH_MMSP2 +#dep_bool ' GP2X board by GameParkHoldings.' CONFIG_MACH_GP2X $CONFIG_ARCH_MMSP2 +#dep_bool ' GP2X DEBUG ENABLE.' CONFIG_MACH_GP2X_DEBUG $CONFIG_ARCH_MMSP2 +#dep_tristate 'MMSP2 USB function support' CONFIG_MMSP2_USBDEV $CONFIG_ARCH_MMSP2 +#dep_tristate ' Support for MMSP2 USB network link function' CONFIG_MMSP2_USBDEV_NETLINK $CONFIG_MMSP2_USBDEV +#endmenu mainmenu_option next_comment comment 'MMSP2 Implementation' dep_bool ' enable SHADOW' CONFIG_MMSP2_SHADOW_ENABLE $CONFIG_ARCH_MMSP2 @@ -190,9 +202,12 @@ dep_bool ' DTK 3 board by MagicEyes.' CONFIG_MACH_MMSP2_DTK3 $CONFIG_ARCH_MMSP2 dep_bool ' DTK 4 board by MagicEyes.' CONFIG_MACH_MMSP2_DTK4 $CONFIG_ARCH_MMSP2 dep_bool ' GP2X board by GameParkHoldings.' CONFIG_MACH_GP2X $CONFIG_ARCH_MMSP2 +dep_bool ' GP2X-F200 board by GameParkHoldings.' CONFIG_MACH_GP2XF200 $CONFIG_ARCH_MMSP2 dep_bool ' GP2X DEBUG ENABLE.' CONFIG_MACH_GP2X_DEBUG $CONFIG_ARCH_MMSP2 +dep_bool ' GP2X SVIDEO BOOTING(NTSC).' CONFIG_MACH_GP2X_SVIDEO_NTSC $CONFIG_GP2X_ONLY_TV +dep_bool ' GP2X SVIDEO BOOTING(PAL).' CONFIG_MACH_GP2X_SVIDEO_PAL $CONFIG_GP2X_ONLY_TV dep_tristate 'MMSP2 USB function support' CONFIG_MMSP2_USBDEV $CONFIG_ARCH_MMSP2 -dep_tristate ' Support for MMSP2 USB network link function' CONFIG_MMSP2_USBDEV_NETLINK $CONFIG_MMSP2_USBDEV +dep_tristate ' Support for MMSP2 USB network link function' CONFIG_MMSP2_USBDEV_NETLINK $CONFI endmenu # Definitions to make life easier Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/mach-mmsp2/proto_gpio.c =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/mach-mmsp2/proto_gpio.c 2008-07-29 18:34:38 UTC (rev 310) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/mach-mmsp2/proto_gpio.c 2008-07-30 19:37:59 UTC (rev 311) @@ -35,6 +35,9 @@ static unsigned char sdbitSize; static unsigned char usbFlag=0; static unsigned char sdMode=2; +static unsigned int gp2xInfoVarLsb; +static unsigned int gp2xInfoVarMsb; +static unsigned char usbHconFlag=0; void GPIO_Initialize(void) { pGPIO_REG = MMSP20_GetBase_GPIO(); @@ -320,9 +323,34 @@ return sdMode; } +void SetGp2xInfo(unsigned int info,int infoFlag) +{ + if(infoFlag) gp2xInfoVarLsb=info; + else gp2xInfoVarMsb=info; +} + +unsigned int GetGp2xInfo(int infoFlag) +{ + if(infoFlag) return gp2xInfoVarLsb; + else return gp2xInfoVarMsb; +} + +void SetUsbHcon(unsigned char flag) +{ + usbHconFlag = flag; +} + +unsigned char GetUshHcon(void) +{ + return usbHconFlag; +} + +EXPORT_SYMBOL(SetUsbHcon); +EXPORT_SYMBOL(GetUshHcon); +EXPORT_SYMBOL(GetGp2xInfo); +EXPORT_SYMBOL(SetGp2xInfo); EXPORT_SYMBOL(mmsp_set_SDCLK); EXPORT_SYMBOL(mmsp_get_SDCLK); -EXPORT_SYMBOL(mmsp_get_usbCONN); EXPORT_SYMBOL(mmsp_set_usbCONN); EXPORT_SYMBOL(mmsp_get_sdsize); EXPORT_SYMBOL(set_gpio_ctrl); Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/block/ll_rw_blk.c =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/block/ll_rw_blk.c 2008-07-29 18:34:38 UTC (rev 310) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/block/ll_rw_blk.c 2008-07-30 19:37:59 UTC (rev 311) @@ -186,7 +186,7 @@ * when a block device is being de-registered. Currently, its * primary task it to free all the &struct request structures that * were allocated to the queue. - * Caveat: + * Caveat: * Hopefully the low level driver will have finished any * outstanding requests first... **/ @@ -227,7 +227,7 @@ * * When a queue is plugged the head will be assumed to be inactive. **/ - + void blk_queue_headactive(request_queue_t * q, int active) { q->head_active = active; @@ -245,7 +245,7 @@ * addition to calling blk_started_io and blk_finished_io in order to * keep track of the number of sectors in flight. **/ - + void blk_queue_throttle_sectors(request_queue_t * q, int active) { q->can_throttle = active; @@ -337,7 +337,7 @@ return 0; } -static int ll_back_merge_fn(request_queue_t *q, struct request *req, +static int ll_back_merge_fn(request_queue_t *q, struct request *req, struct buffer_head *bh, int max_segments) { if (blk_seg_merge_ok(req->bhtail, bh)) @@ -346,7 +346,7 @@ return ll_new_segment(q, req, max_segments); } -static int ll_front_merge_fn(request_queue_t *q, struct request *req, +static int ll_front_merge_fn(request_queue_t *q, struct request *req, struct buffer_head *bh, int max_segments) { if (blk_seg_merge_ok(bh, req->bh)) @@ -458,9 +458,9 @@ if (q->batch_requests > 32) q->batch_requests = 32; q->batch_sectors = max_queue_sectors / 4; - + q->max_queue_sectors = max_queue_sectors; - + BUG_ON(!q->batch_sectors); atomic_set(&q->nr_sectors, 0); @@ -473,7 +473,7 @@ struct sysinfo si; int megs; /* Total memory, in megabytes */ int nr_requests, max_queue_sectors = MAX_QUEUE_SECTORS; - + INIT_LIST_HEAD(&q->rq.free); q->rq.count = 0; q->rq.pending[READ] = q->rq.pending[WRITE] = 0; @@ -489,7 +489,7 @@ /* notice early if anybody screwed the defaults */ BUG_ON(!nr_requests); BUG_ON(!max_queue_sectors); - + blk_grow_request_list(q, nr_requests, max_queue_sectors); init_waitqueue_head(&q->wait_for_requests); @@ -585,7 +585,7 @@ if (blk_oversized_queue_reads(q)) return NULL; } - + if (!list_empty(&rl->free)) { rq = blkdev_free_rq(&rl->free); list_del(&rq->queue); @@ -604,37 +604,37 @@ * Here's the request allocation design, low latency version: * * 1: Blocking on request exhaustion is a key part of I/O throttling. - * + * * 2: We want to be `fair' to all requesters. We must avoid starvation, and * attempt to ensure that all requesters sleep for a similar duration. Hence * no stealing requests when there are other processes waiting. * * There used to be more here, attempting to allow a process to send in a - * number of requests once it has woken up. But, there's no way to + * number of requests once it has woken up. But, there's no way to * tell if a process has just been woken up, or if it is a new process * coming in to steal requests from the waiters. So, we give up and force * everyone to wait fairly. - * + * * So here's what we do: - * + * * a) A READA requester fails if free_requests < batch_requests - * + * * We don't want READA requests to prevent sleepers from ever * waking. Note that READA is used extremely rarely - a few * filesystems use it for directory readahead. - * + * * When a process wants a new request: - * + * * b) If free_requests == 0, the requester sleeps in FIFO manner, and * the queue full condition is set. The full condition is not * cleared until there are no longer any waiters. Once the full * condition is set, all new io must wait, hopefully for a very * short period of time. - * + * * When a request is released: - * + * * c) If free_requests < batch_requests, do nothing. - * + * * d) If free_requests >= batch_requests, wake up a single waiter. * * As each waiter gets a request, he wakes another waiter. We do this @@ -675,7 +675,7 @@ * avoid losing an unplug if a second __get_request_wait did the * generic_unplug_device while our __get_request_wait was running * w/o the queue_lock held and w/ our request out of the queue. - */ + */ if (waitqueue_active(&q->wait_for_requests)) wake_up(&q->wait_for_requests); } @@ -734,7 +734,7 @@ * On a partitioned device, we want to account both against the partition * and against the whole disk. */ -static void locate_hd_struct(struct request *req, +static void locate_hd_struct(struct request *req, struct hd_struct **hd1, struct hd_struct **hd2) { @@ -742,7 +742,7 @@ *hd1 = NULL; *hd2 = NULL; - + gd = get_gendisk(req->rq_dev); if (gd && gd->part) { /* Mask out the partition bits: account for the entire disk */ @@ -771,18 +771,18 @@ void disk_round_stats(struct hd_struct *hd) { unsigned long now = jiffies; - + hd->aveq += (hd->ios_in_flight * (jiffies - hd->last_queue_change)); hd->last_queue_change = now; if (hd->ios_in_flight) hd->io_ticks += (now - hd->last_idle_time); - hd->last_idle_time = now; + hd->last_idle_time = now; } static inline void down_ios(struct hd_struct *hd) { - disk_round_stats(hd); + disk_round_stats(hd); --hd->ios_in_flight; } @@ -845,7 +845,7 @@ locate_hd_struct(req, &hd1, &hd2); if (hd1) down_ios(hd1); - if (hd2) + if (hd2) down_ios(hd2); } @@ -856,7 +856,7 @@ locate_hd_struct(req, &hd1, &hd2); if (hd1) account_io_end(hd1, req); - if (hd2) + if (hd2) account_io_end(hd2, req); } EXPORT_SYMBOL(req_finished_io); @@ -937,7 +937,7 @@ int max_segments) { struct request *next; - + next = blkdev_next_request(req); if (req->sector + req->nr_sectors != next->sector) return; @@ -956,15 +956,6 @@ return; q->elevator.elevator_merge_req_fn(req, next); - - /* At this point we have either done a back merge - * or front merge. We need the smaller start_time of - * the merged requests to be the current request - * for accounting purposes. - */ - if (time_after(req->start_time, next->start_time)) - req->start_time = next->start_time; - req->bhtail->b_reqnext = next->bh; req->bhtail = next->bhtail; req->nr_sectors = req->hard_nr_sectors += next->hard_nr_sectors; @@ -1128,7 +1119,7 @@ printk("elevator returned crap (%d)\n", el_ret); BUG(); } - + get_rq: if (freereq) { req = freereq; @@ -1236,22 +1227,22 @@ /* Test device size, when known. */ if (blk_size[major]) -#if 0 /* HYUN_FILE */ +#ifdef CONFIG_MACH_GP2XF200 minorsize = blk_size[major][MINOR(bh->b_rdev)]; #else { - if( mmsp_get_usbCONN()) minorsize = blk_size[major][MINOR(bh->b_rdev)] << (mmsp_get_sdsize()); + if( mmsp_get_usbCONN()) minorsize = blk_size[major][MINOR(bh->b_rdev)] << (mmsp_get_sdsize()); else minorsize = blk_size[major][MINOR(bh->b_rdev)]; - } -#endif - - if (minorsize) + } +#endif + + if (minorsize) { unsigned long maxsector = (minorsize << 1) + 1; unsigned long sector = bh->b_rsector; unsigned int count = bh->b_size >> 9; - if (maxsector < count || maxsector - count < sector) + if (maxsector < count || maxsector - count < sector) { /* Yecch */ bh->b_state &= ~(1 << BH_Dirty); @@ -1280,7 +1271,7 @@ */ do { q = blk_get_queue(bh->b_rdev); - if (!q) + if (!q) { printk(KERN_ERR "generic_make_request: Trying to access " @@ -1467,12 +1458,12 @@ * Description: * Ends I/O on the first buffer attached to @req, and sets it up * for the next buffer_head (if any) in the cluster. - * + * * Return: * 0 - we are done with this request, call end_that_request_last() * 1 - still buffers pending for this request * - * Caveat: + * Caveat: * Drivers implementing their own end_request handling must call * blk_finished_io() appropriately. **/ Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/Config.in =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/Config.in 2008-07-29 18:34:38 UTC (rev 310) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/Config.in 2008-07-30 19:37:59 UTC (rev 311) @@ -193,6 +193,7 @@ dep_tristate 'MMSP2 Image Signal Processor support' CONFIG_MMSP2_ISP $CONFIG_ARCH_MMSP2 dep_tristate 'MMSP2 Gpio Key interface support' CONFIG_MMSP2_KEY $CONFIG_ARCH_MMSP2 dep_tristate 'MMSP2 GP2X Battery Check support' CONFIG_MMSP_GPX_BATT $CONFIG_ARCH_MMSP2 +dep_tristate 'MMSP2 GP2X ADC' CONFIG_MMSP_GP2X_ADC $CONFIG_ARCH_MMSP2 source drivers/l3/Config.in Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/Makefile =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/Makefile 2008-07-29 18:34:38 UTC (rev 310) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/Makefile 2008-07-30 19:37:59 UTC (rev 311) @@ -1,3 +1,5 @@ +# senquack modified this to support F200s + # # Makefile for the kernel character device drivers. # @@ -209,6 +211,8 @@ obj-$(CONFIG_MMSP2_ISP) += mmsp2_isp.o obj-$(CONFIG_MMSP2_KEY) += mmsp2-key.o obj-$(CONFIG_MMSP_GPX_BATT)+= mmsp2_batt.o +#DKS - added this to support F200s: +obj-$(CONFIG_MMSP_GP2X_ADC)+= mmsp2_ADC.o ifndef CONFIG_SUN_KEYBOARD obj-$(CONFIG_VT) += keyboard.o $(KEYMAP) $(KEYBD) Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/mmsp2-key.c =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/mmsp2-key.c 2008-07-29 18:34:38 UTC (rev 310) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/mmsp2-key.c 2008-07-30 19:37:59 UTC (rev 311) @@ -1,10 +1,13 @@ -/* - * drivers/char/mmsp2-key.c - * - * Copyright (C) 2005,2006 Gamepark Holdings, Inc. (www.gp2x.com) - * Hyun <hyu...@gp...> - */ - +/* PULLED FROM GPH 4.1.0 KERNEL SOURCE FOR OPEN2X F200 COMPATIBILITY- senquack */ +/* dan...@gm... */ + +/* + * drivers/char/mmsp2-key.c + * + * Copyright (C) 2005,2006 Gamepark Holdings, Inc. (www.gp2x.com) + * Hyun <hyu...@gp...> + */ + #include <linux/config.h> #include <linux/module.h> #include <linux/kernel.h> @@ -37,27 +40,47 @@ #define FUNC2_KEY_BASE GPIO_M0 #define VOL_UP GPIO_D7 #define VOL_DOWN GPIO_D6 + +#ifndef CONFIG_MACH_GP2XF200 #define TACT_SW GPIO_D11 +#else +#define USB_CHECK GPIO_F5 +#define USB_TO_SD GPIO_F2 +#define CPU_TO_SD GPIO_F6 +#define USB_CPU_RESET GPIO_F1 +#define TACT_MASK ((1<<1)|(1<<3)|(1<<5)|(1<<7)) +#endif -#define MAX_FUNC_KEY 8 +#define MAX_FUNC_KEY1 8 +#ifndef CONFIG_MACH_GP2XF200 +#define MAX_FUNC_KEY2 8 +#else +#define MAX_FUNC_KEY2 4 +#endif /* IOCTL CMD*/ -#define BACK_LIGHT_OFF 0 -#define BACK_LIGHT_ON 1 -#define BATT_LED_ON 2 -#define BATT_LED_OFF 3 +#define BACK_LIGHT_OFF 0 +#define BACK_LIGHT_ON 1 +#define BATT_LED_ON 2 +#define BATT_LED_OFF 3 -#define FCLK_200 10 -#define FCLK_166 11 -#define FCLK_133 12 -#define FCLK_100 13 -#define FCLK_78 14 -#define FCLK_64 15 -#define FCLK_DEFUALT 16 -#define SD_CLK_MODE_0 17 /* 5Mhz */ -#define SD_CLK_MODE_1 18 /* 15Mhz */ -#define SD_CLK_MODE_2 19 /* 25Mhz */ +#define FCLK_200 10 +#define FCLK_166 11 +#define FCLK_133 12 +#define FCLK_100 13 +#define FCLK_78 14 +#define FCLK_64 15 +#define FCLK_DEFUALT 16 +#define SD_CLK_MODE_0 17 /* 5Mhz */ +#define SD_CLK_MODE_1 18 /* 15Mhz */ +#define SD_CLK_MODE_2 19 /* 25Mhz */ +#define GP2X_INFO_LSB 20 +#define GP2X_INFO_MSB 21 +#define GP2X_GET_USBHCHK 30 +#define USB_CONNECT_START 31 +#define USB_CONNECT_END 32 + /* UCLK = 95.xxxMHz. It's default value. */ #define U_MDIV (0x60) #define U_PDIV (0x0) @@ -72,42 +95,52 @@ struct timeval cur_tv; static unsigned int old_tv_usec = 0; -//This function returns 0 if the allowed microseconds have elapsed since the last call to ths function, otherwise it returns 1 to indicate a bounce condition -static unsigned int bounce() -{ +#ifdef CONFIG_MACH_GP2XF200 - unsigned int elapsed_time; +/* GP2X JOSYSTICK SDL MAPING */ +#define NON_KEY 0 +#define VK_UP (1<<0) +#define VK_UP_LEFT (1<<1) +#define VK_LEFT (1<<2) +#define VK_DOWN_LEFT (1<<3) +#define VK_DOWN (1<<4) +#define VK_DOWN_RIGHT (1<<5) +#define VK_RIGHT (1<<6) +#define VK_UP_RIGHT (1<<7) - do_gettimeofday (&cur_tv); +/* +.... : NON_KEY +U... : VK_UP +.D.. : VK_DOWN +UD.. : NON_KEY - if (!old_tv_usec) - { - //init condition - old_tv_usec = cur_tv.tv_usec; - return 0; - } +..L. : VK_LEFT +U.L. : VK_UP_LEFT +.DL. : VK_DOWN_LEFT +UDL. : VK_LEFT - if(cur_tv.tv_usec > old_tv_usec) - { - // If there hasn't been rollover - elapsed_time = ((cur_tv.tv_usec - old_tv_usec)); - } - else - { - // Accounting for rollover - elapsed_time = ((1000000 - old_tv_usec + cur_tv.tv_usec)); - } +...R : VK_RIGHT +U..R : VK_UP_RIGHT +.D.R : VK_DOWN_RIGHT +UD.R : VK_RIGHT - if (elapsed_time > 250000) - { - old_tv_usec = 0; //reset the bounce time - return 0; - } +..LR : NON_KEY +U.LR : VK_UP +.DLR : VK_DOWN +UDLR : NON_KEY +*/ - return 1; +unsigned char KeyTable[16] = + { + NON_KEY, VK_UP, VK_DOWN, NON_KEY, + VK_LEFT, VK_UP_LEFT, VK_DOWN_LEFT , VK_LEFT, + VK_RIGHT, VK_UP_RIGHT ,VK_DOWN_RIGHT, VK_RIGHT, + NON_KEY, VK_UP, VK_DOWN, NON_KEY + }; -} +unsigned char KeyPos[]={GPIO_M0,GPIO_M4,GPIO_M2,GPIO_M6}; // final +#endif int MMSP2key_open(struct inode *inode, struct file *filp) { @@ -123,32 +156,49 @@ ssize_t MMSP2key_read(struct file *filp, char *Putbuf, size_t length, loff_t *f_pos) { + unsigned long keyValue=0; int i; - unsigned long keyValue=0; unsigned char keyTemp=0; - /* Check KEY */ - for(i=0;i<MAX_FUNC_KEY;i++) + for(i=0;i<MAX_FUNC_KEY2;i++) +#ifndef CONFIG_MACH_GP2XF200 keyTemp|=((read_gpio_bit(FUNC2_KEY_BASE+i)) << i); +#else + keyTemp|=((read_gpio_bit(KeyPos[i])) << i); +#endif + +#ifndef CONFIG_MACH_GP2XF200 keyValue=(unsigned long)~keyTemp; +#else + keyValue=(unsigned long) KeyTable[(~keyTemp)& 0x0f]; +#endif keyTemp=0; - for(i=0;i<MAX_FUNC_KEY;i++) + for(i=0;i<MAX_FUNC_KEY1;i++) keyTemp|=((read_gpio_bit(FUNC1_KEY_BASE+i)) << i); + +#ifndef CONFIG_MACH_GP2XF200 keyValue&=(unsigned long)(((~keyTemp) << 8)|0xFF); +#else + keyValue|=(unsigned long) (((~keyTemp) & 0xFF) << 8); +#endif +#ifndef CONFIG_MACH_GP2XF200 keyTemp=0; - keyTemp=read_gpio_bit(VOL_UP); + keyTemp|=read_gpio_bit(VOL_UP); keyTemp|=read_gpio_bit(VOL_DOWN)<<1; keyTemp|=read_gpio_bit(TACT_SW)<<2; + keyTemp|=1<<3; keyValue&=(unsigned long)(((~keyTemp)<<16)|0xFFFF); - -/* - if(bounce()) - return 1; -*/ - copy_to_user( Putbuf, &keyValue, 4); - +#else + keyTemp=0; + keyTemp|=read_gpio_bit(VOL_UP); + keyTemp|=read_gpio_bit(VOL_DOWN)<<1; + keyTemp=(~keyTemp)& 0x03; + keyTemp|=read_gpio_bit(USB_CHECK)<<3; + keyValue|=(unsigned long) keyTemp << 16; +#endif + copy_to_user( Putbuf, &keyValue, 4); return length; } @@ -161,19 +211,37 @@ switch(arg) { case 0: +#ifndef CONFIG_MACH_GP2XF200 write_gpio_bit(GPIO_H1,0); //LCD VGH oFF write_gpio_bit(GPIO_H2,0); //LCD Back oFF +#else + write_gpio_bit(GPIO_H1,0); //5V OFF + write_gpio_bit(GPIO_L11,0); //LCD Back oFF +#endif break; case 1: +#ifndef CONFIG_MACH_GP2XF200 write_gpio_bit(GPIO_H1,1); //LCD VGH on write_gpio_bit(GPIO_H2,1); //LCD Back on +#else + write_gpio_bit(GPIO_H1,1); //5V ON + write_gpio_bit(GPIO_L11,1); //LCD Back ON +#endif break; case BATT_LED_ON: +#ifndef CONFIG_MACH_GP2XF200 write_gpio_bit(GPIO_H4,0); //Batt LED on +#endif break; case BATT_LED_OFF: +#ifndef CONFIG_MACH_GP2XF200 write_gpio_bit(GPIO_H4,1); //Batt LED oFF +#endif break; + case GP2X_INFO_LSB: + return GetGp2xInfo(1); + case GP2X_INFO_MSB: + return GetGp2xInfo(0); case FCLK_200: pPMR_REG->FPLLSETVREG = ((0x49 << 8) + (1 << 2) + 0); udelay(4000); @@ -189,6 +257,7 @@ case FCLK_100: pPMR_REG->FPLLSETVREG = ((0x20 << 8) + (1 << 2) + 0); udelay(4000); + printk("fclk 100MHZ\n"); break; case FCLK_78: pPMR_REG->FPLLSETVREG = ((0x18 << 8) + (1 << 2) + 0); @@ -198,15 +267,23 @@ pPMR_REG->FPLLSETVREG = ((0x12 << 8) + (1 << 2) + 0); udelay(4000); break; - case SD_CLK_MODE_0: - mmsp_set_SDCLK(0); - break; - case SD_CLK_MODE_1: - mmsp_set_SDCLK(1); - break; - case SD_CLK_MODE_2: - mmsp_set_SDCLK(2); - break; +#ifdef CONFIG_MACH_GP2XF200 + case USB_CONNECT_START: + /* Usb to SD mode */ + write_gpio_bit(CPU_TO_SD,1); + write_gpio_bit(USB_TO_SD,0); + write_gpio_bit(USB_CPU_RESET,1); + udelay(50); + break; + case USB_CONNECT_END: + /* SD to usb mode */ + write_gpio_bit(USB_CPU_RESET,0); + write_gpio_bit(CPU_TO_SD,0); + write_gpio_bit(USB_TO_SD,1); + break; +#endif + case GP2X_GET_USBHCHK: + return GetUshHcon(); case FCLK_DEFUALT: break; } @@ -227,14 +304,35 @@ { int i; - for(i=0;i<MAX_FUNC_KEY;i++) set_gpio_ctrl(FUNC1_KEY_BASE,GPIOMD_IN,GPIOPU_EN); - for(i=0;i<MAX_FUNC_KEY;i++) set_gpio_ctrl(FUNC2_KEY_BASE,GPIOMD_IN,GPIOPU_EN); + for(i=0;i<MAX_FUNC_KEY1;i++) set_gpio_ctrl(FUNC1_KEY_BASE+i,GPIOMD_IN,GPIOPU_EN); +#ifndef CONFIG_MACH_GP2XF200 + for(i=0;i<MAX_FUNC_KEY2;i++) set_gpio_ctrl(FUNC2_KEY_BASE+i,GPIOMD_IN,GPIOPU_EN); +#else + for(i=0;i<MAX_FUNC_KEY2;i++) set_gpio_ctrl(KeyPos[i],GPIOMD_IN,GPIOPU_EN); +#if 0 + set_gpio_ctrl(FUNC2_KEY_BASE+0 ,GPIOMD_IN,GPIOPU_EN); + set_gpio_ctrl(FUNC2_KEY_BASE+5 ,GPIOMD_IN,GPIOPU_EN); /* ORG M4 */ + set_gpio_ctrl(FUNC2_KEY_BASE+2 ,GPIOMD_IN,GPIOPU_EN); + set_gpio_ctrl(FUNC2_KEY_BASE+7 ,GPIOMD_IN,GPIOPU_EN); /* ORG M6 */ +#endif +#endif + set_gpio_ctrl(VOL_UP,GPIOMD_IN,GPIOPU_EN); set_gpio_ctrl(VOL_DOWN,GPIOMD_IN,GPIOPU_EN); + +#ifndef CONFIG_MACH_GP2XF200 set_gpio_ctrl(TACT_SW,GPIOMD_IN,GPIOPU_EN); - - +#else + set_gpio_ctrl(USB_CHECK,GPIOMD_IN,GPIOPU_EN); + set_gpio_ctrl(CPU_TO_SD,GPIOMD_OUT,GPIOPU_EN); + set_gpio_ctrl(USB_TO_SD,GPIOMD_OUT,GPIOPU_EN); + set_gpio_ctrl(USB_CPU_RESET,GPIOMD_OUT,GPIOPU_EN); + /* Cpu to sd mode */ + write_gpio_bit(CPU_TO_SD,0); + write_gpio_bit(USB_TO_SD,1); + write_gpio_bit(USB_CPU_RESET,0); +#endif if( !register_chrdev( MMSP2_KEY_MAJOR, MMSP2_KEY_NAME, &MMSP2key_fops ) ) { #ifdef CONFIG_MACH_GP2X_DEBUG printk(" register device %s OK\n", MMSP2_KEY_NAME ); Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/mmsp2_batt.c =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/mmsp2_batt.c 2008-07-29 18:34:38 UTC (rev 310) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/char/mmsp2_batt.c 2008-07-30 19:37:59 UTC (rev 311) @@ -1,11 +1,11 @@ /* * drivers/char/char/mmsp2_batt.c - * - * Copyright (C) 2005,2006 Gamepark Holdings, Inc. (www.gp2x.com) - * Hyun <hyu...@gp...> * - * GP2X battery check driver - * Based on s3c2410_ts.c + * Copyright (C) 2005,2006 Gamepark Holdings, Inc. (www.gp2x.com) + * Hyun <hyu...@gp...> + * + * GP2X battery check driver + * Based on s3c2410_ts.c */ #include <linux/module.h> @@ -275,9 +275,9 @@ { unsigned short ReadValue; - if(Channel == TPC_MAN_READ_X ) + if(Channel == TPC_MAN_READ_X ) /* 1 */ TPC_SetChannelEnb(TPC_XY_CH_EN); - else if(Channel == TPC_MAN_READ_Y ) + else if(Channel == TPC_MAN_READ_Y ) /* 2 */ TPC_SetChannelEnb(TPC_XY_CH_EN); else if(Channel == TPC_MAN_READ_AZ ) TPC_SetChannelEnb(TPC_AZ_CH_EN); @@ -329,7 +329,10 @@ TPC_ClrInterruptPend ( 0xffff ); TPC_Stop(); free_irq(IRQ_ADC,NULL); + +#ifndef CONFIG_MACH_GP2XF200 write_gpio_bit(GPIO_H4,0); // Batt LED on +#endif } } @@ -339,7 +342,6 @@ { unsigned short getAdc=0; // Read ADC X - TPC_SetInterruptEnable(0); udelay(10); @@ -360,14 +362,12 @@ static int mmsp2_ts_open(struct inode *inode, struct file *filp) { - if(count==0) - { + if(count==0) { count = 1; return 0; } - else{ - return -EBUSY; - } + else return -EBUSY; + } static int mmsp2_ts_release(struct inode *inode, struct file *filp) Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/media/video/mmsp2_cx25874.c =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/media/video/mmsp2_cx25874.c 2008-07-29 18:34:38 UTC (rev 310) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/media/video/mmsp2_cx25874.c 2008-07-30 19:37:59 UTC (rev 311) @@ -38,6 +38,10 @@ extern int I2C_rbyte( unsigned char id, unsigned char addr, unsigned char *pData ); static void CX25874(unsigned char mode); +//DKS - I had to add these here to allow compilation +static void lcdTurnOn(void); +static void lcd_shutdown(void); + static int hShift=0; static int vShift=0; static int vsh=4; @@ -53,561 +57,621 @@ switch(mode) { - case DISPLAY_LCD : break; + case DISPLAY_LCD : + /* TV OFF MODE */ + I2C_wbyte(CX25874_ID,0x30,0x10); + mdelay(10); + I2C_wbyte(CX25874_ID,0x30,0x80); + mdelay(10); + I2C_wbyte(CX25874_ID,0x30,0x90); + mdelay(10); + write_gpio_bit(GPIO_B2, 1); // io sleep on... + MLC_isTVCheck(CFALSE); + break; case DISPLAY_MONITOR : - // 800 * 600 mode - // 38,400,000 * 2 = 76,800,000 Hz - // (76800000 * 6) / 13500000 = 34.1333... - // 0.1333... * 2^16 = 8738.133331 - PLL_FRACT = 8738; - PLL_INT = 34; + // 800 * 600 mode + // 38,400,000 * 2 = 76,800,000 Hz + // (76800000 * 6) / 13500000 = 34.1333... + // 0.1333... * 2^16 = 8738.133331 + PLL_FRACT = 8738; + PLL_INT = 34; - I2C_wbyte(CX25874_ID, 0xd6, 0x0c); - I2C_wbyte(CX25874_ID, 0x2e, 0xbd); - I2C_wbyte(CX25874_ID, 0x32, 0x00); - I2C_wbyte(CX25874_ID, 0x3c, 0x80); - I2C_wbyte(CX25874_ID, 0x3e, 0x80); - I2C_wbyte(CX25874_ID, 0x40, 0x80); - I2C_wbyte(CX25874_ID, 0xc4, 0x01); - I2C_wbyte(CX25874_ID, 0xc6, 0x50); // EN_DOT=1, VSYNCI = 1, HSYNCI= 0 - I2C_wbyte(CX25874_ID, 0xce, 0x24); - I2C_wbyte(CX25874_ID, 0xa0, PLL_INT); - I2C_wbyte(CX25874_ID, 0x9e, (PLL_FRACT>>8)); - I2C_wbyte(CX25874_ID, 0x9c, (PLL_FRACT&0xff)); - I2C_wbyte(CX25874_ID, 0xd4, 0x80); //MODE2X Bit 7 : 1 = Divides selected input clock by two (allows for single edge rather than double-edge - I2C_wbyte(CX25874_ID, 0xa2, 0x00); - I2C_wbyte(CX25874_ID, 0xba, 0x28); + I2C_wbyte(CX25874_ID, 0xd6, 0x0c); + I2C_wbyte(CX25874_ID, 0x2e, 0xbd); + I2C_wbyte(CX25874_ID, 0x32, 0x00); + I2C_wbyte(CX25874_ID, 0x3c, 0x80); + I2C_wbyte(CX25874_ID, 0x3e, 0x80); + I2C_wbyte(CX25874_ID, 0x40, 0x80); + I2C_wbyte(CX25874_ID, 0xc4, 0x01); + I2C_wbyte(CX25874_ID, 0xc6, 0x50); // EN_DOT=1, VSYNCI = 1, HSYNCI= 0 + I2C_wbyte(CX25874_ID, 0xce, 0x24); + I2C_wbyte(CX25874_ID, 0xa0, PLL_INT); + I2C_wbyte(CX25874_ID, 0x9e, (PLL_FRACT>>8)); + I2C_wbyte(CX25874_ID, 0x9c, (PLL_FRACT&0xff)); + I2C_wbyte(CX25874_ID, 0xd4, 0x80); //MODE2X Bit 7 : 1 = Divides selected input clock by two (allows for single edge rather than double-edge + I2C_wbyte(CX25874_ID, 0xa2, 0x00); + I2C_wbyte(CX25874_ID, 0xba, 0x28); - mdelay(10); + mdelay(10); - I2C_wbyte(CX25874_ID, 0x6C, 0xC6); - break; - + I2C_wbyte(CX25874_ID, 0x6C, 0xC6); + break; case DISPLAY_TV_NTSC: + // svideo ntsc mode + // 13,500,000 * 2 = 27,000,000 Hz + // (27000000 * 6) / 13500000 = 12.0 + // 0 * 2^16 = 0 - // svideo ntsc mode - // 13,500,000 * 2 = 27,000,000 Hz - // (27000000 * 6) / 13500000 = 12.0 - // 0 * 2^16 = 0 + PLL_FRACT = 0; + PLL_INT = 12; - PLL_FRACT = 0; - PLL_INT = 12; + I2C_wbyte(CX25874_ID, 0x38, 0x10); + I2C_wbyte(CX25874_ID, 0x76, 0xb4); //H_CLKO 180 + I2C_wbyte(CX25874_ID, 0x78, 0xd0); //H_ACTIVE 280 + I2C_wbyte(CX25874_ID, 0x7a, 0x7e); //H_WIDTH 126 + I2C_wbyte(CX25874_ID, 0x7c, 0x90); //H_BUST_BEGIN 144 + I2C_wbyte(CX25874_ID, 0x7e, 0x58); //H_BUST_END 88 + I2C_wbyte(CX25874_ID, 0x80, 0x03); //h_BLANKO 3 + I2C_wbyte(CX25874_ID, 0x82, 0x14); //v_BLANKO 20 + I2C_wbyte(CX25874_ID, 0x84, 0xf0); //v_active 132 + I2C_wbyte(CX25874_ID, 0x86, 0x26); + I2C_wbyte(CX25874_ID, 0x88, 0x15); + I2C_wbyte(CX25874_ID, 0x8a, 0x5a); //0x35a 858 + //I2C_wbyte(CX25874_ID, 0x8c, 0x0a); + I2C_wbyte(CX25874_ID, 0x8c, 0x28); - I2C_wbyte(CX25874_ID, 0x38, 0x10); - I2C_wbyte(CX25874_ID, 0x76, 0xb4); //H_CLKO 180 - I2C_wbyte(CX25874_ID, 0x78, 0xd0); //H_ACTIVE 280 - I2C_wbyte(CX25874_ID, 0x7a, 0x7e); //H_WIDTH 126 - I2C_wbyte(CX25874_ID, 0x7c, 0x90); //H_BUST_BEGIN 144 - I2C_wbyte(CX25874_ID, 0x7e, 0x58); //H_BUST_END 88 - I2C_wbyte(CX25874_ID, 0x80, 0x03); //h_BLANKO 3 - I2C_wbyte(CX25874_ID, 0x82, 0x14); //v_BLANKO 20 - I2C_wbyte(CX25874_ID, 0x84, 0xf0); //v_active 132 - I2C_wbyte(CX25874_ID, 0x86, 0x26); - I2C_wbyte(CX25874_ID, 0x88, 0x15); + I2C_wbyte(CX25874_ID, 0x8e, 0x13); + I2C_wbyte(CX25874_ID, 0x90, 0x06); - I2C_wbyte(CX25874_ID, 0x8a, 0x5a); //0x35a 858 - //I2C_wbyte(CX25874_ID, 0x8c, 0x0a); - I2C_wbyte(CX25874_ID, 0x8c, 0x28); + I2C_wbyte(CX25874_ID, 0x92, 0x13); + //I2C_wbyte(CX25874_ID, 0x92, 0x11); - I2C_wbyte(CX25874_ID, 0x8e, 0x13); - I2C_wbyte(CX25874_ID, 0x90, 0x06); + I2C_wbyte(CX25874_ID, 0x94, 0xf0); + I2C_wbyte(CX25874_ID, 0x96, 0x31); + I2C_wbyte(CX25874_ID, 0x98, 0x00); + I2C_wbyte(CX25874_ID, 0x9a, 0x40); + I2C_wbyte(CX25874_ID, 0x9c, (PLL_FRACT&0xff)); + I2C_wbyte(CX25874_ID, 0x9e, (PLL_FRACT>>8)); + I2C_wbyte(CX25874_ID, 0xa0, (PLL_INT | 0x80)); // EN_XCLK=1 + I2C_wbyte(CX25874_ID, 0xa2, 0x0a); + I2C_wbyte(CX25874_ID, 0xa4, 0xe5); + I2C_wbyte(CX25874_ID, 0xa6, 0x76); + I2C_wbyte(CX25874_ID, 0xa8, 0xc1); + I2C_wbyte(CX25874_ID, 0xaa, 0x89); + I2C_wbyte(CX25874_ID, 0xac, 0x9a); + I2C_wbyte(CX25874_ID, 0xae, 0x1f); + I2C_wbyte(CX25874_ID, 0xb0, 0x7c); + I2C_wbyte(CX25874_ID, 0xb2, 0xf0); + I2C_wbyte(CX25874_ID, 0xb4, 0x21); + I2C_wbyte(CX25874_ID, 0xc6, 0x06); + I2C_wbyte(CX25874_ID, 0xc8, 0xc0); + //I2C_wbyte(CX25874_ID, 0xc6, 0x86); + mdelay(10); + I2C_wbyte(CX25874_ID, 0x6C, 0xC6); + break; - I2C_wbyte(CX25874_ID, 0x92, 0x13); - //I2C_wbyte(CX25874_ID, 0x92, 0x11); - - I2C_wbyte(CX25874_ID, 0x94, 0xf0); - I2C_wbyte(CX25874_ID, 0x96, 0x31); - I2C_wbyte(CX25874_ID, 0x98, 0x00); - I2C_wbyte(CX25874_ID, 0x9a, 0x40); - I2C_wbyte(CX25874_ID, 0x9c, (PLL_FRACT&0xff)); - I2C_wbyte(CX25874_ID, 0x9e, (PLL_FRACT>>8)); - I2C_wbyte(CX25874_ID, 0xa0, (PLL_INT | 0x80)); // EN_XCLK=1 - I2C_wbyte(CX25874_ID, 0xa2, 0x0a); - I2C_wbyte(CX25874_ID, 0xa4, 0xe5); - I2C_wbyte(CX25874_ID, 0xa6, 0x76); - I2C_wbyte(CX25874_ID, 0xa8, 0xc1); - I2C_wbyte(CX25874_ID, 0xaa, 0x89); - I2C_wbyte(CX25874_ID, 0xac, 0x9a); - I2C_wbyte(CX25874_ID, 0xae, 0x1f); - I2C_wbyte(CX25874_ID, 0xb0, 0x7c); - I2C_wbyte(CX25874_ID, 0xb2, 0xf0); - I2C_wbyte(CX25874_ID, 0xb4, 0x21); - I2C_wbyte(CX25874_ID, 0xc6, 0x06); - I2C_wbyte(CX25874_ID, 0xc8, 0xc0); - //I2C_wbyte(CX25874_ID, 0xc6, 0x86); - - mdelay(10); - I2C_wbyte(CX25874_ID, 0x6C, 0xC6); - break; - case DISPLAY_TV_PAL: // 720*576 PAL-BDGHI mode // 13,500,000 * 2 = 27,000,000 Hz // (27000000 * 6) / 13500000 = 12.0 // 0 * 2^16 = 0 - PLL_FRACT = 0; - PLL_INT = 12; + PLL_FRACT = 0; + PLL_INT = 12; - I2C_wbyte(CX25874_ID, 0x38, 0x10); //DIV2 SET - I2C_wbyte(CX25874_ID, 0x76, 0xc0); //total hclk 0x6c0(1728) (with 0x86 0~3bit) - I2C_wbyte(CX25874_ID, 0x78, 0xd0); //H_ACTIVE 0x2D0(720) (with 0x86 4~6bit) ok... - I2C_wbyte(CX25874_ID, 0x7a, 0x7e); //H_WIDTH 0x7E(126) - I2C_wbyte(CX25874_ID, 0x7c, 0x98); //H_BUST_BEGIN 0x98(152) - I2C_wbyte(CX25874_ID, 0x7e, 0x54); //H_BUST_END 0x54(84) - I2C_wbyte(CX25874_ID, 0x80, 0x15); //h_BLANKO 0x115(277) (with 0x9a 8~9bit) + I2C_wbyte(CX25874_ID, 0x38, 0x10); //DIV2 SET + I2C_wbyte(CX25874_ID, 0x76, 0xc0); //total hclk 0x6c0(1728) (with 0x86 0~3bit) + I2C_wbyte(CX25874_ID, 0x78, 0xd0); //H_ACTIVE 0x2D0(720) (with 0x86 4~6bit) ok... + I2C_wbyte(CX25874_ID, 0x7a, 0x7e); //H_WIDTH 0x7E(126) + I2C_wbyte(CX25874_ID, 0x7c, 0x98); //H_BUST_BEGIN 0x98(152) + I2C_wbyte(CX25874_ID, 0x7e, 0x54); //H_BUST_END 0x54(84) + I2C_wbyte(CX25874_ID, 0x80, 0x15); //h_BLANKO 0x115(277) (with 0x9a 8~9bit) - I2C_wbyte(CX25874_ID, 0x82, 0x17); //v_BLANKO 0x23 - I2C_wbyte(CX25874_ID, 0x84, 0x20); //v_active 0x120(288==(576/2)) (with 0x86 7bit) ok... - I2C_wbyte(CX25874_ID, 0x86, 0xA6); + I2C_wbyte(CX25874_ID, 0x82, 0x17); //v_BLANKO 0x23 + I2C_wbyte(CX25874_ID, 0x84, 0x20); //v_active 0x120(288==(576/2)) (with 0x86 7bit) ok... + I2C_wbyte(CX25874_ID, 0x86, 0xA6); - /* cpu tv control output */ - I2C_wbyte(CX25874_ID, 0x88, 0xFA); - I2C_wbyte(CX25874_ID, 0x8a, 0x60); //total input hclk 0x360(864) (with 0x8E 0~2bit) + /* cpu tv control output */ + I2C_wbyte(CX25874_ID, 0x88, 0xFA); + I2C_wbyte(CX25874_ID, 0x8a, 0x60); //total input hclk 0x360(864) (with 0x8E 0~2bit) - //I2C_wbyte(CX25874_ID, 0x8c, 0x0a); //H_BLANKI 0x0a(10) h back porch - I2C_wbyte(CX25874_ID, 0x8c, 0x28); + //I2C_wbyte(CX25874_ID, 0x8c, 0x0a); //H_BLANKI 0x0a(10) h back porch + I2C_wbyte(CX25874_ID, 0x8c, 0x28); + I2C_wbyte(CX25874_ID, 0x8e, 0x13); + I2C_wbyte(CX25874_ID, 0x90, 0x38); //total input vclk 0x138 (312) (with 0x96 0~1bit) + I2C_wbyte(CX25874_ID, 0x92, 0x16); //v_BLAKNK 0x16(22) - I2C_wbyte(CX25874_ID, 0x8e, 0x13); - I2C_wbyte(CX25874_ID, 0x90, 0x38); //total input vclk 0x138 (312) (with 0x96 0~1bit) + I2C_wbyte(CX25874_ID, 0x94, 0x20); //v_active input 0x120(288==576/2) (with 0x96 2~3bit) + I2C_wbyte(CX25874_ID, 0x96, 0x35); + I2C_wbyte(CX25874_ID, 0x98, 0x00); + I2C_wbyte(CX25874_ID, 0x9a, 0x40); - I2C_wbyte(CX25874_ID, 0x92, 0x16); //v_BLAKNK 0x16(22) + I2C_wbyte(CX25874_ID, 0x9c, (PLL_FRACT&0xff)); //0 + I2C_wbyte(CX25874_ID, 0x9e, (PLL_FRACT>>8)); //0 + I2C_wbyte(CX25874_ID, 0xa0, (PLL_INT | 0x80)); // EN_XCLK=1 - I2C_wbyte(CX25874_ID, 0x94, 0x20); //v_active input 0x120(288==576/2) (with 0x96 2~3bit) - I2C_wbyte(CX25874_ID, 0x96, 0x35); - I2C_wbyte(CX25874_ID, 0x98, 0x00); - I2C_wbyte(CX25874_ID, 0x9a, 0x40); + I2C_wbyte(CX25874_ID, 0xa2, 0x24); // 625LINE|PAL-MD + I2C_wbyte(CX25874_ID, 0xa4, 0xf0); + I2C_wbyte(CX25874_ID, 0xa6, 0x59); + I2C_wbyte(CX25874_ID, 0xa8, 0xCF); + I2C_wbyte(CX25874_ID, 0xaa, 0x93); + I2C_wbyte(CX25874_ID, 0xac, 0xA4); + I2C_wbyte(CX25874_ID, 0xae, 0xCB); + I2C_wbyte(CX25874_ID, 0xb0, 0x8A); + I2C_wbyte(CX25874_ID, 0xb2, 0x09); + I2C_wbyte(CX25874_ID, 0xb4, 0x2A); - I2C_wbyte(CX25874_ID, 0x9c, (PLL_FRACT&0xff)); //0 - I2C_wbyte(CX25874_ID, 0x9e, (PLL_FRACT>>8)); //0 - I2C_wbyte(CX25874_ID, 0xa0, (PLL_INT | 0x80)); // EN_XCLK=1 - I2C_wbyte(CX25874_ID, 0xa2, 0x24); // 625LINE|PAL-MD - I2C_wbyte(CX25874_ID, 0xa4, 0xf0); - I2C_wbyte(CX25874_ID, 0xa6, 0x59); - I2C_wbyte(CX25874_ID, 0xa8, 0xCF); - I2C_wbyte(CX25874_ID, 0xaa, 0x93); - I2C_wbyte(CX25874_ID, 0xac, 0xA4); - I2C_wbyte(CX25874_ID, 0xae, 0xCB); - I2C_wbyte(CX25874_ID, 0xb0, 0x8A); - I2C_wbyte(CX25874_ID, 0xb2, 0x09); - I2C_wbyte(CX25874_ID, 0xb4, 0x2A); + I2C_wbyte(CX25874_ID, 0xc6, 0x06); //inmode ycrcb 16bit + I2C_wbyte(CX25874_ID, 0xc8, 0xc0); // + //I2C_wbyte(CX25874_ID, 0xc6, 0x86); + mdelay(10); + I2C_wbyte(CX25874_ID, 0x6C, 0xC6); //check point fild mode + //I2C_wbyte(CX25874_ID, 0x6C, 0xc4); //check point fild mode - I2C_wbyte(CX25874_ID, 0xc6, 0x06); //inmode ycrcb 16bit - I2C_wbyte(CX25874_ID, 0xc8, 0xc0); // - //I2C_wbyte(CX25874_ID, 0xc6, 0x86); - - mdelay(10); - I2C_wbyte(CX25874_ID, 0x6C, 0xC6); //check point fild mode - //I2C_wbyte(CX25874_ID, 0x6C, 0xc4); //check point fild mode - - break; + break; case DISPLAY_TV_GAME_NTSC: - // 320 x 240 ntsc mode - PLL_FRACT = 0; - PLL_INT = 12; + // 320 x 240 ntsc mode + PLL_FRACT = 0; + PLL_INT = 12; - I2C_wbyte(CX25874_ID, 0x38, 0x40); //DIV2 SET - I2C_wbyte(CX25874_ID, 0x76, 0x00); //total hclk 0x6c0(1728) (with 0x86 0~3bit) - I2C_wbyte(CX25874_ID, 0x78, 0x80); //H_ACTIVE 0x2D0(720) (with 0x86 4~6bit) ok... - I2C_wbyte(CX25874_ID, 0x7a, 0x84); //H_WIDTH 0x7E(126) - I2C_wbyte(CX25874_ID, 0x7c, 0x96); //H_BUST_BEGIN 0x98(152) - I2C_wbyte(CX25874_ID, 0x7e, 0x60); //H_BUST_END 0x54(84) - I2C_wbyte(CX25874_ID, 0x80, 0x7d); //h_BLANKO 0x115(277) (with 0x9a 8~9bit) + I2C_wbyte(CX25874_ID, 0x38, 0x40); //DIV2 SET + I2C_wbyte(CX25874_ID, 0x76, 0x00); //total hclk 0x6c0(1728) (with 0x86 0~3bit) + I2C_wbyte(CX25874_ID, 0x78, 0x80); //H_ACTIVE 0x2D0(720) (with 0x86 4~6bit) ok... + I2C_wbyte(CX25874_ID, 0x7a, 0x84); //H_WIDTH 0x7E(126) + I2C_wbyte(CX25874_ID, 0x7c, 0x96); //H_BUST_BEGIN 0x98(152) + I2C_wbyte(CX25874_ID, 0x7e, 0x60); //H_BUST_END 0x54(84) + I2C_wbyte(CX25874_ID, 0x80, 0x7d); //h_BLANKO 0x115(277) (with 0x9a 8~9bit) - I2C_wbyte(CX25874_ID, 0x82, 0x22); //v_BLANKO 0x23 - I2C_wbyte(CX25874_ID, 0x84, 0xD5); //v_active 0x120(288==(576/2)) (with 0x86 7bit) ok... - I2C_wbyte(CX25874_ID, 0x86, 0x27); + I2C_wbyte(CX25874_ID, 0x82, 0x22); //v_BLANKO 0x23 + I2C_wbyte(CX25874_ID, 0x84, 0xD5); //v_active 0x120(288==(576/2)) (with 0x86 7bit) ok... + I2C_wbyte(CX25874_ID, 0x86, 0x27); - /* cpu tv control output */ - I2C_wbyte(CX25874_ID, 0x88, 0x00); - I2C_wbyte(CX25874_ID, 0x8a, 0x20); //total input hclk 0x360(864) (with 0x8E 0~2bit) - I2C_wbyte(CX25874_ID, 0x8c, 0x5D); //H_BLANKI 0x0a(10) h back porch - I2C_wbyte(CX25874_ID, 0x8e, 0x1E); - I2C_wbyte(CX25874_ID, 0x90, 0x2C); //total input vclk 0x138 (312) (with 0x96 0~1bit) - I2C_wbyte(CX25874_ID, 0x92, 0x25); //v_BLAKNK 0x16(22) - I2C_wbyte(CX25874_ID, 0x94, 0xF0); //v_active input 0x120(288==576/2) (with 0x96 2~3bit) - I2C_wbyte(CX25874_ID, 0x96, 0x31); - I2C_wbyte(CX25874_ID, 0x98, 0x49); - I2C_wbyte(CX25874_ID, 0x9a, 0x42); + /* cpu tv control output */ + I2C_wbyte(CX25874_ID, 0x88, 0x00); + I2C_wbyte(CX25874_ID, 0x8a, 0x20); //total input hclk 0x360(864) (with 0x8E 0~2bit) + I2C_wbyte(CX25874_ID, 0x8c, 0x5D); //H_BLANKI 0x0a(10) h back porch + I2C_wbyte(CX25874_ID, 0x8e, 0x1E); + I2C_wbyte(CX25874_ID, 0x90, 0x2C); //total input vclk 0x138 (312) (with 0x96 0~1bit) + I2C_wbyte(CX25874_ID, 0x92, 0x25); //v_BLAKNK 0x16(22) + I2C_wbyte(CX25874_ID, 0x94, 0xF0); //v_active input 0x120(288==576/2) (with 0x96 2~3bit) + I2C_wbyte(CX25874_ID, 0x96, 0x31); + I2C_wbyte(CX25874_ID, 0x98, 0x49); + I2C_wbyte(CX25874_ID, 0x9a, 0x42); - I2C_wbyte(CX25874_ID, 0x9c, 0x0E); - I2C_wbyte(CX25874_ID, 0x9e, 0x88); - I2C_wbyte(CX25874_ID, 0xa0, 0x0C); + I2C_wbyte(CX25874_ID, 0x9c, 0x0E); + I2C_wbyte(CX25874_ID, 0x9e, 0x88); + I2C_wbyte(CX25874_ID, 0xa0, 0x0C); - I2C_wbyte(CX25874_ID, 0xa2, 0x0A); // 625LINE|PAL-MD - I2C_wbyte(CX25874_ID, 0xa4, 0xE5); - I2C_wbyte(CX25874_ID, 0xa6, 0x76); - I2C_wbyte(CX25874_ID, 0xa8, 0x79); - I2C_wbyte(CX25874_ID, 0xaa, 0x44); - I2C_wbyte(CX25874_ID, 0xac, 0x85); - I2C_wbyte(CX25874_ID, 0xae, 0x00); - I2C_wbyte(CX25874_ID, 0xb0, 0x00); - I2C_wbyte(CX25874_ID, 0xb2, 0x80); - I2C_wbyte(CX25874_ID, 0xb4, 0x20); + I2C_wbyte(CX25874_ID, 0xa2, 0x0A); // 625LINE|PAL-MD + I2C_wbyte(CX25874_ID, 0xa4, 0xE5); + I2C_wbyte(CX25874_ID, 0xa6, 0x76); + I2C_wbyte(CX25874_ID, 0xa8, 0x79); + I2C_wbyte(CX25874_ID, 0xaa, 0x44); + I2C_wbyte(CX25874_ID, 0xac, 0x85); + I2C_wbyte(CX25874_ID, 0xae, 0x00); + I2C_wbyte(CX25874_ID, 0xb0, 0x00); + I2C_wbyte(CX25874_ID, 0xb2, 0x80); + I2C_wbyte(CX25874_ID, 0xb4, 0x20); - I2C_wbyte(CX25874_ID, 0xc4, 0x01); - I2C_wbyte(CX25874_ID, 0xc6, 0x41); //inmode rgb 16bit - I2C_wbyte(CX25874_ID, 0xc8, 0xc0); // - I2C_wbyte(CX25874_ID, 0xba, 0x20); // + I2C_wbyte(CX25874_ID, 0xc4, 0x01); + I2C_wbyte(CX25874_ID, 0xc6, 0x41); //inmode rgb 16bit + I2C_wbyte(CX25874_ID, 0xc8, 0xc0); // + I2C_wbyte(CX25874_ID, 0xba, 0x20); // - mdelay(10); - I2C_wbyte(CX25874_ID, 0x6C, 0xC6); //check point fild mode - //I2C_wbyte(CX25874_ID, 0x6C, 0xC0); //check point fild mode - break; + mdelay(10); + I2C_wbyte(CX25874_ID, 0x6C, 0xC6); //check point fild mode + //I2C_wbyte(CX25874_ID, 0x6C, 0xC0); //check point fild mode + break; } } static int cx25874_open(struct inode *inode, struct file *file) { - -#ifdef CONFIG_MACH_MMSP2_DTK4 -#ifdef CONFIG_MACH_GP2X - set_gpio_ctrl(GPIO_B2, GPIOMD_OUT, GPIOPU_EN); // CX25874 Sleep Mode - write_gpio_bit(GPIO_B2, 0); // Wake up... - set_gpio_ctrl(GPIO_B3, GPIOMD_OUT, GPIOPU_EN); // CX25874 Reset Mode - write_gpio_bit(GPIO_B3, 0); // CX25874 Reset + write_gpio_bit(GPIO_B2, 0); // HW IO enable mdelay(1); - write_gpio_bit(GPIO_B3, 1); - mdelay(1); - write_gpio_bit(GPIO_H1,0); //LCD VGH oFF - write_gpio_bit(GPIO_H2,0); //LCD Back oFF -#else - set_gpio_ctrl(GPIO_B2, GPIOMD_OUT, GPIOPU_EN); // CX25874 Sleep Mode - write_gpio_bit(GPIO_B2, 0); // Wake up... - set_gpio_ctrl(GPIO_B3, GPIOMD_OUT, GPIOPU_EN); // CX25874 Reset Mode - write_gpio_bit(GPIO_B3, 0); // CX25874 Reset +#ifdef CONFIG_MACH_GP2XF200 + /* board version check */ + if(!read_gpio_bit(GPIO_I12) ) lcd_shutdown(); +#endif + + write_gpio_bit(GPIO_B3, 0); // CX25874 Reset mdelay(1); write_gpio_bit(GPIO_B3, 1); mdelay(1); -#endif -#endif - printk("sleep oFF\n"); if(cx25874_count==0) { unsigned char data; - I2C_rbyte(CX25874_ID,0x00,&data); // Read Vender ID + I2C_rbyte(CX25874_ID,0x00,&data); // Read Vender ID if(data==0xC3) printk("CX25874 ID = %2x \n",data); else - printk("CX25874 ID chack error = %2x \n",data); + printk("CX25874 ID check error = %2x \n",data); - I2C_wbyte(CX25874_ID,0xba,0x80); // Software Reset + I2C_wbyte(CX25874_ID,0xba,0x80); // Software Reset mdelay(10); cx25874_count = 1; return 0; - } - else + }else return -EBUSY; } static int cx25874_release(struct inode *inode, struct file *file) { - tDispClkInfo ClkInfo; - - I2C_wbyte(CX25874_ID,0xba,0x80); // Software Reset - mdelay(10); - - // Restore DPC - /* Display Controller setup */ - DPC_Stop(); - - ClkInfo.DISPCLK_SOURCE = 2; - -#ifdef CONFIG_MACH_GP2X - ClkInfo.DISPCLK_DIVIDER= 16; -#else - ClkInfo.DISPCLK_DIVIDER= 7; -#endif - - ClkInfo.DISPCLK_POL = 0; - PMR_SetDispClk(&ClkInfo); - DPC_InitHardware(DPC_RGB_666, CFALSE, CFALSE,CFALSE, 0, 0, DPC_USE_PLLCLK); -#ifdef CONFIG_MACH_MMSP2_DTK3 - DPC_UTIL_HVSYNC (DPC_RGB_666, 800, 600, 128, 216, 40, CTRUE, 4, 10, 33, CTRUE); -#elif defined(CONFIG_MACH_MMSP2_DTK4) -#ifdef CONFIG_MACH_GP2X - set_gpio_ctrl(GPIO_B2, GPIOMD_OUT, GPIOPU_EN); // CX25874 Sleep Mode - write_gpio_bit(GPIO_B2, 1); // io sleep on... - - DPC_UTIL_HVSYNC_GPX320240(DPC_RGB_666, 320,240,30, 20, 38, CFALSE, 3, 5, 15,CFALSE - ,CTRUE,CFALSE,CTRUE); - - write_gpio_bit(GPIO_H2,1); //LCD Backlignt on - write_gpio_bit(GPIO_H1,1); //LCD Vgh ON -#else - DPC_UTIL_HVSYNC (DPC_RGB_666, 640, 480, 96, 24, 40, CTRUE, 2, 10, 33, CTRUE); - write_gpio_bit(GPIO_N5, 1); // VS_2 - write_gpio_bit(GPIO_N6, 0); // VS_1 - write_gpio_bit(GPIO_N0, 1); // LCD Backlignt on -#endif -#endif - DPC_Run(); - + /* Tv off :lcd mode(ioctl) */ cx25874_count = 0; - MLC_isTVCheck(CFALSE); - - printk("release \n"); + printk("TV_OUT release \n"); return 0; } static int cx25874_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, unsigned long arg) + unsigned int cmd, unsigned long arg) { - tDispClkInfo ClkInfo; + tDispClkInfo ClkInfo; int ret=0; I2C_WRITE_BYTE_INFO i2c_write_info; I2C_READ_BYTE_INFO i2c_read_info; - switch(cmd) { case CX25874_I2C_WRITE_BYTE: - if(copy_from_user(&i2c_write_info, (I2C_WRITE_BYTE_INFO *)arg, sizeof(I2C_WRITE_BYTE_INFO))) - return -EFAULT; - if(i2c_write_info.id != CX25874_ID) i2c_write_info.id = CX25874_ID; - mdelay(1); - I2C_wbyte(i2c_write_info.id, i2c_write_info.addr, i2c_write_info.data); - ret = 1; - break; + if(copy_from_user(&i2c_write_info, (I2C_WRITE_BYTE_INFO *)arg, sizeof(I2C_WRITE_BYTE_INFO))) + return -EFAULT; + if(i2c_write_info.id != CX25874_ID) i2c_write_info.id = CX25874_ID; + mdelay(1); + I2C_wbyte(i2c_write_info.id, i2c_write_info.addr, i2c_write_info.data); + ret = 1; + break; case CX25874_I2C_READ_BYTE : - if(copy_from_user(&i2c_read_info, (I2C_READ_BYTE_INFO *)arg, sizeof(I2C_READ_BYTE_INFO))) - return -EFAULT; - if(i2c_write_info.id != CX25874_ID) i2c_write_info.id = CX25874_ID; - I2C_rbyte(i2c_read_info.id, i2c_read_info.addr, i2c_read_info.pdata); - ret = 1; - break; + if(copy_from_user(&i2c_read_info, (I2C_READ_BYTE_INFO *)arg, sizeof(I2C_READ_BYTE_INFO))) + return -EFAULT; + if(i2c_write_info.id != CX25874_ID) i2c_write_info.id = CX25874_ID; + I2C_rbyte(i2c_read_info.id, i2c_read_info.addr, i2c_read_info.pdata); + ret = 1; + break; case IOCTL_CX25874_TV_MODE_POSITION: - if( arg == TV_POS_LEFT ) - { - if(hShift < 80) - { + if( arg == TV_POS_LEFT ){ + if(hShift < 80){ + hShift++; + I2C_wbyte(CX25874_ID, 0x8c,hShift); + } - hShift++; - I2C_wbyte(CX25874_ID, 0x8c,hShift); - } - + } + else if ( arg == TV_POS_RIGHT ){ + if(hShift > 3){ + hShift--; + I2C_wbyte(CX25874_ID, 0x8c,hShift); } - else if ( arg == TV_POS_RIGHT ) - { - - if(hShift > 3){ - hShift--; - I2C_wbyte(CX25874_ID, 0x8c,hShift); + } + else if ( arg == TV_POS_UP ){ + if(tvFlag == TV_MODE_NTSC){ + if(vsh < 243){ + vShift--,vsh++; + DPC_UTIL_HVSYNC (DPC_YCBCR_CCIR656, 720, vsh, 32, 66, 40, CTRUE, 1, 1, vShift, CTRUE); } } - else if ( arg == TV_POS_UP ) + else { - - if(tvFlag == TV_MODE_NTSC) +#if 0 + if(vsh < 295) { - - if(vsh < 243) - { - vShift--,vsh++; - DPC_UTIL_HVSYNC (DPC_YCBCR_CCIR656, 720, vsh, 32, 66, 40, CTRUE, 1, 1, vShift, CTRUE); - } + vShift--,vsh++; + DPC_UTIL_HVSYNC (DPC_YCBCR_CCIR656, 720, vsh, 32, 66, 40, CTRUE, 2, 1, vShift, CTRUE); } - else - { -#if 0 - if(vsh < 295) - { - vShift--,vsh++; - DPC_UTIL_HVSYNC (DPC_YCBCR_CCIR656, 720, vsh, 32, 66, 40, CTRUE, 2, 1, vShift, CTRUE); - } #endif - } } - else if ( arg == TV_POS_DOWN ) + } + else if ( arg == TV_POS_DOWN ){ + if(tvFlag == TV_MODE_NTSC){//ntsc + if(vsh > 225){ + vShift++,vsh--; + DPC_UTIL_HVSYNC (DPC_YCBCR_CCIR656, 720, vsh, 32, 66, 40, CTRUE, 1, 1, vShift, CTRUE); + } + } + else { - if(tvFlag == TV_MODE_NTSC)//ntsc - { - if(vsh > 225) - { - vShift++,vsh--; - DPC_UTIL_HVSYNC (DPC_YCBCR_CCIR656, 720, vsh, 32, 66, 40, CTRUE, 1, 1, vShift, CTRUE); - } +#if 0 + if(vsh > 265){ + vShift++,vsh--; + DPC_UTIL_HVSYNC (DPC_YCBCR_CCIR656, 720, vsh, 32, 66, 40, CTRUE, 2, 1, vShift, CTRUE); } - else - { -#if 0 - if(vsh > 265) - { - vShift++,vsh--; - DPC_UTIL_HVSYNC (DPC_YCBCR_CCIR656, 720, vsh, 32, 66, 40, CTRUE, 2, 1, vShift, CTRUE); - } #endif - } } - ret=1; - break; + } + ret=1; + break; case IOCTL_CX25874_DISPLAY_MODE_SET : - if( arg == DISPLAY_LCD ) // LCD - { - CX25874(arg); - - /* Display Controller setup */ - DPC_Stop(); - - ClkInfo.DISPCLK_SOURCE = 1; -#ifdef CONFIG_MACH_GP2X - ClkInfo.DISPCLK_DIVIDER= 25; + if( (arg == DISPLAY_MONITOR) || (arg == DISPLAY_TV_NTSC) + || (arg == DISPLAY_TV_PAL) ) + { + /* LCD OFF MDOE */ +#ifndef CONFIG_MACH_GP2XF200 + write_gpio_bit(GPIO_H1,0); //LCD VGH Off + write_gpio_bit(GPIO_H2,0); //LCD Back Off #else - ClkInfo.DISPCLK_DIVIDER= 7; + write_gpio_bit(GPIO_H1,0); //LCD AVDD Off + write_gpio_bit(GPIO_L11,0); //LCD Back Off + write_gpio_bit(GPIO_F3,0); //Sound to TV (AMP Off) #endif - ClkInfo.DISPCLK_POL = 0; + } - PMR_SetDispClk(&ClkInfo); - DPC_InitHardware(DPC_RGB_666, CFALSE, CFALSE,CFALSE, 0, 0, DPC_USE_PLLCLK); -#ifdef CONFIG_MACH_MMSP2_DTK3 - DPC_UTIL_HVSYNC (DPC_RGB_666, 800, 600, 128, 216, 40, CTRUE, 4, 10, 33, CTRUE); -#elif defined(CONFIG_MACH_MMSP2_DTK4) -#ifdef CONFIG_MACH_GP2X - DPC_UTIL_HVSYNC_GPX320240(DPC_RGB_666, 320, 240,30, 20, 38, CTRUE,4, 15, 4,CTRUE - ,CFALSE,CFALSE,CTRUE); - write_gpio_bit(GPIO_H2,1); //LCD Backlignt on + if( arg == DISPLAY_LCD ) + { + printk("******* lcd mode ************** \n"); + CX25874(arg); + /* Display Controller setup */ + DPC_Stop(); + ClkInfo.DISPCLK_SOURCE = 2; + ClkInfo.DISPCLK_POL = 1; +#ifndef CONFIG_MACH_GP2XF200 + ClkInfo.DISPCLK_DIVIDER= 5; #else - DPC_UTIL_HVSYNC (DPC_RGB_666, 640, 480, 96, 24, 40, CTRUE, 2, 10, 33, CTRUE); - write_gpio_bit(GPIO_N5, 1); // VS_2 - write_gpio_bit(GPIO_N6, 0); // VS_1 - write_gpio_bit(GPIO_N0, 1); // LCD Backlignt on + if(!read_gpio_bit(GPIO_I12) ) ClkInfo.DISPCLK_DIVIDER = 13; + else ClkInfo.DISPCLK_DIVIDER= 5; #endif + PMR_SetDispClk(&ClkInfo); + DPC_InitHardware(DPC_RGB_666, CFALSE, CFALSE,CFALSE, 0, 0, DPC_USE_PLLCLK); +#ifndef CONFIG_MACH_GP2XF200 + /* ODT 408 * 262*/ + DPC_UTIL_HVSYNC_GPX320240(DPC_RGB_666, 320,240,30, 20, 38, CFALSE, 3, 5, 15,CFALSE,CTRUE,CFALSE,CTRUE); +#else + if(!read_gpio_bit(GPIO_I12) ) + DPC_UTIL_HVSYNC_GPX320240(DPC_RGB_666, 320, 240, 30, 20, 38, CFALSE, 3, 5, 15,CFALSE,CFALSE,CTRUE,CFALSE); + else + DPC_UTIL_HVSYNC_GPX320240(DPC_RGB_666, 320, 240, 30, 20, 38, CFALSE, 3, 5, 15,CFALSE,CTRUE,CFALSE,CTRUE); #endif - DPC_Run(); - } - else if (arg == DISPLAY_MONITOR ) // ARGB_800x600x16_60Hz - { - CX25874(arg); - /* Display Controller setup */ - DPC_Stop(); + DPC_Run(); - ClkInfo.DISPCLK_SOURCE = 0; - ClkInfo.DISPCLK_DIVIDER= 1; - ClkInfo.DISPCLK_POL = 0; +#ifndef CONFIG_MACH_GP2XF200 + write_gpio_bit(GPIO_H1,1); //LCD VGH ON + write_gpio_bit(GPIO_H2,1); //LCD Back ON +#else + if(!read_gpio_bit(GPIO_I12) ) lcdTurnOn(); - PMR_SetDispClk(&ClkInfo); - DPC_InitHardware(DPC_MRGB_888B, CFALSE, CFALSE,CFALSE, 0, 0, DPC_USE_EXTCLK); - DPC_UTIL_HVSYNC (DPC_MRGB_888B, 800, 600, 80, 32, 112, CTRUE, 10, 5, 10, CFALSE); -#ifdef CONFIG_MACH_MMSP2_DTK4 - write_gpio_bit(GPIO_N5, 1); // VS_2 - write_gpio_bit(GPIO_N6, 1); // VS_1 - write_gpio_bit(GPIO_N0, 0); // LCD Backlignt off + write_gpio_bit(GPIO_H1,1); //LCD AVDD ON + write_gpio_bit(GPIO_L11,1); //LCD Back ON + write_gpio_bit(GPIO_F3,1); //Sound on LCD(AMP_ON) #endif + } + else if (arg == DISPLAY_MONITOR ) // ARGB_800x600x16_60Hz + { + CX25874(arg); + /* Display Controller setup */ + DPC_Stop(); - DPC_Run(); - } - else if ( arg == DISPLAY_TV_NTSC ) // TV_720x480Ix16_30Hz SVIDEO - { - CX25874(arg); - /* Display Controller setup */ - DPC_Stop(); + ClkInfo.DISPCLK_SOURCE = 0; + ClkInfo.DISPCLK_DIVIDER= 1; + ClkInfo.DISPCLK_POL = 0; - ClkInfo.DISPCLK_SOURCE = 0; - ClkInfo.DISPCLK_DIVIDER= 1; - ClkInfo.DISPCLK_POL = 0; + PMR_SetDispClk(&ClkInfo); + DPC_InitHardware(DPC_MRGB_888B, CFALSE, CFALSE,CFALSE, 0, 0, DPC_USE_EXTCLK); + DPC_UTIL_HVSYNC (DPC_MRGB_888B, 800, 600, 80, 32, 112, CTRUE, 10, 5, 10, CFALSE); + DPC_Run(); + } + else if ( arg == DISPLAY_TV_NTSC ) // TV_720x480Ix16_30Hz SVIDEO + { - PMR_SetDispClk(&ClkInfo); - DPC_InitHardware(DPC_YCBCR_CCIR656, CTRUE, CFALSE,CFALSE, 0, 0, DPC_USE_EXTCLK); - /* 858 x 262*/ - //DPC_UTIL_HVSYNC (DPC_YCBCR_CCIR656, 720, 240, 32, 96, 10, CTRUE, 5, 3, 15, CTRUE); /* ORG */ + CX25874(arg); + /* Display Controller setup */ + DPC_Stop(); - DPC_UTIL_HVSYNC (DPC_YCBCR_CCIR656, 720, 240, 32, 66, 40, CTRUE, 1, 1, 21, CTRUE); //final - hShift=40,vShift=21; - vsh=240; -#ifdef CONFIG_MACH_GP2X + ClkInfo.DISPCLK_SOURCE = 0; + ClkInfo.DISPCLK_DIVIDER= 1; + ClkInfo.DISPCLK_POL = 0; - DPC_UTIL_DATA_INV(CFALSE); - write_gpio_bit(GPIO_H2,0); //LCD Backlignt off - MLC_isTVCheck(CTRUE); - SetTvMode(TV_MODE_NTSC); - tvFlag=TV_MODE_NTSC; -#endif -#ifdef CONFIG_MACH_MMSP2_DTK4 -#ifndef CONFIG_MACH_GP2X - write_gpio_bit(GPIO_N5, 0); // VS_2 - write_gpio_bit(GPIO_N6, 1); // VS_1 - write_gpio_bit(GPIO_N0, 0); // LCD Backlignt off -#endif -#endif - DPC_Run(); + PMR_SetDispClk(&ClkInfo); + DPC_InitHardware(DPC_YCBCR_CCIR656, CTRUE, CFALSE,CFALSE, 0, 0, DPC_USE_EXTCLK); + /* 858 x 262*/ + //DPC_UTIL_HVSYNC (DPC_YCBCR_CCIR656, 720, 240, 32, 96, 10, CTRUE, 5, 3, 15, CTRUE); /* ORG */ - } - else if ( arg == DISPLAY_TV_PAL ) //TV_720x576Ix16_50Hz SVIDEO - { - CX25874(arg); - /* Display Controller setup */ - DPC_Stop(); + DPC_UTIL_HVSYNC (DPC_YCBCR_CCIR656, 720, 240, 32, 66, 40, CTRUE, 1, 1, 21, CTRUE); //final + hShift=40,vShift=21; + vsh=240; - ClkInfo.DISPCLK_SOURCE = 0; - ClkInfo.DISPCLK_DIVIDER= 1; - ClkInfo.DISPCLK_POL = 0; + DPC_UTIL_DATA_INV(CFALSE); + MLC_isTVCheck(CTRUE); + SetTvMode(TV_MODE_NTSC); + tvFlag=TV_MODE_NTSC; + DPC_Run(); - PMR_SetDispClk(&ClkInfo); - //DPC_InitHardware(DPC_YCBCR_CCIR656, CTRUE, CFALSE,CFALSE, 0, 0, DPC_USE_EXTCLK); - //PAL MODE - DPC_InitHardware(DPC_YCBCR_CCIR656, CTRUE, CTRUE,CFALSE, 0, 0, DPC_USE_EXTCLK); - /* total length... [truncated message content] |
From: <lit...@us...> - 2008-07-29 18:34:30
|
Revision: 310 http://open2x.svn.sourceforge.net/open2x/?rev=310&view=rev Author: lithosphere Date: 2008-07-29 18:34:38 +0000 (Tue, 29 Jul 2008) Log Message: ----------- Latest version of libmpeg2 with ARM optimizations Modified Paths: -------------- trunk/libs-new/mpeg2dec/gp2x.mk Added Paths: ----------- trunk/libs-new/mpeg2dec/libmpeg2-0.5.1.tar.gz Removed Paths: ------------- trunk/libs-new/mpeg2dec/mpeg2dec-gp2x/ Modified: trunk/libs-new/mpeg2dec/gp2x.mk =================================================================== --- trunk/libs-new/mpeg2dec/gp2x.mk 2008-07-29 16:34:37 UTC (rev 309) +++ trunk/libs-new/mpeg2dec/gp2x.mk 2008-07-29 18:34:38 UTC (rev 310) @@ -1,7 +1,15 @@ -MPEG2DEC_DIR := mpeg2dec/mpeg2dec-gp2x +MPEG2DEC_DIR_ROOT := mpeg2dec +MPEG2DEC_DIR := mpeg2dec/libmpeg2-0.5.1 -o2x-mpeg2dec: o2x-sdl +o2x-mpeg2dec: #o2x-sdl @-echo "Build mpeg2dec" + + @-(cd $(MPEG2DEC_DIR_ROOT); \ + echo " extracting mpeg2dec"; \ + tar -zxf libmpeg2-0.5.1.tar.gz; \ + echo " commenting pld instructions"; \ + sed s/pld/@pld/ libmpeg2-0.5.1/libmpeg2/motion_comp_arm_s.S > libmpeg2-0.5.1/libmpeg2/motion_comp_arm_s.S.new && mv libmpeg2-0.5.1/libmpeg2/motion_comp_arm_s.S.new libmpeg2-0.5.1/libmpeg2/motion_comp_arm_s.S ) + (cd $(MPEG2DEC_DIR); rm -rf config.cache; \ $(FLAGS) ./configure --prefix=$(PREFIX)\ --target=$(TARGET)\ @@ -9,6 +17,7 @@ --build=$(BUILD)\ --enable-shared\ --enable-static\ + --disable-sdl\ --with-sdl-prefix=$(PREFIX)\ ) $(FLAGS) make -C $(MPEG2DEC_DIR) Property changes on: trunk/libs-new/mpeg2dec/libmpeg2-0.5.1.tar.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pa...@us...> - 2008-07-29 16:34:31
|
Revision: 309 http://open2x.svn.sourceforge.net/open2x/?rev=309&view=rev Author: paeryn Date: 2008-07-29 16:34:37 +0000 (Tue, 29 Jul 2008) Log Message: ----------- Added Senor Quack's USB Keyboard support. Modified Paths: -------------- trunk/libs/SDL-1.2.9/src/video/gp2x/SDL_gp2xevents.c trunk/libs/SDL-1.2.9/src/video/gp2x/SDL_gp2xevents_c.h trunk/libs/SDL-1.2.9/src/video/gp2x/SDL_gp2xvideo.c Modified: trunk/libs/SDL-1.2.9/src/video/gp2x/SDL_gp2xevents.c =================================================================== --- trunk/libs/SDL-1.2.9/src/video/gp2x/SDL_gp2xevents.c 2008-07-11 23:39:16 UTC (rev 308) +++ trunk/libs/SDL-1.2.9/src/video/gp2x/SDL_gp2xevents.c 2008-07-29 16:34:37 UTC (rev 309) @@ -59,6 +59,8 @@ #include "SDL_gp2xkeys.h" //#include "SDL_keysym.h" +//DKS - added for USB keyboard support +#define tty_fd this->hidden->keyboard_fd /*********** *** Mouse stuff @@ -327,143 +329,6 @@ } -//DKS - modifying to improve touchscreen -/* For now, use MSC, PS/2, and MS protocols - Driver adapted from the SVGAlib mouse driver code (taken from gpm, etc.) -*/ -//static void handle_mouse(_THIS) -//{ -// static int start = 0; -// static unsigned char mousebuf[BUFSIZ]; -// static int relative = 1; -// -// int i, nread; -// int button = 0; -// int dx = 0, dy = 0; -// int packetsize = 0; -// -// /* Figure out the mouse packet size */ -// switch (mouse_drv) { -// case MOUSE_NONE: -// /* Ack! */ -// read(this->hidden->mouse_fd, mousebuf, BUFSIZ); -// return; -// case MOUSE_MSC: -// packetsize = 5; -// break; -// case MOUSE_IMPS2: -// packetsize = 4; -// break; -// case MOUSE_PS2: -// case MOUSE_MS: -// case MOUSE_BM: -// packetsize = 3; -// break; -// case MOUSE_ELO: -// packetsize = 0; -// break; -// case MOUSE_TSLIB: -// handle_tslib(this); -// return; /* nothing left to do */ -// case NUM_MOUSE_DRVS: -// /* Uh oh.. */ -// packetsize = 0; -// break; -// } -// -// /* Read as many packets as possible */ -// nread = read(this->hidden->mouse_fd, &mousebuf[start], BUFSIZ-start); -// if (nread < 0) { -// return; -// } -// nread += start; -//#ifdef DEBUG_MOUSE -// fprintf(stderr, "Read %d bytes from mouse, start = %d\n", nread, start); -//#endif -// for (i=0; i<(nread-(packetsize-1)); i += packetsize) { -// switch (mouse_drv) { -// case MOUSE_NONE: -// break; -// case MOUSE_MSC: -// /* MSC protocol has 0x80 in high byte */ -// if ((mousebuf[i] & 0xF8) != 0x80) { -// /* Go to next byte */ -// i -= (packetsize-1); -// continue; -// } -// /* Get current mouse state */ -// button = (~mousebuf[i]) & 0x07; -// dx = (signed char)(mousebuf[i+1]) + -// (signed char)(mousebuf[i+3]); -// dy = -((signed char)(mousebuf[i+2]) + -// (signed char)(mousebuf[i+4])); -// relative = 1; -// break; -// case MOUSE_PS2: -// /* PS/2 protocol has nothing in high byte */ -// if ((mousebuf[i] & 0xC0) != 0) { -// /* Go to next byte */ -// i -= (packetsize-1); -// continue; -// } -// /* Get current mouse state */ -// button = (mousebuf[i] & 0x04) >> 1 | /*Middle*/ -// (mousebuf[i] & 0x02) >> 1 | /*Right*/ -// (mousebuf[i] & 0x01) << 2; /*Left*/ -// dx = (mousebuf[i] & 0x10) ? -// mousebuf[i+1] - 256 : mousebuf[i+1]; -// dy = (mousebuf[i] & 0x20) ? -// -(mousebuf[i+2] - 256) : -mousebuf[i+2]; -// relative = 1; -// break; -// case MOUSE_IMPS2: -// /* Get current mouse state */ -// button = (mousebuf[i] & 0x04) >> 1 | /*Middle*/ -// (mousebuf[i] & 0x02) >> 1 | /*Right*/ -// (mousebuf[i] & 0x01) << 2 | /*Left*/ -// (mousebuf[i] & 0x40) >> 3 | /* 4 */ -// (mousebuf[i] & 0x80) >> 3; /* 5 */ -// dx = (mousebuf[i] & 0x10) ? -// mousebuf[i+1] - 256 : mousebuf[i+1]; -// dy = (mousebuf[i] & 0x20) ? -// -(mousebuf[i+2] - 256) : -mousebuf[i+2]; -// switch (mousebuf[i+3]&0x0F) { -// case 0x0E: /* DX = +1 */ -// case 0x02: /* DX = -1 */ -// break; -// case 0x0F: /* DY = +1 (map button 4) */ -// GP2X_vgamousecallback(button | (1<<3), -// 1, 0, 0); -// break; -// case 0x01: /* DY = -1 (map button 5) */ -// GP2X_vgamousecallback(button | (1<<4), -// 1, 0, 0); -// break; -// } -// break; -// case MOUSE_MS: -// case MOUSE_BM: -// case MOUSE_ELO: -// dx = 0; -// dy = 0; -// break; -// case MOUSE_TSLIB: -// case NUM_MOUSE_DRVS: -// /* Uh oh.. */ -// dx = 0; -// dy = 0; -// break; -// } -// GP2X_vgamousecallback(button, relative, dx, dy); -// } -// if ( i < nread ) { -// memcpy(mousebuf, &mousebuf[i], (nread-i)); -// start = (nread-i); -// } else { -// start = 0; -// } -// return; -//} static void handle_mouse(_THIS) { static int start = 0; @@ -617,331 +482,437 @@ } +//DKS - these were already in here: /* The translation tables from a console scancode to a SDL keysym */ #define NUM_VGAKEYMAPS (1<<KG_CAPSSHIFT) static Uint16 vga_keymap[NUM_VGAKEYMAPS][NR_KEYS]; static SDLKey keymap[128]; static Uint16 keymap_temp[128]; /* only used at startup */ + static SDL_keysym *TranslateKey(int scancode, SDL_keysym *keysym); +//DKS - new stuff for USB keyboard +static int GP2X_SetRawKeyboardMode(_THIS); +static void GP2X_SetPreviousKeyboardMode(_THIS); +static int GP2X_InRawKeyboardMode(_THIS); + +int GP2X_InRawKeyboardMode(_THIS) +{ + return((tty_fd >= 0) && (this->hidden->saved_kbd_mode >= 0)); +} + +//DKS - pulled this from virgin 1.2.9 SDL fbcon +int GP2X_SetRawKeyboardMode(_THIS) +{ + struct termios keyboard_termios; + + /* Set medium-raw keyboard mode */ + if ( (tty_fd >= 0) && !GP2X_InRawKeyboardMode(this) ) { + +//DKS - don't need this on GP2X +// /* Switch to the correct virtual terminal */ +// if ( current_vt > 0 ) { +// struct vt_stat vtstate; +// +// if ( ioctl(keyboard_fd, VT_GETSTATE, &vtstate) == 0 ) { +// saved_vt = vtstate.v_active; +// } +// if ( ioctl(keyboard_fd, VT_ACTIVATE, current_vt) == 0 ) { +// ioctl(keyboard_fd, VT_WAITACTIVE, current_vt); +// } +// } + + /* Set the terminal input mode */ + if ( tcgetattr(tty_fd, &(this->hidden->saved_kbd_termios)) < 0 ) { + SDL_SetError("Unable to get terminal attributes"); + if ( tty_fd > 0 ) { + close(tty_fd); + } + tty_fd = -1; + return(-1); + } + if ( ioctl(tty_fd, KDGKBMODE, &(this->hidden->saved_kbd_mode)) < 0 ) { + SDL_SetError("Unable to get current keyboard mode"); + if ( tty_fd > 0 ) { + close(tty_fd); + } + tty_fd = -1; + return(-1); + } + keyboard_termios = this->hidden->saved_kbd_termios; + keyboard_termios.c_lflag &= ~(ICANON | ECHO | ISIG); + keyboard_termios.c_iflag &= ~(ISTRIP | IGNCR | ICRNL | INLCR | IXOFF | IXON); + keyboard_termios.c_cc[VMIN] = 0; + keyboard_termios.c_cc[VTIME] = 0; + if (tcsetattr(tty_fd, TCSAFLUSH, &keyboard_termios) < 0) { + GP2X_CloseKeyboard(this); + SDL_SetError("Unable to set terminal attributes"); + return(-1); + } + /* This will fail if we aren't root or this isn't our tty */ + if ( ioctl(tty_fd, KDSKBMODE, K_MEDIUMRAW) < 0 ) { + GP2X_CloseKeyboard(this); + SDL_SetError("Unable to set keyboard in raw mode"); + return(-1); + } + if ( ioctl(tty_fd, KDSETMODE, KD_GRAPHICS) < 0 ) { + GP2X_CloseKeyboard(this); + SDL_SetError("Unable to set keyboard in graphics mode"); + return(-1); + } + } + return(tty_fd); + +} + +//DKS - pulled from GPH's code +void GP2X_SetPreviousKeyboardMode(_THIS) +{ + if(!GP2X_InRawKeyboardMode(this)) + return; + + if (tty_fd >= 0) { + ioctl(tty_fd, KDSETMODE, KD_TEXT); + ioctl(tty_fd, KDSKBMODE, this->hidden->saved_kbd_mode); + tcsetattr(tty_fd, TCSAFLUSH, &(this->hidden->saved_kbd_termios)); + } + + this->hidden->saved_kbd_mode = -1; +} + /* Ugh, we have to duplicate the kernel's keysym mapping code... Oh, it's not so bad. :-) FIXME: Add keyboard LED handling code */ +//DKS - pulled this from fbcon for USB keyboard support static void GP2X_vgainitkeymaps(int fd) { - struct kbentry entry; - int map, i; - - /* Don't do anything if we are passed a closed keyboard */ - if (fd < 0) { - return; - } - - /* Load all the keysym mappings */ - for (map=0; map<NUM_VGAKEYMAPS; ++map) { - memset(vga_keymap[map], 0, NR_KEYS*sizeof(Uint16)); - - for (i = 0; i < NR_KEYS; ++i) { - entry.kb_table = map; - entry.kb_index = i; - if (ioctl(fd, KDGKBENT, &entry) == 0) { - /* fill keytemp. This replaces SDL_fbkeys.h */ - if ((map == 0) && (i<128)) { - keymap_temp[i] = entry.kb_value; + struct kbentry entry; + int map, i; + + /* Don't do anything if we are passed a closed keyboard */ + if ( fd < 0 ) { + return; } - /* The "Enter" key is a special case */ - if (entry.kb_value == K_ENTER) { - entry.kb_value = K(KT_ASCII,13); + + /* Load all the keysym mappings */ + for ( map=0; map<NUM_VGAKEYMAPS; ++map ) { + memset(vga_keymap[map], 0, NR_KEYS*sizeof(Uint16)); + for ( i=0; i<NR_KEYS; ++i ) { + entry.kb_table = map; + entry.kb_index = i; + if ( ioctl(fd, KDGKBENT, &entry) == 0 ) { + /* fill keytemp. This replaces SDL_fbkeys.h */ + if ( (map == 0) && (i<128) ) { + keymap_temp[i] = entry.kb_value; + } + /* The "Enter" key is a special case */ + if ( entry.kb_value == K_ENTER ) { + entry.kb_value = K(KT_ASCII,13); + } + /* Handle numpad specially as well */ + if ( KTYP(entry.kb_value) == KT_PAD ) { + switch ( entry.kb_value ) { + case K_P0: + case K_P1: + case K_P2: + case K_P3: + case K_P4: + case K_P5: + case K_P6: + case K_P7: + case K_P8: + case K_P9: + vga_keymap[map][i]=entry.kb_value; + vga_keymap[map][i]+= '0'; + break; + case K_PPLUS: + vga_keymap[map][i]=K(KT_ASCII,'+'); + break; + case K_PMINUS: + vga_keymap[map][i]=K(KT_ASCII,'-'); + break; + case K_PSTAR: + vga_keymap[map][i]=K(KT_ASCII,'*'); + break; + case K_PSLASH: + vga_keymap[map][i]=K(KT_ASCII,'/'); + break; + case K_PENTER: + vga_keymap[map][i]=K(KT_ASCII,'\r'); + break; + case K_PCOMMA: + vga_keymap[map][i]=K(KT_ASCII,','); + break; + case K_PDOT: + vga_keymap[map][i]=K(KT_ASCII,'.'); + break; + default: + break; + } + } + /* Do the normal key translation */ + if ( (KTYP(entry.kb_value) == KT_LATIN) || + (KTYP(entry.kb_value) == KT_ASCII) || + (KTYP(entry.kb_value) == KT_LETTER) ) { + vga_keymap[map][i] = entry.kb_value; + } + } + } } - /* Handle numpad specially as well */ - if (KTYP(entry.kb_value) == KT_PAD) { - switch (entry.kb_value) { - case K_P0: - case K_P1: - case K_P2: - case K_P3: - case K_P4: - case K_P5: - case K_P6: - case K_P7: - case K_P8: - case K_P9: - vga_keymap[map][i]=entry.kb_value; - vga_keymap[map][i]+= '0'; - break; - case K_PPLUS: - vga_keymap[map][i]=K(KT_ASCII,'+'); - break; - case K_PMINUS: - vga_keymap[map][i]=K(KT_ASCII,'-'); - break; - case K_PSTAR: - vga_keymap[map][i]=K(KT_ASCII,'*'); - break; - case K_PSLASH: - vga_keymap[map][i]=K(KT_ASCII,'/'); - break; - case K_PENTER: - vga_keymap[map][i]=K(KT_ASCII,'\r'); - break; - case K_PCOMMA: - vga_keymap[map][i]=K(KT_ASCII,','); - break; - case K_PDOT: - vga_keymap[map][i]=K(KT_ASCII,'.'); - break; - default: - break; - } - } - /* Do the normal key translation */ - if ((KTYP(entry.kb_value) == KT_LATIN) || - (KTYP(entry.kb_value) == KT_ASCII) || - (KTYP(entry.kb_value) == KT_LETTER)) { - vga_keymap[map][i] = entry.kb_value; - } - } - } - } } -//### -//#define DEBUG_KEYBOARD -//### + +//DKS - pulled from GPH's code int GP2X_OpenKeyboard(_THIS) { - int fd; + //DKS - it should be noted tty_fd is really an alias for keyboard_fd, and keyboard_fd + // is an int buried in SDL_gp2xvideo.c - /* Open only if not already opened */ - if ( this->hidden->keyboard_fd < 0 ) { - static const char keybd[] = "/dev/input/event0"; + /* Open only if not already opened */ + if ( tty_fd < 0 ) { + static const char * const tty0[] = { "/dev/tty0", "/dev/vc/0", NULL }; + int i; - fd = open(keybd, O_RDWR); - if (fd) { -#ifdef DEBUG_KEYBOARD - int version; - unsigned short dev_id[4]; - char device_name[256]; - int abs[5]; + /* Try to query for a free virtual terminal */ + tty_fd = -1; + for ( i=0; tty0[i] && (tty_fd < 0); ++i ) { + tty_fd = open(tty0[i], O_RDWR | O_NDELAY, 0); + } - if (ioctl(fd, EVIOCGVERSION, &version)) - fputs("Failed to get keyboard driver version", stderr); - else - fprintf(stderr, "Input driver version is %d.%d.%d\n", - version >> 16, (version >> 8) & 0xff, version & 0xff); + if(tty_fd >= 0) { + /* Set up keymap */ + GP2X_vgainitkeymaps(tty_fd); + } - ioctl(fd, EVIOCGID, dev_id); - fprintf(stderr, "Input device ID: bus 0x%x vendor 0x%x product 0x%x version 0x%x\n", - dev_id[ID_BUS], - dev_id[ID_VENDOR], - dev_id[ID_PRODUCT], - dev_id[ID_VERSION]); - - ioctl(fd, EVIOCGNAME(sizeof(device_name)), device_name); - printf("Input device name: \"%s\"\n", device_name); -#endif - } + this->hidden->saved_kbd_mode = -1; + + GP2X_SetRawKeyboardMode(this); + } - /* Set up keymap */ - // GP2X_vgainitkeymaps(this->hidden->keyboard_fd); - } + return(tty_fd); +} - return(this->hidden->keyboard_fd); +//DKS - pulled from GPH's and modified +void GP2X_CloseKeyboard(_THIS) +{ + if ( tty_fd >= 0 ) { + GP2X_SetPreviousKeyboardMode(this); + if ( tty_fd >= 0 ) close(tty_fd); + } + tty_fd = -1; } +//DKS - pulled from virgin SDL fbcon/ and modified static void handle_keyboard(_THIS) { - /************** - * Do nothing. I haven't finished the keyboard code yet - **************/ - return; + unsigned char keybuf[BUFSIZ]; + int i, nread; + int pressed; + int scancode; + SDL_keysym keysym; - /* - struct input_event event; - int i, nread; - int pressed; - int scancode; - SDL_keysym keysym; - - while ((nread = read(this->hidden->keyboard_fd, &event, sizeof(event))) > 0) { - switch (event.type) { - case EV_KEY: - if (event.value == 0) - pressed = SDL_RELEASED; - else if (event.value == 1) - pressed = SDL_PRESSED; - - scancode = event.code; - TranslateKey(scancode, &keysym); - SDL_PrivateKeyboard(pressed, &keysym); - } - } - */ + nread = read(tty_fd, keybuf, BUFSIZ); + for ( i=0; i<nread; ++i ) { + scancode = keybuf[i] & 0x7F; + if ( keybuf[i] & 0x80 ) { + pressed = SDL_RELEASED; + } else { + pressed = SDL_PRESSED; + } + TranslateKey(scancode, &keysym); +//DKS - on GP2X, no virtual terminals +// /* Handle Alt-FN for vt switch */ +// switch (keysym.sym) { +// case SDLK_F1: +// case SDLK_F2: +// case SDLK_F3: +// case SDLK_F4: +// case SDLK_F5: +// case SDLK_F6: +// case SDLK_F7: +// case SDLK_F8: +// case SDLK_F9: +// case SDLK_F10: +// case SDLK_F11: +// case SDLK_F12: +// if ( SDL_GetModState() & KMOD_ALT ) { +// if ( pressed ) { +// switch_vt(this, (keysym.sym-SDLK_F1)+1); +// } +// break; +// } + /* Fall through to normal processing */ +// default: + posted += SDL_PrivateKeyboard(pressed, &keysym); +// break; +// } + } } +//DKS - pulled from virgin SDL 1.2.9 fbcon/ and modified void GP2X_InitOSKeymap(_THIS) { - int i; + int i; - /* Initialize the Linux key translation table */ + /* Initialize the Linux key translation table */ - /* First get the ascii keys and others not well handled */ - for (i=0; i<SDL_TABLESIZE(keymap); ++i) { - switch(i) { - /* These aren't handled by the x86 kernel keymapping (?) */ - case SCANCODE_PRINTSCREEN: - keymap[i] = SDLK_PRINT; - break; - case SCANCODE_BREAK: - keymap[i] = SDLK_BREAK; - break; - case SCANCODE_BREAK_ALTERNATIVE: - keymap[i] = SDLK_PAUSE; - break; - case SCANCODE_LEFTSHIFT: - keymap[i] = SDLK_LSHIFT; - break; - case SCANCODE_RIGHTSHIFT: - keymap[i] = SDLK_RSHIFT; - break; - case SCANCODE_LEFTCONTROL: - keymap[i] = SDLK_LCTRL; - break; - case SCANCODE_RIGHTCONTROL: - keymap[i] = SDLK_RCTRL; - break; - case SCANCODE_RIGHTWIN: - keymap[i] = SDLK_RSUPER; - break; - case SCANCODE_LEFTWIN: - keymap[i] = SDLK_LSUPER; - break; - case 127: - keymap[i] = SDLK_MENU; - break; - /* this should take care of all standard ascii keys */ - default: - keymap[i] = KVAL(vga_keymap[0][i]); - break; - } - } - for (i=0; i<SDL_TABLESIZE(keymap); ++i) { - switch(keymap_temp[i]) { - case K_F1: keymap[i] = SDLK_F1; break; - case K_F2: keymap[i] = SDLK_F2; break; - case K_F3: keymap[i] = SDLK_F3; break; - case K_F4: keymap[i] = SDLK_F4; break; - case K_F5: keymap[i] = SDLK_F5; break; - case K_F6: keymap[i] = SDLK_F6; break; - case K_F7: keymap[i] = SDLK_F7; break; - case K_F8: keymap[i] = SDLK_F8; break; - case K_F9: keymap[i] = SDLK_F9; break; - case K_F10: keymap[i] = SDLK_F10; break; - case K_F11: keymap[i] = SDLK_F11; break; - case K_F12: keymap[i] = SDLK_F12; break; + /* First get the ascii keys and others not well handled */ + for (i=0; i<SDL_TABLESIZE(keymap); ++i) { + switch(i) { + /* These aren't handled by the x86 kernel keymapping (?) */ + case SCANCODE_PRINTSCREEN: + keymap[i] = SDLK_PRINT; + break; + case SCANCODE_BREAK: + keymap[i] = SDLK_BREAK; + break; + case SCANCODE_BREAK_ALTERNATIVE: + keymap[i] = SDLK_PAUSE; + break; + case SCANCODE_LEFTSHIFT: + keymap[i] = SDLK_LSHIFT; + break; + case SCANCODE_RIGHTSHIFT: + keymap[i] = SDLK_RSHIFT; + break; + case SCANCODE_LEFTCONTROL: + keymap[i] = SDLK_LCTRL; + break; + case SCANCODE_RIGHTCONTROL: + keymap[i] = SDLK_RCTRL; + break; + case SCANCODE_RIGHTWIN: + keymap[i] = SDLK_RSUPER; + break; + case SCANCODE_LEFTWIN: + keymap[i] = SDLK_LSUPER; + break; + case 127: + keymap[i] = SDLK_MENU; + break; + /* this should take care of all standard ascii keys */ + default: + keymap[i] = KVAL(vga_keymap[0][i]); + break; + } + } + for (i=0; i<SDL_TABLESIZE(keymap); ++i) { + switch(keymap_temp[i]) { + case K_F1: keymap[i] = SDLK_F1; break; + case K_F2: keymap[i] = SDLK_F2; break; + case K_F3: keymap[i] = SDLK_F3; break; + case K_F4: keymap[i] = SDLK_F4; break; + case K_F5: keymap[i] = SDLK_F5; break; + case K_F6: keymap[i] = SDLK_F6; break; + case K_F7: keymap[i] = SDLK_F7; break; + case K_F8: keymap[i] = SDLK_F8; break; + case K_F9: keymap[i] = SDLK_F9; break; + case K_F10: keymap[i] = SDLK_F10; break; + case K_F11: keymap[i] = SDLK_F11; break; + case K_F12: keymap[i] = SDLK_F12; break; - case K_DOWN: keymap[i] = SDLK_DOWN; break; - case K_LEFT: keymap[i] = SDLK_LEFT; break; - case K_RIGHT: keymap[i] = SDLK_RIGHT; break; - case K_UP: keymap[i] = SDLK_UP; break; + case K_DOWN: keymap[i] = SDLK_DOWN; break; + case K_LEFT: keymap[i] = SDLK_LEFT; break; + case K_RIGHT: keymap[i] = SDLK_RIGHT; break; + case K_UP: keymap[i] = SDLK_UP; break; - case K_P0: keymap[i] = SDLK_KP0; break; - case K_P1: keymap[i] = SDLK_KP1; break; - case K_P2: keymap[i] = SDLK_KP2; break; - case K_P3: keymap[i] = SDLK_KP3; break; - case K_P4: keymap[i] = SDLK_KP4; break; - case K_P5: keymap[i] = SDLK_KP5; break; - case K_P6: keymap[i] = SDLK_KP6; break; - case K_P7: keymap[i] = SDLK_KP7; break; - case K_P8: keymap[i] = SDLK_KP8; break; - case K_P9: keymap[i] = SDLK_KP9; break; - case K_PPLUS: keymap[i] = SDLK_KP_PLUS; break; - case K_PMINUS: keymap[i] = SDLK_KP_MINUS; break; - case K_PSTAR: keymap[i] = SDLK_KP_MULTIPLY; break; - case K_PSLASH: keymap[i] = SDLK_KP_DIVIDE; break; - case K_PENTER: keymap[i] = SDLK_KP_ENTER; break; - case K_PDOT: keymap[i] = SDLK_KP_PERIOD; break; + case K_P0: keymap[i] = SDLK_KP0; break; + case K_P1: keymap[i] = SDLK_KP1; break; + case K_P2: keymap[i] = SDLK_KP2; break; + case K_P3: keymap[i] = SDLK_KP3; break; + case K_P4: keymap[i] = SDLK_KP4; break; + case K_P5: keymap[i] = SDLK_KP5; break; + case K_P6: keymap[i] = SDLK_KP6; break; + case K_P7: keymap[i] = SDLK_KP7; break; + case K_P8: keymap[i] = SDLK_KP8; break; + case K_P9: keymap[i] = SDLK_KP9; break; + case K_PPLUS: keymap[i] = SDLK_KP_PLUS; break; + case K_PMINUS: keymap[i] = SDLK_KP_MINUS; break; + case K_PSTAR: keymap[i] = SDLK_KP_MULTIPLY; break; + case K_PSLASH: keymap[i] = SDLK_KP_DIVIDE; break; + case K_PENTER: keymap[i] = SDLK_KP_ENTER; break; + case K_PDOT: keymap[i] = SDLK_KP_PERIOD; break; - case K_SHIFT: if ( keymap[i] != SDLK_RSHIFT ) - keymap[i] = SDLK_LSHIFT; - break; - case K_SHIFTL: keymap[i] = SDLK_LSHIFT; break; - case K_SHIFTR: keymap[i] = SDLK_RSHIFT; break; - case K_CTRL: if ( keymap[i] != SDLK_RCTRL ) - keymap[i] = SDLK_LCTRL; - break; - case K_CTRLL: keymap[i] = SDLK_LCTRL; break; - case K_CTRLR: keymap[i] = SDLK_RCTRL; break; - case K_ALT: keymap[i] = SDLK_LALT; break; - case K_ALTGR: keymap[i] = SDLK_RALT; break; + case K_SHIFT: if ( keymap[i] != SDLK_RSHIFT ) + keymap[i] = SDLK_LSHIFT; + break; + case K_SHIFTL: keymap[i] = SDLK_LSHIFT; break; + case K_SHIFTR: keymap[i] = SDLK_RSHIFT; break; + case K_CTRL: if ( keymap[i] != SDLK_RCTRL ) + keymap[i] = SDLK_LCTRL; + break; + case K_CTRLL: keymap[i] = SDLK_LCTRL; break; + case K_CTRLR: keymap[i] = SDLK_RCTRL; break; + case K_ALT: keymap[i] = SDLK_LALT; break; + case K_ALTGR: keymap[i] = SDLK_RALT; break; - case K_INSERT: keymap[i] = SDLK_INSERT; break; - case K_REMOVE: keymap[i] = SDLK_DELETE; break; - case K_PGUP: keymap[i] = SDLK_PAGEUP; break; - case K_PGDN: keymap[i] = SDLK_PAGEDOWN; break; - case K_FIND: keymap[i] = SDLK_HOME; break; - case K_SELECT: keymap[i] = SDLK_END; break; + case K_INSERT: keymap[i] = SDLK_INSERT; break; + case K_REMOVE: keymap[i] = SDLK_DELETE; break; + case K_PGUP: keymap[i] = SDLK_PAGEUP; break; + case K_PGDN: keymap[i] = SDLK_PAGEDOWN; break; + case K_FIND: keymap[i] = SDLK_HOME; break; + case K_SELECT: keymap[i] = SDLK_END; break; - case K_NUM: keymap[i] = SDLK_NUMLOCK; break; - case K_CAPS: keymap[i] = SDLK_CAPSLOCK; break; + case K_NUM: keymap[i] = SDLK_NUMLOCK; break; + case K_CAPS: keymap[i] = SDLK_CAPSLOCK; break; - case K_F13: keymap[i] = SDLK_PRINT; break; - case K_HOLD: keymap[i] = SDLK_SCROLLOCK; break; - case K_PAUSE: keymap[i] = SDLK_PAUSE; break; + case K_F13: keymap[i] = SDLK_PRINT; break; + case K_HOLD: keymap[i] = SDLK_SCROLLOCK; break; + case K_PAUSE: keymap[i] = SDLK_PAUSE; break; - case 127: keymap[i] = SDLK_BACKSPACE; break; + case 127: keymap[i] = SDLK_BACKSPACE; break; - default: break; - } - } + default: break; + } + } } +//DKS - pulled from virgin 1.2.9 static SDL_keysym *TranslateKey(int scancode, SDL_keysym *keysym) { - /* Set the keysym information */ - keysym->scancode = scancode; - keysym->sym = keymap[scancode]; - keysym->mod = KMOD_NONE; + /* Set the keysym information */ + keysym->scancode = scancode; + keysym->sym = keymap[scancode]; + keysym->mod = KMOD_NONE; - /* If UNICODE is on, get the UNICODE value for the key */ - keysym->unicode = 0; - if ( SDL_TranslateUNICODE ) { - int map; - SDLMod modstate; + /* If UNICODE is on, get the UNICODE value for the key */ + keysym->unicode = 0; + if ( SDL_TranslateUNICODE ) { + int map; + SDLMod modstate; - modstate = SDL_GetModState(); - map = 0; - if ( modstate & KMOD_SHIFT ) { - map |= (1<<KG_SHIFT); - } - if ( modstate & KMOD_CTRL ) { - map |= (1<<KG_CTRL); - } - if ( modstate & KMOD_ALT ) { - map |= (1<<KG_ALT); - } - if ( modstate & KMOD_MODE ) { - map |= (1<<KG_ALTGR); - } - if ( KTYP(vga_keymap[map][scancode]) == KT_LETTER ) { - if ( modstate & KMOD_CAPS ) { - map ^= (1<<KG_SHIFT); - } - } - if ( KTYP(vga_keymap[map][scancode]) == KT_PAD ) { - if ( modstate & KMOD_NUM ) { - keysym->unicode=KVAL(vga_keymap[map][scancode]); - } - } else { - keysym->unicode = KVAL(vga_keymap[map][scancode]); - } - } - return(keysym); + modstate = SDL_GetModState(); + map = 0; + if ( modstate & KMOD_SHIFT ) { + map |= (1<<KG_SHIFT); + } + if ( modstate & KMOD_CTRL ) { + map |= (1<<KG_CTRL); + } + if ( modstate & KMOD_ALT ) { + map |= (1<<KG_ALT); + } + if ( modstate & KMOD_MODE ) { + map |= (1<<KG_ALTGR); + } + if ( KTYP(vga_keymap[map][scancode]) == KT_LETTER ) { + if ( modstate & KMOD_CAPS ) { + map ^= (1<<KG_SHIFT); + } + } + if ( KTYP(vga_keymap[map][scancode]) == KT_PAD ) { + if ( modstate & KMOD_NUM ) { + keysym->unicode=KVAL(vga_keymap[map][scancode]); + } + } else { + keysym->unicode = KVAL(vga_keymap[map][scancode]); + } + } + return(keysym); } - void GP2X_PumpEvents(_THIS) { fd_set fdset; Modified: trunk/libs/SDL-1.2.9/src/video/gp2x/SDL_gp2xevents_c.h =================================================================== --- trunk/libs/SDL-1.2.9/src/video/gp2x/SDL_gp2xevents_c.h 2008-07-11 23:39:16 UTC (rev 308) +++ trunk/libs/SDL-1.2.9/src/video/gp2x/SDL_gp2xevents_c.h 2008-07-29 16:34:37 UTC (rev 309) @@ -35,5 +35,9 @@ extern void GP2X_InitOSKeymap(_THIS); extern void GP2X_PumpEvents(_THIS); +//DKS - new stuff for USB keyboard +extern int GP2X_OpenKeyboard(_THIS); +extern void GP2X_CloseKeyboard(_THIS); + /* end of SDL_gp2xevents_c.h ... */ Modified: trunk/libs/SDL-1.2.9/src/video/gp2x/SDL_gp2xvideo.c =================================================================== --- trunk/libs/SDL-1.2.9/src/video/gp2x/SDL_gp2xvideo.c 2008-07-11 23:39:16 UTC (rev 308) +++ trunk/libs/SDL-1.2.9/src/video/gp2x/SDL_gp2xvideo.c 2008-07-29 16:34:37 UTC (rev 309) @@ -893,6 +893,11 @@ } GP2X_FreeHWSurfaces(this); + +//DKS - adding mouse close & keyboard close, they seemed to be missing + GP2X_CloseKeyboard(this); + GP2X_CloseMouse(this); + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pa...@us...> - 2008-07-11 23:39:15
|
Revision: 308 http://open2x.svn.sourceforge.net/open2x/?rev=308&view=rev Author: paeryn Date: 2008-07-11 16:39:16 -0700 (Fri, 11 Jul 2008) Log Message: ----------- Senior_Quack's touchscreen enhancements. Modified Paths: -------------- trunk/libs/SDL-1.2.9/src/video/gp2x/SDL_gp2xevents.c trunk/libs/SDL-1.2.9/src/video/gp2x/gp2x_tslib.c Modified: trunk/libs/SDL-1.2.9/src/video/gp2x/SDL_gp2xevents.c =================================================================== --- trunk/libs/SDL-1.2.9/src/video/gp2x/SDL_gp2xevents.c 2008-04-21 10:11:31 UTC (rev 307) +++ trunk/libs/SDL-1.2.9/src/video/gp2x/SDL_gp2xevents.c 2008-07-11 23:39:16 UTC (rev 308) @@ -300,13 +300,16 @@ } } -/* Handle input from tslib */ static void handle_tslib(_THIS) { struct ts_sample sample; int button; - while (ts_read(this->hidden->ts_dev, &sample, 1) > 0) { +//DKS - changed this because there's no point sampling higher than 100hz, the driver +// doesn't update more often than that +//// while (ts_read(this->hidden->ts_dev, &sample, 1) > 0) { + + if (ts_read(this->hidden->ts_dev, &sample, 1) > 0) { button = (sample.pressure > 0) ? 1 : 0; button <<= 2; /* must report it as button 3 */ // Store (semi-)raw touchscreen position (pre mouse clipping) @@ -319,13 +322,148 @@ sample.y = ((sample.y * this->hidden->invyscale) >> 16) + this->hidden->y_offset; GP2X_vgamousecallback(button, 0, sample.x, sample.y); - } + } return; + } +//DKS - modifying to improve touchscreen /* For now, use MSC, PS/2, and MS protocols Driver adapted from the SVGAlib mouse driver code (taken from gpm, etc.) */ +//static void handle_mouse(_THIS) +//{ +// static int start = 0; +// static unsigned char mousebuf[BUFSIZ]; +// static int relative = 1; +// +// int i, nread; +// int button = 0; +// int dx = 0, dy = 0; +// int packetsize = 0; +// +// /* Figure out the mouse packet size */ +// switch (mouse_drv) { +// case MOUSE_NONE: +// /* Ack! */ +// read(this->hidden->mouse_fd, mousebuf, BUFSIZ); +// return; +// case MOUSE_MSC: +// packetsize = 5; +// break; +// case MOUSE_IMPS2: +// packetsize = 4; +// break; +// case MOUSE_PS2: +// case MOUSE_MS: +// case MOUSE_BM: +// packetsize = 3; +// break; +// case MOUSE_ELO: +// packetsize = 0; +// break; +// case MOUSE_TSLIB: +// handle_tslib(this); +// return; /* nothing left to do */ +// case NUM_MOUSE_DRVS: +// /* Uh oh.. */ +// packetsize = 0; +// break; +// } +// +// /* Read as many packets as possible */ +// nread = read(this->hidden->mouse_fd, &mousebuf[start], BUFSIZ-start); +// if (nread < 0) { +// return; +// } +// nread += start; +//#ifdef DEBUG_MOUSE +// fprintf(stderr, "Read %d bytes from mouse, start = %d\n", nread, start); +//#endif +// for (i=0; i<(nread-(packetsize-1)); i += packetsize) { +// switch (mouse_drv) { +// case MOUSE_NONE: +// break; +// case MOUSE_MSC: +// /* MSC protocol has 0x80 in high byte */ +// if ((mousebuf[i] & 0xF8) != 0x80) { +// /* Go to next byte */ +// i -= (packetsize-1); +// continue; +// } +// /* Get current mouse state */ +// button = (~mousebuf[i]) & 0x07; +// dx = (signed char)(mousebuf[i+1]) + +// (signed char)(mousebuf[i+3]); +// dy = -((signed char)(mousebuf[i+2]) + +// (signed char)(mousebuf[i+4])); +// relative = 1; +// break; +// case MOUSE_PS2: +// /* PS/2 protocol has nothing in high byte */ +// if ((mousebuf[i] & 0xC0) != 0) { +// /* Go to next byte */ +// i -= (packetsize-1); +// continue; +// } +// /* Get current mouse state */ +// button = (mousebuf[i] & 0x04) >> 1 | /*Middle*/ +// (mousebuf[i] & 0x02) >> 1 | /*Right*/ +// (mousebuf[i] & 0x01) << 2; /*Left*/ +// dx = (mousebuf[i] & 0x10) ? +// mousebuf[i+1] - 256 : mousebuf[i+1]; +// dy = (mousebuf[i] & 0x20) ? +// -(mousebuf[i+2] - 256) : -mousebuf[i+2]; +// relative = 1; +// break; +// case MOUSE_IMPS2: +// /* Get current mouse state */ +// button = (mousebuf[i] & 0x04) >> 1 | /*Middle*/ +// (mousebuf[i] & 0x02) >> 1 | /*Right*/ +// (mousebuf[i] & 0x01) << 2 | /*Left*/ +// (mousebuf[i] & 0x40) >> 3 | /* 4 */ +// (mousebuf[i] & 0x80) >> 3; /* 5 */ +// dx = (mousebuf[i] & 0x10) ? +// mousebuf[i+1] - 256 : mousebuf[i+1]; +// dy = (mousebuf[i] & 0x20) ? +// -(mousebuf[i+2] - 256) : -mousebuf[i+2]; +// switch (mousebuf[i+3]&0x0F) { +// case 0x0E: /* DX = +1 */ +// case 0x02: /* DX = -1 */ +// break; +// case 0x0F: /* DY = +1 (map button 4) */ +// GP2X_vgamousecallback(button | (1<<3), +// 1, 0, 0); +// break; +// case 0x01: /* DY = -1 (map button 5) */ +// GP2X_vgamousecallback(button | (1<<4), +// 1, 0, 0); +// break; +// } +// break; +// case MOUSE_MS: +// case MOUSE_BM: +// case MOUSE_ELO: +// dx = 0; +// dy = 0; +// break; +// case MOUSE_TSLIB: +// case NUM_MOUSE_DRVS: +// /* Uh oh.. */ +// dx = 0; +// dy = 0; +// break; +// } +// GP2X_vgamousecallback(button, relative, dx, dy); +// } +// if ( i < nread ) { +// memcpy(mousebuf, &mousebuf[i], (nread-i)); +// start = (nread-i); +// } else { +// start = 0; +// } +// return; +//} static void handle_mouse(_THIS) { static int start = 0; @@ -336,7 +474,11 @@ int button = 0; int dx = 0, dy = 0; int packetsize = 0; - + + //DKS for determining if we should read the touchscreen or wait some more + static struct timeval lastread = { 0, 0 }; + static struct timeval now = { 0, 0 }; + /* Figure out the mouse packet size */ switch (mouse_drv) { case MOUSE_NONE: @@ -358,7 +500,21 @@ packetsize = 0; break; case MOUSE_TSLIB: - handle_tslib(this); + //DKS we want to limit the frequency with which the touchscreen is read, as it never + //data faster than 100hz anyways. +#define TSLIB_INTERVAL 5000 // every 5 ms, which allows us to capture all events but + // not waste cycles + gettimeofday(&now, NULL); + if (((now.tv_sec * 1000000 + now.tv_usec) - + (lastread.tv_sec * 1000000 + lastread.tv_usec)) > TSLIB_INTERVAL) { + // 5ms has passed, read a touchscreen sample + handle_tslib(this); + gettimeofday(&lastread, NULL); + } else { + dx = 0; + dy = 0; + } +// handle_tslib(this); return; /* nothing left to do */ case NUM_MOUSE_DRVS: /* Uh oh.. */ Modified: trunk/libs/SDL-1.2.9/src/video/gp2x/gp2x_tslib.c =================================================================== --- trunk/libs/SDL-1.2.9/src/video/gp2x/gp2x_tslib.c 2008-04-21 10:11:31 UTC (rev 307) +++ trunk/libs/SDL-1.2.9/src/video/gp2x/gp2x_tslib.c 2008-07-11 23:39:16 UTC (rev 308) @@ -24,7 +24,6 @@ #include "tslib.h" - typedef struct tsdev { int fd; } TSDEV; @@ -39,17 +38,12 @@ int tslib_parse_vars(const TSLIB_VARS *, int, const char *); -static int sqr(int x) -{ - return x*x; -} +#define SQR(x) ((x) * (x)) - /****************************** * tslib open/close ******************************/ - TSDEV *ts_open(const char *name, int nonblock) { TSDEV *ts; @@ -92,32 +86,140 @@ * ucb1x100-raw ******************************/ +//DKS - I am having problems reading the device, it is only returning 8 bytes +//typedef struct ucb1x00_ts_event { +// unsigned short pressure; +// unsigned short x; +// unsigned short y; +// unsigned short pad; +// struct timeval stamp; +//} UCB1X00_TS_EVENT; typedef struct ucb1x00_ts_event { unsigned short pressure; unsigned short x; unsigned short y; unsigned short pad; - struct timeval stamp; } UCB1X00_TS_EVENT; -static int ucb1x00_read(TSDEV *ts, TS_SAMPLE *samp) +//DKS +//static int ucb1x00_read(TSDEV *ts, TS_SAMPLE *samp) +//{ +// UCB1X00_TS_EVENT ucb1x00_evt; +// int ret; +// +// ret = read(ts->fd, &ucb1x00_evt, sizeof(ucb1x00_evt)); +// if (ret > 0) { +// samp->x = ucb1x00_evt.x; +// samp->y = ucb1x00_evt.y; +// samp->pressure = ucb1x00_evt.pressure; +// samp->tv.tv_usec = ucb1x00_evt.stamp.tv_usec; +// samp->tv.tv_sec = ucb1x00_evt.stamp.tv_sec; +// ret = 1; +// } else +// ret = -1; +// +// return ret; +//} +//DKS - known working copy, latest one before change to read multiple samples: +//static int ucb1x00_read(TSDEV *ts, TS_SAMPLE *samp) +//{ +// UCB1X00_TS_EVENT ucb1x00_evt; +// int ret; +// +// ret = read(ts->fd, &ucb1x00_evt, sizeof(ucb1x00_evt)); +// if (ret > 0) { +// samp->x = ucb1x00_evt.x; +// samp->y = ucb1x00_evt.y; +// samp->pressure = ucb1x00_evt.pressure; +// +// //DKS +//#ifdef DKS_DEBUG +// if (samp->pressure > 0) { +// if (samp->pressure < tslib_minpressure) { +// tslib_minpressure = samp->pressure; +// } +// if (samp->pressure > tslib_maxpressure) { +// tslib_maxpressure = samp->pressure; +// } +// } +//#endif +// +// //DKS - we're never going to need this +//// samp->tv.tv_usec = ucb1x00_evt.stamp.tv_usec; +//// samp->tv.tv_sec = ucb1x00_evt.stamp.tv_sec; +// ret = 1; +// } else +// ret = -1; +// +// return ret; +//} +//DKS - OK, hours of work only to find you cannot read more than one sample at a time +// out of the touchscreen device +//DKS - I am gonna disable this code for now, change it to a for loop and read more at a time +//static inline int ucb1x00_read(TSDEV *ts, TS_SAMPLE *samp, int nr) +//{ +//// struct tsdev *ts = inf->dev; +//// struct ucb1x00_ts_event *ucb1x00_evt; +// UCB1X00_TS_EVENT *ucb1x00_evt; +// int ret; +//// int total = 0; +// ucb1x00_evt = alloca(sizeof(UCB1X00_TS_EVENT) * nr); +// +// tslib_debug5 = sizeof(UCB1X00_TS_EVENT) * nr; // DKS - got 16 here +// +// ret = read(ts->fd, ucb1x00_evt, sizeof(UCB1X00_TS_EVENT) * nr); +// +// //DKS - debugging +//// tslib_debug = ret; // this gave me 8 +// tslib_debug = sizeof(UCB1X00_TS_EVENT); // this gave me 16 +// tslib_debug4 = ret; // GOT 8 here +// +// int numread = 0; +// if(ret > 0) { +// numread = ret / sizeof(UCB1X00_TS_EVENT); +// +// tslib_debug2 = numread; +// +// while(ret >= (int)sizeof(UCB1X00_TS_EVENT)) { +// samp->x = ucb1x00_evt->x; +// samp->y = ucb1x00_evt->y; +// samp->pressure = ucb1x00_evt->pressure; +////#ifdef DEBUG +//// fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure); +////#endif /*DEBUG*/ +// //DKS - won't need these +//// samp->tv.tv_usec = ucb1x00_evt->stamp.tv_usec; +//// samp->tv.tv_sec = ucb1x00_evt->stamp.tv_sec; +// samp++; +// ucb1x00_evt++; +// ret -= sizeof(UCB1X00_TS_EVENT); +// } +// } else { +// return -1; +// } +// +// ret = numread; +// return ret; +//} +//DKS - Originially, I had made this read multiple samples but it turns out the driver +//for the touchscreen is set up to give only one sample per read, so had to go back +//to this optimized version. It should be noted that the device file only ever provides +//8 bytes of data, basically 3shorts: x,y,and pressure, and the old code tried to read +//data that was never provided. +static inline int ucb1x00_read(TSDEV *ts, TS_SAMPLE *samp, int nr) { - UCB1X00_TS_EVENT ucb1x00_evt; - int ret; + UCB1X00_TS_EVENT ucb1x00_evt; - ret = read(ts->fd, &ucb1x00_evt, sizeof(ucb1x00_evt)); - if (ret > 0) { - samp->x = ucb1x00_evt.x; - samp->y = ucb1x00_evt.y; - samp->pressure = ucb1x00_evt.pressure; - samp->tv.tv_usec = ucb1x00_evt.stamp.tv_usec; - samp->tv.tv_sec = ucb1x00_evt.stamp.tv_sec; - ret = 1; - } else - ret = -1; + if (read(ts->fd, &ucb1x00_evt, sizeof(UCB1X00_TS_EVENT)) == sizeof(UCB1X00_TS_EVENT)) { + samp->x = ucb1x00_evt.x; + samp->y = ucb1x00_evt.y; + samp->pressure = ucb1x00_evt.pressure; + return 1; + } else { + return -1; + } - return ret; } @@ -125,92 +227,203 @@ * pthres ******************************/ -typedef struct tslib_pthres { - unsigned int pmin; - unsigned int pmax; -} TSLIB_PTHRES; +//DKS - don't need these +//typedef struct tslib_pthres { +// unsigned int pmin; +// unsigned int pmax; +//} TSLIB_PTHRES; +// +//TSLIB_PTHRES pthres_dev; +// +//int threshold_vars(char *str, void *data) +//{ +// unsigned long v; +// int err = errno; +// +// v = strtoul(str, NULL, 0); +// if (v == ULONG_MAX && errno == ERANGE) +// return -1; +// errno = err; +// switch ((int)data) { +// case 0: +// pthres_dev.pmin = v; +// break; +// case 1: +// pthres_dev.pmax = v; +// break; +// default: +// return -1; +// } +// return 0; +//} -TSLIB_PTHRES pthres_dev; +//DKS - don't need this +//static const TSLIB_VARS pthres_vars[] = { +// {"pmin", (void *)0, threshold_vars}, +// {"pmax", (void *)1, threshold_vars} +//}; -int threshold_vars(char *str, void *data) -{ - unsigned long v; - int err = errno; +//DKS - don't need this +//#define NR_PTHRES_VARS (sizeof(pthres_vars) / sizeof(pthres_vars[0])) - v = strtoul(str, NULL, 0); - if (v == ULONG_MAX && errno == ERANGE) - return -1; - errno = err; - switch ((int)data) { - case 0: - pthres_dev.pmin = v; - break; - case 1: - pthres_dev.pmax = v; - break; - default: - return -1; - } - return 0; -} -static const TSLIB_VARS pthres_vars[] = { - {"pmin", (void *)0, threshold_vars}, - {"pmax", (void *)1, threshold_vars} -}; +//DKS - no idea why we might still need this +//int pthres_init(const char *params) +//{ +// int ret = 0; +// +// pthres_dev.pmin = 1; +// pthres_dev.pmax = INT_MAX; +// if (tslib_parse_vars(pthres_vars, NR_PTHRES_VARS, params)) { +// ret = 1; +// } +// +// return ret; +//} -#define NR_PTHRES_VARS (sizeof(pthres_vars) / sizeof(pthres_vars[0])) - - -int pthres_init(const char *params) +//DKS ok, there is a bad pointer dereference in TS_SAMPLE below, gonna copy and fix it. +//int pthres_read(TSDEV *ts, TS_SAMPLE *samp) +//{ +//#ifdef DKS_DEBUG +// //DKS - continuously update this to current global variable value, so programs can +// // tweak it real-time +// pthres_dev.pmin = tslib_pmin; +//#endif +// +// int ret; +// static int xsave = 0, ysave = 0; +// static int press = 0; +// +// ret = ucb1x00_read(ts, samp); +// if (ret >= 0) { +// TS_SAMPLE *s; +// +// if (s->pressure < pthres_dev.pmin) { +// if (press != 0) { +// press = 0; +// s->pressure = 0; +// s->x = xsave; +// s->y = ysave; +// ret = 1; +// } else +// ret = 0; +// } else { +// if (s->pressure > pthres_dev.pmax) +// ret = 0; +// else { +// press = 1; +// xsave = s->x; +// ysave = s->y; +// ret = 1; +// } +// } +// } +// +// return ret; +//} +//int pthres_read(TSDEV *ts, TS_SAMPLE *samp) +#define MINPRESSURE 35000 // Accepting pressures below this on the GP2X F200 leads to + // cursor jumping on taps. +static inline int pthres_read(TSDEV *ts, TS_SAMPLE *samp, int nr) { - int ret = 0; - - pthres_dev.pmin = 1; - pthres_dev.pmax = INT_MAX; - if (tslib_parse_vars(pthres_vars, NR_PTHRES_VARS, params)) { - ret = 1; - } - - return ret; -} - - -int pthres_read(TSDEV *ts, TS_SAMPLE *samp) -{ int ret; static int xsave = 0, ysave = 0; static int press = 0; - ret = ucb1x00_read(ts, samp); - if (ret >= 0) { - TS_SAMPLE *s; - - if (s->pressure < pthres_dev.pmin) { - if (press != 0) { - press = 0; - s->pressure = 0; - s->x = xsave; - s->y = ysave; - ret = 1; - } else - ret = 0; - } else { - if (s->pressure > pthres_dev.pmax) - ret = 0; - else { - press = 1; - xsave = s->x; - ysave = s->y; - ret = 1; - } - } + ret = ucb1x00_read(ts, samp,1); + if (ret >= 0) + { + if (samp->pressure < MINPRESSURE) + { + if (press != 0) { + press = 0; + samp->pressure = 0; + samp->x = xsave; + samp->y = ysave; + ret = 1; + } else { + ret = 0; + } + } else { + press = 1; + xsave = samp->x; + ysave = samp->y; + ret = 1; + } } return ret; } +//DKS - known working copy of multiple-sample version, but changing back to 1-sample for now +//#define MINPRESSURE 35000 //DKS - for the GP2X, reading values below this results in +// // tapping inaccuracies +////static int +//static inline int +////pthres_read(struct tslib_module_info *info, struct ts_sample *samp, int nr) +//pthres_read(TSDEV *ts, TS_SAMPLE *samp, int nr) +//{ +//// struct tslib_pthres *p = (struct tslib_pthres *)info; +// int ret; +// static int xsave = 0, ysave = 0; +// static int press = 0; +// +//// ret = info->next->ops->read(info->next, samp, nr); +// ret = ucb1x00_read(ts, samp, nr); +// if (ret >= 0) { +// int nr = 0, i; +// struct ts_sample *s; +// +// for (s = samp, i = 0; i < ret; i++, s++) { +//// if (s->pressure < p->pmin) { +// if (s->pressure < MINPRESSURE) { +// if (press != 0) { +// /* release */ +// press = 0; +// s->pressure = 0; +// s->x = xsave; +// s->y = ysave; +// } else { +// /* release with no press, outside bounds, dropping */ +// int left = ret - nr - 1; +// if (left > 0) { +// memmove(s, s + 1, left * sizeof(struct ts_sample)); +// s--; +// continue; +// } +// break; +// } +// } else { +////DKS - on the GP2X F200, we don't worry about pressure maximums +//// if (s->pressure > p->pmax) { +//// /* pressure outside bounds, dropping */ +//// int left = ret - nr - 1; +//// if (left > 0) { +//// memmove(s, s + 1, left * sizeof(struct ts_sample)); +//// s--; +//// continue; +//// } +//// break; +//// } +// /* press */ +// press = 1; +// xsave = s->x; +// ysave = s->y; +// } +// nr++; +// } +// return nr; +// } +// return ret; +//} +//DKS - no idea why we might need this still +//static int pthres_fini(struct tslib_module_info *info) +//{ +// free(info); +// return 0; +//} + /****************************** * variance ******************************/ @@ -263,64 +476,86 @@ if (tslib_parse_vars(variance_vars, NR_VAR_VARS, params)) { ret = 1; } - variance_dev.delta = sqr(variance_dev.delta); +// variance_dev.delta = sqr(variance_dev.delta); + variance_dev.delta = SQR(variance_dev.delta); return ret; } -static int variance_read(TSDEV *ts, TS_SAMPLE *samp) +//DKS - added parameter, flush_history, that gets assigned to 1 if a fast movement is +// detected.. this is so the averaging algorithm will flush its history if +// enough of them are detected +static inline int variance_read(TSDEV *ts, TS_SAMPLE *samp, int nr, int *flush_history) { - TS_SAMPLE cur; - int count = 0, dist; + struct ts_sample cur; + int count = 0, dist; - while (count < 1) { - if (variance_dev.flags & VAR_SUBMITNOISE) { - cur = variance_dev.noise; - variance_dev.flags &= ~VAR_SUBMITNOISE; - } else { - if (pthres_read(ts, &cur) < 1) - return count; - } - - if (cur.pressure == 0) { - if (variance_dev.flags & VAR_PENDOWN) { - variance_dev.flags |= VAR_SUBMITNOISE; - variance_dev.noise = cur; - } - variance_dev.flags &= ~(VAR_PENDOWN | VAR_NOISEVALID | VAR_LASTVALID); - goto acceptsample; - } else - variance_dev.flags |= VAR_PENDOWN; + while (count < nr) { + if (variance_dev.flags & VAR_SUBMITNOISE) { + cur = variance_dev.noise; + variance_dev.flags &= ~VAR_SUBMITNOISE; + } else { + if (pthres_read(ts, &cur, 1) < 1) + return count; + } - if (!(variance_dev.flags & VAR_LASTVALID)) { - variance_dev.last = cur; - variance_dev.flags |= VAR_LASTVALID; - continue; - } + if (cur.pressure == 0) { + /* Flush the queue immediately when the pen is just + * released, otherwise the previous layer will + * get the pen up notification too late. This + * will happen if info->next->ops->read() blocks. + */ + if (variance_dev.flags & VAR_PENDOWN) { + variance_dev.flags |= VAR_SUBMITNOISE; + variance_dev.noise = cur; + } + /* Reset the state machine on pen up events. */ + variance_dev.flags &= ~(VAR_PENDOWN | VAR_NOISEVALID | VAR_LASTVALID); + goto acceptsample; + } else + variance_dev.flags |= VAR_PENDOWN; - if (variance_dev.flags & VAR_PENDOWN) { - dist = sqr(cur.x - variance_dev.last.x) + - sqr(cur.y - variance_dev.last.y); + if (!(variance_dev.flags & VAR_LASTVALID)) { + variance_dev.last = cur; + variance_dev.flags |= VAR_LASTVALID; + continue; + } - if (dist > variance_dev.delta) { - if (variance_dev.flags & VAR_NOISEVALID) { - samp[count++] = variance_dev.last = variance_dev.noise; - variance_dev.flags = (variance_dev.flags & ~VAR_NOISEVALID) | - VAR_SUBMITNOISE; - } else - variance_dev.flags |= VAR_NOISEVALID; + if (variance_dev.flags & VAR_PENDOWN) { + /* Compute the distance between last sample and current */ + dist = SQR (cur.x - variance_dev.last.x) + + SQR (cur.y - variance_dev.last.y); - variance_dev.noise = cur; - continue; - } else - variance_dev.flags &= ~VAR_NOISEVALID; - } - acceptsample: - samp[count++] = variance_dev.last; - variance_dev.last = cur; - } + if (dist > variance_dev.delta) { + /* Do we suspect the previous sample was a noise? */ + if (variance_dev.flags & VAR_NOISEVALID) { + /* Two "noises": it's just a quick pen movement */ + samp [count++] = variance_dev.last = variance_dev.noise; + variance_dev.flags = (variance_dev.flags & ~VAR_NOISEVALID) | + VAR_SUBMITNOISE; - return count; + //DKS - flush sample history in averaging module + *flush_history = 1; + } else + variance_dev.flags |= VAR_NOISEVALID; + + /* The pen jumped too far, maybe it's a noise ... */ + variance_dev.noise = cur; + continue; + } else + variance_dev.flags &= ~VAR_NOISEVALID; + } + +acceptsample: +//#ifdef DEBUG +// fprintf(stderr,"VARIANCE----------------> %d %d %d\n", +// var->last.x, var->last.y, var->last.pressure); +//#endif + samp [count++] = variance_dev.last; + variance_dev.last = cur; + } + + return count; } @@ -328,133 +563,365 @@ * dejitter ******************************/ -#define NR_SAMPHISTLEN 4 -static const unsigned char weight[NR_SAMPHISTLEN - 1][NR_SAMPHISTLEN + 1] = - { - {5, 3, 0, 0, 3}, - {8, 5, 3, 0, 4}, - {6, 4, 3, 3, 4} - }; +//#define NR_SAMPHISTLEN 4 +//static const unsigned char weight[NR_SAMPHISTLEN - 1][NR_SAMPHISTLEN + 1] = +// { +// // DKS - experiment.. the last of each row is the number 2^x that we should divide by, +// // the first four numbers in each row should add up to 2^x +//// {5, 3, 0, 0, 3}, +//// {8, 5, 3, 0, 4}, +//// {6, 4, 3, 3, 4} +// {1, 3, 2, 2, 3}, +// {2, 6, 4, 4, 4}, +// {6, 4, 3, 3, 4} +// }; +// +//typedef struct ts_hist { +// int x; +// int y; +// unsigned int p; +//} TS_HIST; +// +//typedef struct tslib_dejitter { +// int delta; +// int x; +// int y; +// int down; +// int nr; +// int head; +// TS_HIST hist[NR_SAMPHISTLEN]; +//} TSLIB_DEJITTER; +// +//TSLIB_DEJITTER dejitter_dev; +// +//static int dejitter_limit(char *str, void *data) +//{ +// unsigned long v; +// int err = errno; +// +// v = strtoul(str, NULL, 0); +// if (v == ULONG_MAX && errno == ERANGE) +// return -1; +// errno = err; +// switch ((int)data) { +// case 1: +// dejitter_dev.delta = v; +// break; +// default: +// return -1; +// } +// return 0; +//} +// +//static const TSLIB_VARS dejitter_vars[] = { +// {"delta", (void *)1, dejitter_limit} +//}; +// +//#define NR_DEJITTER_VARS (sizeof(dejitter_vars) / sizeof(dejitter_vars[0])) -typedef struct ts_hist { - int x; - int y; - unsigned int p; -} TS_HIST; +//DKS - changing to use SQR macro, not that it matters here +//int dejitter_init(const char *params) +//{ +// int ret = 0; +// +// bzero(&dejitter_dev, sizeof(dejitter_dev)); +// dejitter_dev.delta = 100; +// dejitter_dev.head = 0; +// if (tslib_parse_vars(dejitter_vars, NR_DEJITTER_VARS, params)) { +// ret = 1; +// } +// dejitter_dev.delta = sqr(dejitter_dev.delta); +// +// return ret; +//} +//int dejitter_init(const char *params) +//{ +// int ret = 0; +// +// bzero(&dejitter_dev, sizeof(dejitter_dev)); +// dejitter_dev.delta = 100; +// dejitter_dev.head = 0; +// if (tslib_parse_vars(dejitter_vars, NR_DEJITTER_VARS, params)) { +// ret = 1; +// } +//// dejitter_dev.delta = sqr(dejitter_dev.delta); +// dejitter_dev.delta = SQR(dejitter_dev.delta); +// +// return ret; +//} -typedef struct tslib_dejitter { - int delta; - int x; - int y; - int down; - int nr; - int head; - TS_HIST hist[NR_SAMPHISTLEN]; -} TSLIB_DEJITTER; +//static void average(TS_SAMPLE *samp) +//{ +// const unsigned char *w; +// int sn = dejitter_dev.head; +// int i, x = 0, y = 0; +// unsigned int p = 0; +// +// w = weight[dejitter_dev.nr - 2]; +// +// for (i = 0; i < dejitter_dev.nr; i++) { +// x += dejitter_dev.hist[sn].x * w[i]; +// y += dejitter_dev.hist[sn].y * w[i]; +// p += dejitter_dev.hist[sn].p * w[i]; +// sn = (sn - 1) & (NR_SAMPHISTLEN - 1); +// } +// +// samp->x = x >> w[NR_SAMPHISTLEN]; +// samp->y = y >> w[NR_SAMPHISTLEN]; +// samp->pressure = p >> w[NR_SAMPHISTLEN]; +//} +// +//static int dejitter_read(TSDEV *ts, TS_SAMPLE *samp) +//{ +//#ifdef DKS_DEBUG +// dejitter_dev.delta = tslib_dejitter; +// if (tslib_skipdejitter) { +// return (variance_read(ts, samp)); +// } +//#endif +// TS_SAMPLE *s; +// int count = 0, ret; +// +// ret = variance_read(ts, samp); +// for (s = samp; ret > 0; s++, ret--) { +// if (s->pressure == 0) { +// dejitter_dev.nr = 0; +// samp[count++] = *s; +// continue; +// } +// +// if (dejitter_dev.nr) { +// int prev = (dejitter_dev.head - 1) & (NR_SAMPHISTLEN - 1); +// if (sqr(s->x - dejitter_dev.hist[prev].x) + +// sqr(s->y - dejitter_dev.hist[prev].y) > dejitter_dev.delta) +// dejitter_dev.nr = 0; +// } +// +// dejitter_dev.hist[dejitter_dev.head].x = s->x; +// dejitter_dev.hist[dejitter_dev.head].y = s->y; +// dejitter_dev.hist[dejitter_dev.head].p = s->pressure; +// if (dejitter_dev.nr < NR_SAMPHISTLEN) +// dejitter_dev.nr++; +// +// if (dejitter_dev.nr == 1) +// samp[count] = *s; +// else { +// average(samp + count); +// samp[count].tv = s->tv; +// } +// count++; +// dejitter_dev.head = (dejitter_dev.head + 1) & (NR_SAMPHISTLEN - 1); +// } +// +// return count; +//} -TSLIB_DEJITTER dejitter_dev; +//DKS - gonna do my own de-jitterer that can handle high noise level of the GP2X +typedef struct { + int x; + int y; +} XYHIST; -static int dejitter_limit(char *str, void *data) +#define XYHISTLENGTH 15 +XYHIST average_xyhist[XYHISTLENGTH]; + +static inline int average_read(TSDEV *ts, TS_SAMPLE *samp, int nr) { - unsigned long v; - int err = errno; - v = strtoul(str, NULL, 0); - if (v == ULONG_MAX && errno == ERANGE) - return -1; - errno = err; - switch ((int)data) { - case 1: - dejitter_dev.delta = v; - break; - default: - return -1; - } - return 0; -} + int ret = 0; + int newx, newy; -static const TSLIB_VARS dejitter_vars[] = { - {"delta", (void *)1, dejitter_limit} -}; + int flush_history = 0; // variance module will tell us if we are getting fast movements + static int flush_count = 0; // when we get enough fast movements, flush the history + static int xyhist_full = 0; //DKS - when we have a full four samples, this is 1 + static int xyhist_counter = 0; // DKS - how many entires in history? + static int xyhist_index = 0; //xyhist_index - 1 is index to most-recent sample in array -#define NR_DEJITTER_VARS (sizeof(dejitter_vars) / sizeof(dejitter_vars[0])) + ret = variance_read(ts, samp, nr, &flush_history); + flush_count += flush_history; + struct ts_sample *s; + s = samp + (ret - 1); // this module can handle more than one sample, but the gp2x + // touchscreen driver only ever provides 1 sample each read so + // it's not really necessary but not really inefficient either way + int i; -int dejitter_init(const char *params) -{ - int ret = 0; + for( i = ret; i > 0; i--, s--) { + if ((s->pressure == 0) || (flush_count > 7)) { + // when pen is lifted, or a fast movement is detected, flush stored history + xyhist_full = 0; + xyhist_counter = 0; + xyhist_index = 0; + flush_count = 0; + } else { + average_xyhist[xyhist_index].x = s->x; + average_xyhist[xyhist_index].y = s->y; + + xyhist_counter++; + if (xyhist_counter == XYHISTLENGTH) { + xyhist_full = 1; + } - bzero(&dejitter_dev, sizeof(dejitter_dev)); - dejitter_dev.delta = 100; - dejitter_dev.head = 0; - if (tslib_parse_vars(dejitter_vars, NR_DEJITTER_VARS, params)) { - ret = 1; - } - dejitter_dev.delta = sqr(dejitter_dev.delta); + xyhist_index++; + if (xyhist_index == XYHISTLENGTH) { + xyhist_index = 0; // point back at beginning since array is full + } - return ret; -} + if (xyhist_full) { + //we have a full sample history, we can average this sample with the others -static void average(TS_SAMPLE *samp) -{ - const unsigned char *w; - int sn = dejitter_dev.head; - int i, x = 0, y = 0; - unsigned int p = 0; + int j = xyhist_index - 1; // point j to most recent entry in history + if (j < 0) { + j = XYHISTLENGTH - 1; + } - w = weight[dejitter_dev.nr - 2]; + // 15-sample weighted average, pyramid, provides great smoothing for precise + // operations like menus and drawing - for (i = 0; i < dejitter_dev.nr; i++) { - x += dejitter_dev.hist[sn].x * w[i]; - y += dejitter_dev.hist[sn].y * w[i]; - p += dejitter_dev.hist[sn].p * w[i]; - sn = (sn - 1) & (NR_SAMPHISTLEN - 1); - } + // sample 1 has weight of * 1 + newx = average_xyhist[j].x; + newy = average_xyhist[j].y; - samp->x = x >> w[NR_SAMPHISTLEN]; - samp->y = y >> w[NR_SAMPHISTLEN]; - samp->pressure = p >> w[NR_SAMPHISTLEN]; -} + j--; + if (j < 0) { + j = XYHISTLENGTH - 1; + } + + // sample 2 has weight of * 2 + newx += average_xyhist[j].x << 1; + newy += average_xyhist[j].y << 1; -static int dejitter_read(TSDEV *ts, TS_SAMPLE *samp) -{ - TS_SAMPLE *s; - int count = 0, ret; + j--; + if (j < 0) { + j = XYHISTLENGTH - 1; + } - ret = variance_read(ts, samp); - for (s = samp; ret > 0; s++, ret--) { - if (s->pressure == 0) { - dejitter_dev.nr = 0; - samp[count++] = *s; - continue; - } + // sample 3 has weight of * 3 + newx += (average_xyhist[j].x << 1) + average_xyhist[j].x; + newy += (average_xyhist[j].y << 1) + average_xyhist[j].y; - if (dejitter_dev.nr) { - int prev = (dejitter_dev.head - 1) & (NR_SAMPHISTLEN - 1); - if (sqr(s->x - dejitter_dev.hist[prev].x) + - sqr(s->y - dejitter_dev.hist[prev].y) > dejitter_dev.delta) - dejitter_dev.nr = 0; - } + j--; + if (j < 0) { + j = XYHISTLENGTH - 1; + } - dejitter_dev.hist[dejitter_dev.head].x = s->x; - dejitter_dev.hist[dejitter_dev.head].y = s->y; - dejitter_dev.hist[dejitter_dev.head].p = s->pressure; - if (dejitter_dev.nr < NR_SAMPHISTLEN) - dejitter_dev.nr++; + // sample 4 has weight of * 4 + newx += average_xyhist[j].x << 2; + newy += average_xyhist[j].y << 2; - if (dejitter_dev.nr == 1) - samp[count] = *s; - else { - average(samp + count); - samp[count].tv = s->tv; - } - count++; - dejitter_dev.head = (dejitter_dev.head + 1) & (NR_SAMPHISTLEN - 1); - } + j--; + if (j < 0) { + j = XYHISTLENGTH - 1; + } - return count; + // sample 5 has weight of * 5 + newx += (average_xyhist[j].x << 2) + average_xyhist[j].x; + newy += (average_xyhist[j].y << 2) + average_xyhist[j].y; + + j--; + if (j < 0) { + j = XYHISTLENGTH - 1; + } + + // sample 6 has weight of * 6 + newx += (average_xyhist[j].x << 2) + (average_xyhist[j].x << 1); + newy += (average_xyhist[j].y << 2) + (average_xyhist[j].y << 1); + + j--; + if (j < 0) { + j = XYHISTLENGTH - 1; + } + + // sample 7 has weight of * 7 + newx += (average_xyhist[j].x << 3) - average_xyhist[j].x; + newy += (average_xyhist[j].y << 3) - average_xyhist[j].y; + + j--; + if (j < 0) { + j = XYHISTLENGTH - 1; + } + + // sample 8, middle sample, has weight of * 8 + newx += (average_xyhist[j].x << 3); + newy += (average_xyhist[j].y << 3); + + j--; + if (j < 0) { + j = XYHISTLENGTH - 1; + } + + // sample 9 has weight of * 7 + newx += (average_xyhist[j].x << 3) - average_xyhist[j].x; + newy += (average_xyhist[j].y << 3) - average_xyhist[j].y; + + j--; + if (j < 0) { + j = XYHISTLENGTH - 1; + } + + // sample 10 has weight of * 6 + newx += (average_xyhist[j].x << 2) + (average_xyhist[j].x << 1); + newy += (average_xyhist[j].y << 2) + (average_xyhist[j].y << 1); + + j--; + if (j < 0) { + j = XYHISTLENGTH - 1; + } + + // sample 11 has weight of * 5 + newx += (average_xyhist[j].x << 2) + average_xyhist[j].x; + newy += (average_xyhist[j].y << 2) + average_xyhist[j].y; + + j--; + if (j < 0) { + j = XYHISTLENGTH - 1; + } + + // sample 12 has weight of * 4 + newx += average_xyhist[j].x << 2; + newy += average_xyhist[j].y << 2; + + j--; + if (j < 0) { + j = XYHISTLENGTH - 1; + } + + // sample 13 has weight of * 3 + newx += (average_xyhist[j].x << 1) + average_xyhist[j].x; + newy += (average_xyhist[j].y << 1) + average_xyhist[j].y; + + j--; + if (j < 0) { + j = XYHISTLENGTH - 1; + } + + // sample 14 has weight of * 2 + newx += average_xyhist[j].x << 1; + newy += average_xyhist[j].y << 1; + + j--; + if (j < 0) { + j = XYHISTLENGTH - 1; + } + + // sample 15 has weight of * 1 + newx += average_xyhist[j].x; + newy += average_xyhist[j].y; + + j--; + if (j < 0) { + j = XYHISTLENGTH - 1; + } + + // divide results by 64 to provide average + samp->x = newx >> 6; + samp->y = newy >> 6; + } + } + } + + return ret; } - /****************************** * linear ******************************/ @@ -466,18 +933,19 @@ TSLIB_LINEAR linear_dev; -static int linear_xyswap(char *str, void *data) -{ - linear_dev.swap_xy = 1; - return 0; -} +//DKS - don't need this anymore +//static int linear_xyswap(char *str, void *data) +//{ +// linear_dev.swap_xy = 1; +// return 0; +//} -static const TSLIB_VARS linear_vars[] = { - {"xyswap", (void *)1, linear_xyswap} -}; +//DKS - don't need this anymore +//static const TSLIB_VARS linear_vars[] = { +// {"xyswap", (void *)1, linear_xyswap} +//}; +//#define NR_LINEAR_VARS (sizeof(linear_vars) / sizeof(linear_vars[0])) -#define NR_LINEAR_VARS (sizeof(linear_vars) / sizeof(linear_vars[0])) - int linear_init(const char *params) { struct stat sbuf; @@ -496,7 +964,8 @@ linear_dev.a[4] = -4200; linear_dev.a[5] = 16132680; linear_dev.a[6] = 65536; - linear_dev.swap_xy = 0; + // DKS +// linear_dev.swap_xy = 0; if ((calfile = getenv("TSLIB_CALIBFILE")) == NULL) calfile = defaultcalfile; if (stat(calfile, &sbuf) == 0) { @@ -513,55 +982,84 @@ } close(pcal_fd); } - if (tslib_parse_vars(linear_vars, NR_LINEAR_VARS, params)) - ret = -1; + // DKS +// if (tslib_parse_vars(linear_vars, NR_LINEAR_VARS, params)) +// ret = -1; return ret; } -int linear_read(TSDEV *ts, TS_SAMPLE *samp) +//DKS - last known working copy, before conversion to multi-sample +//int linear_read(TSDEV *ts, TS_SAMPLE *samp) +//{ +// int ret; +// int xtemp, ytemp; +// +// //DKS - experimenting with my own filter +//// ret = dejitter_read(ts, samp); +// ret = average_read(ts, samp); +// //DKS - why not try averaging after linear instead of before? +//// ret = variance_read(ts, samp); +// if (ret >= 0) { +// xtemp = samp->x; +// ytemp = samp->y; +// if (linear_dev.a[6] == 65536) { +// samp->x = (linear_dev.a[2] + +// linear_dev.a[0] * xtemp) >> 16; +// samp->y = (linear_dev.a[5] + +// linear_dev.a[4] * ytemp) >> 16; +// } else { +// samp->x = (linear_dev.a[2] + +// linear_dev.a[0] * xtemp) / linear_dev.a[6]; +// samp->y = (linear_dev.a[5] + +// linear_dev.a[4] * ytemp) / linear_dev.a[6]; +// } +// +// //DKS - why was this enabled? I hope this isn't related to the MK2 F200's swapping problem +// +//// if (linear_dev.swap_xy) { +//// int tmp = samp->x; +//// samp->x = samp->y; +//// samp->y = tmp; +//// } +// } +// +// return ret; +//} +static inline int linear_read(TSDEV *ts, TS_SAMPLE *samp, int nr) { - int ret; - int xtemp, ytemp; + int ret; - ret = dejitter_read(ts, samp); - if (ret >= 0) { - xtemp = samp->x; - ytemp = samp->y; - if (linear_dev.a[6] == 65536) { - samp->x = (linear_dev.a[2] + - linear_dev.a[0] * xtemp) >> 16; - samp->y = (linear_dev.a[5] + - linear_dev.a[4] * ytemp) >> 16; - } else { - samp->x = (linear_dev.a[2] + - linear_dev.a[0] * xtemp) / linear_dev.a[6]; - samp->y = (linear_dev.a[5] + - linear_dev.a[4] * ytemp) / linear_dev.a[6]; - } - if (linear_dev.swap_xy) { - int tmp = samp->x; - samp->x = samp->y; - samp->y = tmp; - } - } +//// ret = dejitter_read(ts, samp); + ret = average_read(ts, samp, nr); - return ret; + if (ret > 0) { + if (linear_dev.a[6] == 65536) { + samp->x = (linear_dev.a[2] + + linear_dev.a[0] * samp->x) >> 16; + samp->y = (linear_dev.a[5] + + linear_dev.a[4] * samp->y) >> 16; + } else { + samp->x = (linear_dev.a[2] + + linear_dev.a[0] * samp->x) / linear_dev.a[6]; + samp->y = (linear_dev.a[5] + + linear_dev.a[4] * samp->y) / linear_dev.a[6]; + } + } + + return ret; } - /****************************** * ts_read ******************************/ int ts_read(TSDEV *ts, TS_SAMPLE *samp, int nr) { - int ret; - - ret = linear_read(ts, samp); - - return ret; + // DKS - original line: +// ret = linear_read(ts, samp); + return(linear_read(ts, samp, nr)); } @@ -573,7 +1071,8 @@ static const char *DEFAULT_TSLIB_CONF[] = { "module pthres pmin=1", "module variance delta=30", - "module dejitter delta=100", + // //DKS +// "module dejitter delta=100", "module linear", NULL }; @@ -658,12 +1157,15 @@ { int ret; - if (!strcmp(module, "pthres")) - ret = pthres_init(p); - else if (!strcmp(module, "variance")) + +// if (!strcmp(module, "pthres")) +//DKS - disabled this, no initialization needed +// ret = pthres_init(p); + if (!strcmp(module, "variance")) ret = variance_init(p); - else if (!strcmp(module, "dejitter")) - ret = dejitter_init(p); +// else if (!strcmp(module, "dejitter")) +// DKS - dejitter module disabled +// ret = dejitter_init(p); else if (!strcmp(module, "linear")) ret = linear_init(p); else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <djw...@us...> - 2008-04-21 23:58:22
|
Revision: 307 http://open2x.svn.sourceforge.net/open2x/?rev=307&view=rev Author: djwillis Date: 2008-04-21 03:11:31 -0700 (Mon, 21 Apr 2008) Log Message: ----------- Add TSLIB. Currently not working that well, I just want to get what I have checked in so it does not get lost. Not built by the build scripts currently. Added Paths: ----------- trunk/libs/tslib/ trunk/libs/tslib/.cvsignore trunk/libs/tslib/AUTHORS trunk/libs/tslib/COPYING trunk/libs/tslib/ChangeLog trunk/libs/tslib/INSTALL trunk/libs/tslib/Makefile.am trunk/libs/tslib/NEWS trunk/libs/tslib/README trunk/libs/tslib/acinclude.m4 trunk/libs/tslib/aclocal.m4 trunk/libs/tslib/autogen-clean.sh trunk/libs/tslib/autogen.sh trunk/libs/tslib/autom4te.cache/ trunk/libs/tslib/autom4te.cache/output.0 trunk/libs/tslib/autom4te.cache/output.1 trunk/libs/tslib/autom4te.cache/output.2 trunk/libs/tslib/autom4te.cache/requests trunk/libs/tslib/autom4te.cache/traces.0 trunk/libs/tslib/autom4te.cache/traces.1 trunk/libs/tslib/autom4te.cache/traces.2 trunk/libs/tslib/configure.ac trunk/libs/tslib/depcomp trunk/libs/tslib/etc/ trunk/libs/tslib/etc/.cvsignore trunk/libs/tslib/etc/Makefile.am trunk/libs/tslib/etc/ts.conf trunk/libs/tslib/m4/ trunk/libs/tslib/m4/external/ trunk/libs/tslib/m4/external/PLACEHOLDER trunk/libs/tslib/m4/internal/ trunk/libs/tslib/m4/internal/visibility.m4 trunk/libs/tslib/plugins/ trunk/libs/tslib/plugins/.cvsignore trunk/libs/tslib/plugins/Makefile.am trunk/libs/tslib/plugins/arctic2-raw.c trunk/libs/tslib/plugins/collie-raw.c trunk/libs/tslib/plugins/corgi-raw.c trunk/libs/tslib/plugins/dejitter.c trunk/libs/tslib/plugins/h3600-raw.c trunk/libs/tslib/plugins/input-raw.c trunk/libs/tslib/plugins/linear-h2200.c trunk/libs/tslib/plugins/linear.c trunk/libs/tslib/plugins/mk712-raw.c trunk/libs/tslib/plugins/pthres.c trunk/libs/tslib/plugins/tatung-raw.c trunk/libs/tslib/plugins/ucb1x00-raw.c trunk/libs/tslib/plugins/variance.c trunk/libs/tslib/src/ trunk/libs/tslib/src/.cvsignore trunk/libs/tslib/src/Makefile.am trunk/libs/tslib/src/ts_attach.c trunk/libs/tslib/src/ts_close.c trunk/libs/tslib/src/ts_config.c trunk/libs/tslib/src/ts_error.c trunk/libs/tslib/src/ts_fd.c trunk/libs/tslib/src/ts_load_module.c trunk/libs/tslib/src/ts_open.c trunk/libs/tslib/src/ts_parse_vars.c trunk/libs/tslib/src/ts_read.c trunk/libs/tslib/src/ts_read_raw.c trunk/libs/tslib/src/ts_read_raw_module.c trunk/libs/tslib/src/tslib-filter.h trunk/libs/tslib/src/tslib-private.h trunk/libs/tslib/src/tslib.h trunk/libs/tslib/tests/ trunk/libs/tslib/tests/.cvsignore trunk/libs/tslib/tests/Makefile.am trunk/libs/tslib/tests/fbutils.c trunk/libs/tslib/tests/fbutils.h trunk/libs/tslib/tests/font.h trunk/libs/tslib/tests/font_8x16.c trunk/libs/tslib/tests/font_8x8.c trunk/libs/tslib/tests/testutils.c trunk/libs/tslib/tests/testutils.h trunk/libs/tslib/tests/ts_calibrate.c trunk/libs/tslib/tests/ts_harvest.c trunk/libs/tslib/tests/ts_print.c trunk/libs/tslib/tests/ts_print_raw.c trunk/libs/tslib/tests/ts_test.c trunk/libs/tslib/tslib.pc.in Added: trunk/libs/tslib/.cvsignore =================================================================== --- trunk/libs/tslib/.cvsignore (rev 0) +++ trunk/libs/tslib/.cvsignore 2008-04-21 10:11:31 UTC (rev 307) @@ -0,0 +1,21 @@ +Makefile +Makefile.in +aclocal.m4 +autom4te.cache +config.guess +config.h.in +config.h +config.log +config.status +config.sub +configure +depcomp +install-sh +libtool +ltmain.sh +missing +mkinstalldirs +stamp-h +stamp-h.in +stamp-h1 +*.pc Added: trunk/libs/tslib/AUTHORS =================================================================== --- trunk/libs/tslib/AUTHORS (rev 0) +++ trunk/libs/tslib/AUTHORS 2008-04-21 10:11:31 UTC (rev 307) @@ -0,0 +1,4 @@ +# $Id: AUTHORS,v 1.3 2005/02/26 00:53:48 kergoth Exp $ +Russell King <li...@ar...> +Douglas Lowder <dl...@ea...> +Chris Larson <ke...@ha...> Added: trunk/libs/tslib/COPYING =================================================================== --- trunk/libs/tslib/COPYING (rev 0) +++ trunk/libs/tslib/COPYING 2008-04-21 10:11:31 UTC (rev 307) @@ -0,0 +1,482 @@ + GNU LIBRARY GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1991 Free Software Foundation, Inc. + 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the library GPL. It is + numbered 2 because it goes with version 2 of the ordinary GPL.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Library General Public License, applies to some +specially designated Free Software Foundation software, and to any +other libraries whose authors decide to use it. You can use it for +your libraries, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if +you distribute copies of the library, or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link a program with the library, you must provide +complete object files to the recipients so that they can relink them +with the library, after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + Our method of protecting your rights has two steps: (1) copyright +the library, and (2) offer you this license which gives you legal +permission to copy, distribute and/or modify the library. + + Also, for each distributor's protection, we want to make certain +that everyone understands that there is no warranty for this free +library. If the library is modified by someone else and passed on, we +want its recipients to know that what they have is not the original +version, so that any problems introduced by others will not reflect on +the original authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that companies distributing free +software will individually obtain patent licenses, thus in effect +transforming the program into proprietary software. To prevent this, +we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + + Most GNU software, including some libraries, is covered by the ordinary +GNU General Public License, which was designed for utility programs. This +license, the GNU Library General Public License, applies to certain +designated libraries. This license is quite different from the ordinary +one; be sure to read it in full, and don't assume that anything in it is +the same as in the ordinary license. + + The reason we have a separate public license for some libraries is that +they blur the distinction we usually make between modifying or adding to a +program and simply using it. Linking a program with a library, without +changing the library, is in some sense simply using the library, and is +analogous to running a utility program or application program. However, in +a textual and legal sense, the linked executable is a combined work, a +derivative of the original library, and the ordinary General Public License +treats it as such. + + Because of this blurred distinction, using the ordinary General +Public License for libraries did not effectively promote software +sharing, because most developers did not use the libraries. We +concluded that weaker conditions might promote sharing better. + + However, unrestricted linking of non-free programs would deprive the +users of those programs of all benefit from the free status of the +libraries themselves. This Library General Public License is intended to +permit developers of non-free programs to use free libraries, while +preserving your freedom as a user of such programs to change the free +libraries that are incorporated in them. (We have not seen how to achieve +this as regards changes in header files, but we have achieved it as regards +changes in the actual functions of the Library.) The hope is that this +will lead to faster development of free libraries. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, while the latter only +works together with the library. + + Note that it is possible for a library to be covered by the ordinary +General Public License rather than by this special one. + + GNU LIBRARY GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library which +contains a notice placed by the copyright holder or other authorized +party saying it may be distributed under the terms of this Library +General Public License (also called "this License"). Each licensee is +addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also compile or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + c) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + d) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the source code distributed need not include anything that is normally +distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Library General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + <one line to give the library's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, + MA 02111-1307, USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + <signature of Ty Coon>, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! Added: trunk/libs/tslib/ChangeLog =================================================================== --- trunk/libs/tslib/ChangeLog (rev 0) +++ trunk/libs/tslib/ChangeLog 2008-04-21 10:11:31 UTC (rev 307) @@ -0,0 +1,370 @@ +2006-08-16 Chris Larson <cl...@ke...> + + * plugins/collie.c,plugins/corgi.c: Apply patch from Richard Purdie to + fix the microseconds field of the timeval struct, as it was + inadvertantly holding milliseconds. + +2005-03-01 Chris Larson <ke...@ha...> + + * src/tslib-filter.h: BUGFIX: make the symbol used by the plugins, + tslib_parse_vars, visible. + +2005-02-28 Chris Larson <ke...@ha...> + + * tslib.pc.in: Add pkg-config file for tslib. + * configure.ac, Makefile.am: Create tslib-$LT_RELEASE.pc, and install + it into the correct place. Also change the AC_INIT 'PACKAGE' from + libts to tslib. Bump the LT_REVISION, since libts has changed a fair + bit now, in preparation for the 1.0.0 release. + * .cvsignore: Add *.pc to CVS ignore. + + * m4/internal/visibility.m4, src/Makefile.am, plugins/Makefile.am: + Fixup the visibility macros to set VIS_CFLAGS and VIS_CXXFLAGS, so + we can choose to use the visibility flags for the core lib and + plugins, but not the test apps, as the gains would be nonexistant + there. + +2005-02-25 Chris Larson <ke...@ha...> + + * AUTHORS: Add self to AUTHORS file. + * configure.in: Deleted. + * configure.ac: Bump version passed to AC_INIT, set my email address + as the contact point for the time being. + +2005-02-16 Michael Opdenacker <mic...@ha...> + + * configure.ac, plugins/Makefile.am, plugins/linear-h2200.c: Add + tslib plugin to linearly scale touchscreen values for the HP iPAQ + h22xx. + +2004-12-14 Chris Larson <ke...@ha...> + + * Files all over the tree: Apply patch to add support for using + the new gcc symbol visibility features that are available + in gcc 4.0 (and patched 3.4.x). Also import a few m4 macros + and general buildsystem updates to facilitate automatic use of + gcc visibility if it's supported. + +2004-11-22 Holger Freyther <ze...@ha...> + + * plugins/dejitter.c: Sometimes after ts_open/ts_close/ts_open on + the first sample(s) dejitter will crash. memset the tslib_dejitter + structure with zeros so djt->nr's value isn't undefined. + +2004-10-19 Chris Larson <ke...@ha...> + + * Files all over the tree: Fixed up a bunch of compile warnings, + at least some of which actually did cause breakage for the user. + +2004-07-08 Chris Larson <ke...@ha...> + + * plugins/input-raw.c: As EV_SYN can be checked for at runtime rather + than build time, #define it when compiling against kernel headers + that do not define it (2.4). + +2004-01-26 Andrew Zabolotny <za...@ho...> + + * README: Updated documentation on module parameters. + * plugins/linear.c: Removed the bogus noxyswap parameter. + +2004-06-14 Chris Larson <ke...@ha...> + + * src/ts_read_raw.c: Fix bug hit by me and identified by Phil + related to the way we call the raw read functions. + * src/input-raw.c (ts_input_read): Rename function, call out + check_fd to confirm sanity of this inputdevice, make EV_SYN + decision at runtime. + * src/input-raw.c (check_fd): Rework a bit, and check for EV_SYN + event availability. + * src/input-raw.c (mod_init): Switch from static to vars in our + malloced tslib_module_info based structure. + * src/input-raw.c (ts_input_fini): New function. Free malloced structure. + * etc/ts.conf: Add commented module_raw entry for 'input'. + * src/ts_config.c: Abort and warn when no raw modules were loaded. + * plugins/*.c: Use C99 initializers. + +2004-06-11 Philip Blundell <ph...@gn...> + + * plugins/variance.c (variance_read): Also clear VAR_LASTVALID on + pen up events. + +2004-06-09 Chris Larson <ke...@ha...> + + * plugins/Makefile.am: Ensure plugins get installed. + * plugins/input-raw.c: Watch for a BTN_TOUCH input key event, + to use it as an indication of pen release. + +2004-06-09 Glenn McGrath <gl...@hy...> + * input-raw.c: + - Rewrite !EV_SYN section. + - Never return -1, causes cursor flicker in kdrive xserver. + - Handle partial reads without throwing out data. + - Run through indent. + - Simplify. + * ts_config.c: + - Optimize to save some space. + - Fix long line check, they dont always end '\n'. + - Report the name of modules that wont load. + * configure.ac: + - Allow default plugindir to be set by configure. + +2004-06-08 Philip Blundell <ph...@gn...> + + Patch from Glenn McGrath <bu...@ii...> + * configure.in: Renamed to ... + * configure.ac: ... this. Use AM_CONDITIONAL to enable plugins. + Fix confusion between input and arctic2 drivers. Install plugins + into ${libdir}/ts, not ${libdir}/ts/plugins. + * plugins/Makefile.am: Keep in step with AM_CONDITIONAL changes. + +2004-06-07 Philip Blundell <ph...@gn...> + + * plugins/input-raw.c: Fix compilation errors. + * src/tslib-private.h: Remove #ifdef USE_INPUT_API block. + * configure.in: Enable input plugin if requested. + +2004-06-06 Philip Blundell <ph...@gn...> + + * tests/Makefile.am (ts_test_SOURCES, ts_calibrate_SOURCES, + ts_harvest_SOURCES): Add fbutils.h and font.h. + (ts_calibrate_SOURCES, ts_harvest_SOURCES): Add testutils.h as + well. + + * src/ts_open.c (ts_open): Remove INPUT_API stuff. + * src/ts_read_raw_module.c: Deleted. + * src/Makefile.am (libts_la_SOURCES): Remove ts_read_raw_module.c. + * plugins/input-raw.c: New file. + * plugins/Makefile.am (EXTRA_LTLIBRARIES): Add input.la. + * configure.in: Remove --enable-input-api option. + (PLUGIN_DIR): Place under ${libdir}, not ${datadir}. + +2004-06-04 Philip Blundell <ph...@gn...> + + * src/ts_config.c (ts_config): Increase size of line buffer. + + * plugins/variance.c (variance_read): Correct test of return value + from ->read method. + +2004-05-10 Michael Opdenacker <mic...@ha...> + + * src/tslib.h: removed the obsolete comment that ts_fd is not implemented yet + + * tests/testutils.c: new file, containing the getxy function, + previously in tests/ts_calibrate.c + + * tests/testutils.h: corresponding include file + + * tests/ts_calibrate.c: moved getxy, sort_by_x and sort_by_y functions + to tests/testutils.c + + * tests/ts_harvest.c: new program to harvest hundreds + of raw coordinates for non linear touchscreens + (as found in the h2200 devices, for example) + + * tests/Makefile.am: added ts_harvest.c and testutils.c + + * tests/ts_test.c: now tells the name of the touchscreen device file + when it fails to open it. + + * src/ts_config.c: added missing \n at the end of + "option `%s' not recognised" and "line too long" error messages. + Also made the error message clearer by giving the config file + name and telling that the number is a line number. + + * src/ts_config.c: fixed the code testing blank lines + which didn't work for me. + +2004-01-29 Chris Larson <ke...@ha...> + + * Make all the actual hardware access methods (minus input) individual + module_raw tslib modules. Remove reference to TSLIB_TSEVENTTYPE from + README, and update etc/ts.conf to include commented out entries for + the various module_raw modules. + +2004-01-26 Andrew Zabolotny <za...@ho...> + + * src/ts_read_raw_module.c: Added EV_SYN support for kernels >2.5.x. + This makes the touchscreen event boundary detection 100% correct + and removes the need for tricky assumptions tslib had to do until + now. If the EV_SYN macro is not defined, the old algorithm is + enabled instead. + + * plugins/variance.c: Rewrote almost from scratch the variance filter. + The old variance filter made the input very sluggish because it + lets out only one of every four input samples. Now it generates + approximatively 1:1 output, except that it filters out what it + thinks are "noise" samples. + + * plugins/dejitter.c: Rewrote almost from scratch the dejitter filter. + Now it just applies a weighted smoothing algorithm with most weight + in most recent samples; this leaves touchscreen input responsive and + still smooths out jitter. + + * tests/fbutilc.c: Improved a lot; added line drawing, rectangle + drawing and filled rectangle drawing, support for up to 256 + user-defined colors. + + * tests/ts_test.c, tests/ts_calibrate.c: Update to take advantage of + the improved functionality of fbutils.c. The ts_test tool now has + a "drag" (old behaviour) and "draw" mode (the pen leaves a trace on + the screen). + +2003-11-01 Chris Larson <ke...@ha...> + + * plugins/pthres.c, plugins/Makefile.am, configure.in: Added pressure + threshold tslib plugin, which is used to ensure that the release + event's pressure is 0. + + * plugins/variance.c, plugins/dejitter.c: Removed pressure threshold + handling from plugins, now that pthres is handling it. + + * etc/ts.conf: Updated default ts.conf per changes due to pthres. + +2003-08-05 Chris Larson <ke...@ha...> + + * Updated README documentation. Added information on what the various + TSLIB environment variables do, and information on a guideline for + tslib filter module creators. + +2003-07-31 Chris Larson <ke...@ha...> + + * Corrected some issues with automake usage, which included changing + references of CFLAGS to AM_CFLAGS where necessary. + +2003-03-12 Chris Larson <ke...@ha...> + + * Add a raw module linked list, connected to the primary list, to + facilitate tslib modules affecting ts_read_raw behavior. + +2003-03-04 Douglas Lowder <dl...@ea...> + + * Added support for COLLIE and CORGI event types (thanks to Chris Larson + of the OpenZaurus project) + +2003-03-03 Douglas Lowder <dl...@ea...> + + * Fixed segfault bug in src/ts_parse_args.c + +2002-11-08 Douglas Lowder <dl...@ea...> + + * Added patch from Scott Anderson to improve tests/ts_calibrate.c by taking + median of multiple samples for each point. + +2002-08-29 Douglas Lowder <dl...@ea...> + + * Added tests/ts_print_raw.c to print raw uncalibrated touchscreen events + (useful for debugging) + +2002-07-11 Douglas Lowder <dl...@ea...> + + * Added code in src/ts_read_raw.c to handle reading events from the mk712 + touchscreen driver on the Hitachi Webpad. + + * Fixed a bug in plugins/linear.c (incorrect default calibration in + absence of /etc/pointercal) + +2002-07-10 Douglas Lowder <dl...@ea...> + + * Added a patch by Holger Schurig <h.s...@mn...> to fix + issues encountered on an Accelent PXA250 board. The patch is against + tests/ts_calibrate.c. Among other things, it removes the extra event + that was being read before the first crosshair is painted. + + * Modified the code in plugins/dejitter.c to guarantee that the "release" + touchscreen event (event with pressure=0 that occurs when the pointer is + lifted from the screen) has the same xy position as the preceding event. + This eliminates the cursor "jumping" that can occur otherwise. + + * Fixed a bug in src/ts_read_raw.c that caused segfaults if TSLIB_TSEVENTTYPE + was not defined in the environment. + +2002-07-05 Douglas Lowder <dl...@ea...> + + * libts.so now handles both UCB1x00 and H3600 type touchscreen events. Default + is UCB1x00; H3600 is selected by setting environment variable + TSLIB_TSEVENTTYPE to the value "H3600". + + * With the above change, generation of libtsipaq.so is no longer required, + and it has been removed. + +2002-07-03 Douglas Lowder <dl...@ea...> + + * Added back the code to open the virtual console (works if device file chosen + correctly). + + * Made the console device and framebuffer device configurable for ts_calibrate + and ts_test: new environment variables defined. + TSLIB_FBDEVICE (defaults to /dev/fb0) + TSLIB_CONSOLEDEVICE (defaults to /dev/tty) + + On a system using devfs, the above should be set to /dev/fb/0 and /dev/vc/, + respectively. + +2002-07-01 Douglas Lowder <dl...@ea...> + + * Fixes to make this code work better on targets with framebuffers that have + more than 8 bits per pixel (changes to tests/fbutils.c): + * Removed the code that attempts to change colormap + * Temporarily commented out the code that opens /dev/tty1 (does not work on all targets) + + * Fixed the test program so that the crosshair is drawn XORed with the text on the screen, + so the text is not corrupted when the crosshair moves over it. (tests/fbutils.c) + + * Made the code much more configurable by adding checks for environment variables: + TSLIB_CALIBFILE -- location of calibration file for linear plugin (default: /etc/pointercal) + TSLIB_CONFFILE -- location of configuration file (default: /usr/local/etc/ts.conf) + TSLIB_PLUGINDIR -- location of plugins (default: /usr/local/share/ts/plugins) + TSLIB_TSDEVICE -- Name of touchscreen device file if not using input API (default: /dev/touchscreen/ucb1x00) + + * Added new file, src/ts_read_raw_ipaq.c, to make code work with the h3600_ts driver + on the Compaq iPAQ. This creates a new library, libtsipaq.so, that should replace + the default libts.so if using this code on an iPAQ. + +2002-06-19 Douglas Lowder <dl...@ea...> + + * Fixed a problem that caused tslib_parse_vars() (src/ts_parse_vars.c) to not + read parameters correctly from the ts.conf file. + + * Made modifications to simplify and improve the performance of the dejitter filter + (plugins/dejitter.c). + + * Added the configure script and Makefile.in files, plus other files generated by + autogen.sh, so that only "configure" needs to be run before running "make". + If a user wishes to rerun the automake and autoconf steps, run "autogen-clean.sh" + and then "autogen.sh". + +2002-06-17 Douglas Lowder <dl...@ea...> + + * I added a simple script, autogen-clean.sh, to make it easier to change configure.in + and regenerate configure scripts and Makefiles. + + * I made modifications so that npitre's new input API code is now wrapped in + #ifdef USE_INPUT_API. Added a new configure flag, --enable-inputapi, which + is turned on by default, and which adds -DUSE_INPUT_API to CFLAGS in all the + Makefiles. --disable-inputapi will return the code to its original behavior + of opening /dev/touchscreen/ucb1x00 and reading events directly. + + * I modified plugins/linear.c so that it determines the full linear transformation + between touchscreen and framebuffer coordinate systems. This method not only + rescales and offsets the coordinates correctly, but also automatically takes care + of rotation or tilt between the coordinate systems, and automatically takes care + of cases where X and Y are interchanged. Therefore, the xyswap parameter is + no longer required or used. + + * I found the framebuffer code in tests/ts_calibrate.c and tests/ts_test.c to be + broken, and fixed it so it works correctly (used ADS GraphicsClient+ and an Intel + DBPXA250 (Lubbock) Xscale target for testing). + Since there was a lot of duplication, I extracted all the framebuffer specific stuff + to new files fbutils.c and fbutils.h, so it will be easier to add more framebuffer + tests in future if desired. I also extract a couple of fonts and wrote simple text + printing code so text messages can be displayed in ts_test and ts_calibrate. + + * I added a new configure flag, --enable-debug, which is turned off by default. When + enabled, it adds -g -ggdb -DDEBUG to CFLAGS in all the Makefiles. I have debug + print statements in ts_read_raw and in the plugins that are wrapped with #ifdef DEBUG -- + this way I can see how many events are being filtered away and get a better idea + of what the filters are doing. + + * Joanne Woo <jw...@mv...> added C++ wrappers to the header files so this library + can be safely used with C++ code. + Added: trunk/libs/tslib/INSTALL =================================================================== --- trunk/libs/tslib/INSTALL (rev 0) +++ trunk/libs/tslib/INSTALL 2008-04-21 10:11:31 UTC (rev 307) @@ -0,0 +1,234 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006 Free Software Foundation, Inc. + +This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + +Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + +Compilers and Options +===================== + +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + +You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + +Installation Names +================== + +By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + +Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Specifying the System Type +========================== + +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + +Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + +`configure' recognizes the following options to control how it operates. + +`--help' +`-h' + Print a summary of the options to `configure', and exit. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + Added: trunk/libs/tslib/Makefile.am =================================================================== --- trunk/libs/tslib/Makefile.am (rev 0) +++ trunk/libs/tslib/Makefile.am 2008-04-21 10:11:31 UTC (rev 307) @@ -0,0 +1,19 @@ +# +# tslib/Makefile.am +# +# Copyright (C) 2001 Russell King. +# +# This file is placed under the LGPL. Please see the file +# COPYING for more details. +# +# $Id: Makefile.am,v 1.3 2005/02/28 18:56:09 kergoth Exp $ +# + +SUBDIRS = etc src plugins tests +EXTRA_DIST = autogen.sh + +ACLOCAL_AMFLAGS = -I m4/internal -I m4/external +AUTOMAKE_OPTIONS = 1.6 + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = $(PACKAGE)-$(LT_RELEASE).pc Added: trunk/libs/tslib/NEWS =================================================================== Added: trunk/libs/tslib/README =================================================================== --- trunk/libs/tslib/README (rev 0) +++ trunk/libs/tslib/README 2008-04-21 10:11:31 UTC (rev 307) @@ -0,0 +1,133 @@ +$Id: README,v 1.4 2004/07/21 19:12:58 dlowder Exp $ + +General +======= + +The idea of tslib is to have a core library that provides standardised +services, and a set of plugins to manage the conversion and filtering as +needed. + +The plugins for a particular touchscreen are loaded automatically by the +library under the control of a static configuration file, ts.conf. +ts.conf gives the library basic configuration information. Each line +specifies one module, and the parameters for that module. The modules +are loaded in order, with the first one processing the touchscreen data +first. For example: + + module_raw input + module variance delta=30 + module dejitter delta=100 + module linear + +These parameters are described below. + +With this configuration file, we end up with the following data flow +through the library: + + raw read --> variance --> dejitter --> linear --> application + module module module module + +You can re-order these modules as you wish, add more modules, or remove them +all together. When you call ts_read(), the values you read are values that +have passed through the chain of filters and scaling conversions. Another +call is provided, ts_read_raw() which bypasses all the modules and reads the +raw data directly from the device. + +There are a couple of programs in the tslib/test directory which give example +usages. They are by no means exhaustive, nor probably even good examples. +They are basically the programs used to test this library. + + +Environment Variables +===================== + +TSLIB_TSDEVICE TS device file name. + Default (non inputapi): /dev/touchscreen/ucb1x00 + Default (inputapi): /dev/input/event0 +TSLIB_CALIBFILE Calibration file. + Default: ${sysconfdir}/pointercal +TSLIB_CONFFILE Config file. + Default: ${sysconfdir}/ts.conf +TSLIB_PLUGINDIR Plugin directory. + Default: ${datadir}/plugins +TSLIB_CONSOLEDEVICE Console device. + Default: /dev/tty +TSLIB_FBDEVICE Framebuffer device. + Default: /dev/fb0 + + +Module Creation Notes +===================== + +For those creating tslib modules, it is important to note a couple things with +regard to handling of the ability for a user to request more than one ts event +at a time. The first thing to note is that the lower layers may send up less +events than the user requested, because some events may be filtered out by +intermediate layers. Next, your module should send up just as many events +as the user requested in nr. If your module is one that consumes events, +such as variance, then you loop on the read from the lower layers, and only +send the events up when +1) you have the number of events requested by the user, or +2) one of the events from the lower layers was a pen release. + + +Module Parameters +================= + +module: variance +---------------- + +Description: + Variance filter. Tries to do it's best in order to filter out random noise + coming from touchscreen ADC's. This is achieved by limiting the sample + movement speed to some value (e.g. the pen is not supposed to move quicker + than some threshold). + + This is a 'greedy' filter, e.g. it gives less samples on output than + receives on input. + +Parameters: + delta + Set the squared distance in touchscreen units between previous and + current pen position (e.g. (X2-X1)^2 + (Y2-Y1)^2). This defines the + criteria for determining whenever two samples are '... [truncated message content] |
From: <or...@us...> - 2008-04-12 14:16:28
|
Revision: 306 http://open2x.svn.sourceforge.net/open2x/?rev=306&view=rev Author: orkie Date: 2008-04-12 07:16:33 -0700 (Sat, 12 Apr 2008) Log Message: ----------- Imported kexec-tools needed to use the new syscall in the kernel. Added Paths: ----------- trunk/utils/kexec-utils/ trunk/utils/kexec-utils/AUTHORS trunk/utils/kexec-utils/COPYING trunk/utils/kexec-utils/Makefile trunk/utils/kexec-utils/Makefile.conf trunk/utils/kexec-utils/Makefile.conf.in trunk/utils/kexec-utils/News trunk/utils/kexec-utils/TODO trunk/utils/kexec-utils/config/ trunk/utils/kexec-utils/config/config.guess trunk/utils/kexec-utils/config/config.sub trunk/utils/kexec-utils/config/install-sh trunk/utils/kexec-utils/configure trunk/utils/kexec-utils/configure.ac trunk/utils/kexec-utils/doc/ trunk/utils/kexec-utils/doc/linux-i386-boot.txt trunk/utils/kexec-utils/doc/linux-i386-zero-page.txt trunk/utils/kexec-utils/doc/multiboot.html trunk/utils/kexec-utils/doc/nbi-spec.txt trunk/utils/kexec-utils/include/ trunk/utils/kexec-utils/include/boot/ trunk/utils/kexec-utils/include/boot/beoboot.h trunk/utils/kexec-utils/include/boot/elf_boot.h trunk/utils/kexec-utils/include/boot/linuxbios_tables.h trunk/utils/kexec-utils/include/elf.h trunk/utils/kexec-utils/include/x86/ trunk/utils/kexec-utils/include/x86/mb_header.h trunk/utils/kexec-utils/include/x86/mb_info.h trunk/utils/kexec-utils/include/x86/x86-linux.h trunk/utils/kexec-utils/kdump/ trunk/utils/kexec-utils/kdump/Makefile trunk/utils/kexec-utils/kdump/kdump.8 trunk/utils/kexec-utils/kdump/kdump.c trunk/utils/kexec-utils/kexec/ trunk/utils/kexec-utils/kexec/Makefile trunk/utils/kexec-utils/kexec/arch/ trunk/utils/kexec-utils/kexec/arch/alpha/ trunk/utils/kexec-utils/kexec/arch/alpha/include/ trunk/utils/kexec-utils/kexec/arch/alpha/include/arch/ trunk/utils/kexec-utils/kexec/arch/alpha/include/arch/options.h trunk/utils/kexec-utils/kexec/arch/arm/ trunk/utils/kexec-utils/kexec/arch/arm/Makefile trunk/utils/kexec-utils/kexec/arch/arm/include/ trunk/utils/kexec-utils/kexec/arch/arm/include/arch/ trunk/utils/kexec-utils/kexec/arch/arm/include/arch/options.h trunk/utils/kexec-utils/kexec/arch/arm/kexec-arm.c trunk/utils/kexec-utils/kexec/arch/arm/kexec-arm.h trunk/utils/kexec-utils/kexec/arch/arm/kexec-elf-rel-arm.c trunk/utils/kexec-utils/kexec/arch/arm/kexec-zImage-arm.c trunk/utils/kexec-utils/kexec/arch/i386/ trunk/utils/kexec-utils/kexec/arch/i386/Makefile trunk/utils/kexec-utils/kexec/arch/i386/compat_x86_64.S trunk/utils/kexec-utils/kexec/arch/i386/crashdump-x86.c trunk/utils/kexec-utils/kexec/arch/i386/crashdump-x86.h trunk/utils/kexec-utils/kexec/arch/i386/include/ trunk/utils/kexec-utils/kexec/arch/i386/include/arch/ trunk/utils/kexec-utils/kexec/arch/i386/include/arch/options.h trunk/utils/kexec-utils/kexec/arch/i386/kexec-beoboot-x86.c trunk/utils/kexec-utils/kexec/arch/i386/kexec-bzImage.c trunk/utils/kexec-utils/kexec/arch/i386/kexec-elf-rel-x86.c trunk/utils/kexec-utils/kexec/arch/i386/kexec-elf-x86.c trunk/utils/kexec-utils/kexec/arch/i386/kexec-multiboot-x86.c trunk/utils/kexec-utils/kexec/arch/i386/kexec-nbi.c trunk/utils/kexec-utils/kexec/arch/i386/kexec-x86.c trunk/utils/kexec-utils/kexec/arch/i386/kexec-x86.h trunk/utils/kexec-utils/kexec/arch/i386/x86-linux-setup.c trunk/utils/kexec-utils/kexec/arch/i386/x86-linux-setup.h trunk/utils/kexec-utils/kexec/arch/ia64/ trunk/utils/kexec-utils/kexec/arch/ia64/Makefile trunk/utils/kexec-utils/kexec/arch/ia64/crashdump-ia64.c trunk/utils/kexec-utils/kexec/arch/ia64/crashdump-ia64.h trunk/utils/kexec-utils/kexec/arch/ia64/include/ trunk/utils/kexec-utils/kexec/arch/ia64/include/arch/ trunk/utils/kexec-utils/kexec/arch/ia64/include/arch/options.h trunk/utils/kexec-utils/kexec/arch/ia64/kexec-elf-ia64.c trunk/utils/kexec-utils/kexec/arch/ia64/kexec-elf-rel-ia64.c trunk/utils/kexec-utils/kexec/arch/ia64/kexec-ia64.c trunk/utils/kexec-utils/kexec/arch/ia64/kexec-ia64.h trunk/utils/kexec-utils/kexec/arch/ppc/ trunk/utils/kexec-utils/kexec/arch/ppc/Makefile trunk/utils/kexec-utils/kexec/arch/ppc/include/ trunk/utils/kexec-utils/kexec/arch/ppc/include/arch/ trunk/utils/kexec-utils/kexec/arch/ppc/include/arch/options.h trunk/utils/kexec-utils/kexec/arch/ppc/kexec-dol-ppc.c trunk/utils/kexec-utils/kexec/arch/ppc/kexec-elf-ppc.c trunk/utils/kexec-utils/kexec/arch/ppc/kexec-elf-rel-ppc.c trunk/utils/kexec-utils/kexec/arch/ppc/kexec-ppc.c trunk/utils/kexec-utils/kexec/arch/ppc/kexec-ppc.h trunk/utils/kexec-utils/kexec/arch/ppc/ppc-setup-dol.S trunk/utils/kexec-utils/kexec/arch/ppc/ppc-setup-simple.S trunk/utils/kexec-utils/kexec/arch/ppc/ppc_asm.h trunk/utils/kexec-utils/kexec/arch/ppc64/ trunk/utils/kexec-utils/kexec/arch/ppc64/Makefile trunk/utils/kexec-utils/kexec/arch/ppc64/crashdump-ppc64.c trunk/utils/kexec-utils/kexec/arch/ppc64/crashdump-ppc64.h trunk/utils/kexec-utils/kexec/arch/ppc64/fs2dt.c trunk/utils/kexec-utils/kexec/arch/ppc64/include/ trunk/utils/kexec-utils/kexec/arch/ppc64/include/arch/ trunk/utils/kexec-utils/kexec/arch/ppc64/include/arch/options.h trunk/utils/kexec-utils/kexec/arch/ppc64/kexec-elf-ppc64.c trunk/utils/kexec-utils/kexec/arch/ppc64/kexec-elf-rel-ppc64.c trunk/utils/kexec-utils/kexec/arch/ppc64/kexec-ppc64.c trunk/utils/kexec-utils/kexec/arch/ppc64/kexec-ppc64.h trunk/utils/kexec-utils/kexec/arch/ppc64/kexec-zImage-ppc64.c trunk/utils/kexec-utils/kexec/arch/s390/ trunk/utils/kexec-utils/kexec/arch/s390/Makefile trunk/utils/kexec-utils/kexec/arch/s390/include/ trunk/utils/kexec-utils/kexec/arch/s390/include/arch/ trunk/utils/kexec-utils/kexec/arch/s390/include/arch/options.h trunk/utils/kexec-utils/kexec/arch/s390/kexec-elf-rel-s390.c trunk/utils/kexec-utils/kexec/arch/s390/kexec-image.c trunk/utils/kexec-utils/kexec/arch/s390/kexec-s390.c trunk/utils/kexec-utils/kexec/arch/s390/kexec-s390.h trunk/utils/kexec-utils/kexec/arch/x86_64/ trunk/utils/kexec-utils/kexec/arch/x86_64/Makefile trunk/utils/kexec-utils/kexec/arch/x86_64/crashdump-x86_64.c trunk/utils/kexec-utils/kexec/arch/x86_64/crashdump-x86_64.h trunk/utils/kexec-utils/kexec/arch/x86_64/include/ trunk/utils/kexec-utils/kexec/arch/x86_64/include/arch/ trunk/utils/kexec-utils/kexec/arch/x86_64/include/arch/options.h trunk/utils/kexec-utils/kexec/arch/x86_64/kexec-elf-rel-x86_64.c trunk/utils/kexec-utils/kexec/arch/x86_64/kexec-elf-x86_64.c trunk/utils/kexec-utils/kexec/arch/x86_64/kexec-x86_64.c trunk/utils/kexec-utils/kexec/arch/x86_64/kexec-x86_64.h trunk/utils/kexec-utils/kexec/crashdump.c trunk/utils/kexec-utils/kexec/crashdump.h trunk/utils/kexec-utils/kexec/ifdown.c trunk/utils/kexec-utils/kexec/kexec-elf-boot.c trunk/utils/kexec-utils/kexec/kexec-elf-boot.h trunk/utils/kexec-utils/kexec/kexec-elf-exec.c trunk/utils/kexec-utils/kexec/kexec-elf-rel.c trunk/utils/kexec-utils/kexec/kexec-elf.c trunk/utils/kexec-utils/kexec/kexec-elf.h trunk/utils/kexec-utils/kexec/kexec-sha256.h trunk/utils/kexec-utils/kexec/kexec-syscall.h trunk/utils/kexec-utils/kexec/kexec.8 trunk/utils/kexec-utils/kexec/kexec.c trunk/utils/kexec-utils/kexec/kexec.h trunk/utils/kexec-utils/kexec-tools.spec.in trunk/utils/kexec-utils/kexec_test/ trunk/utils/kexec-utils/kexec_test/Makefile trunk/utils/kexec-utils/kexec_test/kexec_test.S trunk/utils/kexec-utils/kexec_test/kexec_test16.S trunk/utils/kexec-utils/kexec_test/x86-setup-legacy-pic.S trunk/utils/kexec-utils/purgatory/ trunk/utils/kexec-utils/purgatory/Makefile trunk/utils/kexec-utils/purgatory/arch/ trunk/utils/kexec-utils/purgatory/arch/alpha/ trunk/utils/kexec-utils/purgatory/arch/alpha/Makefile trunk/utils/kexec-utils/purgatory/arch/alpha/include/ trunk/utils/kexec-utils/purgatory/arch/alpha/include/limits.h trunk/utils/kexec-utils/purgatory/arch/alpha/include/stdint.h trunk/utils/kexec-utils/purgatory/arch/arm/ trunk/utils/kexec-utils/purgatory/arch/arm/Makefile trunk/utils/kexec-utils/purgatory/arch/arm/include/ trunk/utils/kexec-utils/purgatory/arch/arm/include/limits.h trunk/utils/kexec-utils/purgatory/arch/arm/include/stdint.h trunk/utils/kexec-utils/purgatory/arch/i386/ trunk/utils/kexec-utils/purgatory/arch/i386/Makefile trunk/utils/kexec-utils/purgatory/arch/i386/compat_x86_64.S trunk/utils/kexec-utils/purgatory/arch/i386/console-x86.c trunk/utils/kexec-utils/purgatory/arch/i386/crashdump_backup.c trunk/utils/kexec-utils/purgatory/arch/i386/entry16.S trunk/utils/kexec-utils/purgatory/arch/i386/entry32-16-debug.S trunk/utils/kexec-utils/purgatory/arch/i386/entry32-16.S trunk/utils/kexec-utils/purgatory/arch/i386/entry32.S trunk/utils/kexec-utils/purgatory/arch/i386/include/ trunk/utils/kexec-utils/purgatory/arch/i386/include/arch/ trunk/utils/kexec-utils/purgatory/arch/i386/include/arch/debug.h trunk/utils/kexec-utils/purgatory/arch/i386/include/arch/io.h trunk/utils/kexec-utils/purgatory/arch/i386/include/limits.h trunk/utils/kexec-utils/purgatory/arch/i386/include/stdint.h trunk/utils/kexec-utils/purgatory/arch/i386/linux-entry16.S trunk/utils/kexec-utils/purgatory/arch/i386/pic.c trunk/utils/kexec-utils/purgatory/arch/i386/purgatory-x86.c trunk/utils/kexec-utils/purgatory/arch/i386/purgatory-x86.h trunk/utils/kexec-utils/purgatory/arch/i386/setup-x86.S trunk/utils/kexec-utils/purgatory/arch/i386/stack.S trunk/utils/kexec-utils/purgatory/arch/i386/timer.c trunk/utils/kexec-utils/purgatory/arch/i386/vga.c trunk/utils/kexec-utils/purgatory/arch/ia64/ trunk/utils/kexec-utils/purgatory/arch/ia64/Makefile trunk/utils/kexec-utils/purgatory/arch/ia64/console-ia64.c trunk/utils/kexec-utils/purgatory/arch/ia64/entry.S trunk/utils/kexec-utils/purgatory/arch/ia64/include/ trunk/utils/kexec-utils/purgatory/arch/ia64/include/arch/ trunk/utils/kexec-utils/purgatory/arch/ia64/include/arch/io.h trunk/utils/kexec-utils/purgatory/arch/ia64/include/limits.h trunk/utils/kexec-utils/purgatory/arch/ia64/include/stdint.h trunk/utils/kexec-utils/purgatory/arch/ia64/io.h trunk/utils/kexec-utils/purgatory/arch/ia64/purgatory-ia64.c trunk/utils/kexec-utils/purgatory/arch/ia64/purgatory-ia64.h trunk/utils/kexec-utils/purgatory/arch/ia64/vga.c trunk/utils/kexec-utils/purgatory/arch/ppc/ trunk/utils/kexec-utils/purgatory/arch/ppc/Makefile trunk/utils/kexec-utils/purgatory/arch/ppc/console-ppc.c trunk/utils/kexec-utils/purgatory/arch/ppc/include/ trunk/utils/kexec-utils/purgatory/arch/ppc/include/limits.h trunk/utils/kexec-utils/purgatory/arch/ppc/include/stdint.h trunk/utils/kexec-utils/purgatory/arch/ppc/misc.S trunk/utils/kexec-utils/purgatory/arch/ppc/ppc_asm.h trunk/utils/kexec-utils/purgatory/arch/ppc/purgatory-ppc.c trunk/utils/kexec-utils/purgatory/arch/ppc/purgatory-ppc.h trunk/utils/kexec-utils/purgatory/arch/ppc64/ trunk/utils/kexec-utils/purgatory/arch/ppc64/Makefile trunk/utils/kexec-utils/purgatory/arch/ppc64/console-ppc64.c trunk/utils/kexec-utils/purgatory/arch/ppc64/crashdump_backup.c trunk/utils/kexec-utils/purgatory/arch/ppc64/include/ trunk/utils/kexec-utils/purgatory/arch/ppc64/include/limits.h trunk/utils/kexec-utils/purgatory/arch/ppc64/include/stdint.h trunk/utils/kexec-utils/purgatory/arch/ppc64/purgatory-ppc64.c trunk/utils/kexec-utils/purgatory/arch/ppc64/purgatory-ppc64.h trunk/utils/kexec-utils/purgatory/arch/ppc64/v2wrap.S trunk/utils/kexec-utils/purgatory/arch/s390/ trunk/utils/kexec-utils/purgatory/arch/s390/Makefile trunk/utils/kexec-utils/purgatory/arch/s390/include/ trunk/utils/kexec-utils/purgatory/arch/s390/include/limits.h trunk/utils/kexec-utils/purgatory/arch/s390/include/stdint.h trunk/utils/kexec-utils/purgatory/arch/x86_64/ trunk/utils/kexec-utils/purgatory/arch/x86_64/Makefile trunk/utils/kexec-utils/purgatory/arch/x86_64/entry64-32.S trunk/utils/kexec-utils/purgatory/arch/x86_64/entry64.S trunk/utils/kexec-utils/purgatory/arch/x86_64/include/ trunk/utils/kexec-utils/purgatory/arch/x86_64/include/arch/ trunk/utils/kexec-utils/purgatory/arch/x86_64/include/arch/debug.h trunk/utils/kexec-utils/purgatory/arch/x86_64/include/arch/io.h trunk/utils/kexec-utils/purgatory/arch/x86_64/include/limits.h trunk/utils/kexec-utils/purgatory/arch/x86_64/include/stdint.h trunk/utils/kexec-utils/purgatory/arch/x86_64/purgatory-x86_64.c trunk/utils/kexec-utils/purgatory/arch/x86_64/purgatory-x86_64.h trunk/utils/kexec-utils/purgatory/arch/x86_64/setup-x86_64.S trunk/utils/kexec-utils/purgatory/arch/x86_64/stack.S trunk/utils/kexec-utils/purgatory/include/ trunk/utils/kexec-utils/purgatory/include/purgatory.h trunk/utils/kexec-utils/purgatory/include/string.h trunk/utils/kexec-utils/purgatory/printf.c trunk/utils/kexec-utils/purgatory/purgatory.c trunk/utils/kexec-utils/purgatory/string.c trunk/utils/kexec-utils/util/ trunk/utils/kexec-utils/util/Makefile trunk/utils/kexec-utils/util/bin-to-hex.c trunk/utils/kexec-utils/util_lib/ trunk/utils/kexec-utils/util_lib/Makefile trunk/utils/kexec-utils/util_lib/compute_ip_checksum.c trunk/utils/kexec-utils/util_lib/include/ trunk/utils/kexec-utils/util_lib/include/ip_checksum.h trunk/utils/kexec-utils/util_lib/include/sha256.h trunk/utils/kexec-utils/util_lib/sha256.c Added: trunk/utils/kexec-utils/AUTHORS =================================================================== --- trunk/utils/kexec-utils/AUTHORS (rev 0) +++ trunk/utils/kexec-utils/AUTHORS 2008-04-12 14:16:33 UTC (rev 306) @@ -0,0 +1,6 @@ +Eric Biederman <ebi...@xm...> +Albert Herranz +Jesse Barnes <jb...@sg...> +Khalid Aziz <kha...@hp...> +Hariprasad Nellitheertha <ha...@in...> +Tim Deegan <tj...@cl...> \ No newline at end of file Added: trunk/utils/kexec-utils/COPYING =================================================================== --- trunk/utils/kexec-utils/COPYING (rev 0) +++ trunk/utils/kexec-utils/COPYING 2008-04-12 14:16:33 UTC (rev 306) @@ -0,0 +1,341 @@ + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) 19yy <name of author> + + 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 + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Added: trunk/utils/kexec-utils/Makefile =================================================================== --- trunk/utils/kexec-utils/Makefile (rev 0) +++ trunk/utils/kexec-utils/Makefile 2008-04-12 14:16:33 UTC (rev 306) @@ -0,0 +1,250 @@ +# Hey Emacs this is a -*- makefile-*- +include Makefile.conf +VERSION=1.101 +DATE=15 February 2005 +PACKAGE=kexec-tools + +pkgdatadir = $(datadir)/$(PACKAGE) +pkglibdir = $(libdir)/$(PACKAGE) +pkgincludedir = $(includedir)/$(PACKAGE) + +# You can specify DESTDIR on the command line to do a add +# a prefix to the install so it doesn't really happen +# Useful for building binary packages +DESTDIR = + +CPPFLAGS:= -I./include -I./util_lib/include \ + -DVERSION='"$(VERSION)"' -DRELEASE_DATE='"$(DATE)"' \ + $(DEFS) $(EXTRA_CFLAGS) + +PREFIX:=$(OBJDIR)/build +SBINDIR=$(PREFIX)/sbin +BINDIR=$(PREFIX)/bin +LIBEXECDIR=$(PREFIX)/libexec +DATADIR=$(PREFIX)/share +SYSCONFDIR=$(PREFIX)/etc +SHAREDSTATEDIR=$(PREFIX)/com +LOCALSTATEDIR=$(PREFIX)/var +LIBDIR=$(PREFIX)/lib +INFODIR=$(PREFIX)/info +MANDIR=$(PREFIX)/man +MAN1DIR=$(MANDIR)/man1 +MAN2DIR=$(MANDIR)/man2 +MAN3DIR=$(MANDIR)/man3 +MAN4DIR=$(MANDIR)/man4 +MAN5DIR=$(MANDIR)/man5 +MAN6DIR=$(MANDIR)/man6 +MAN7DIR=$(MANDIR)/man7 +MAN8DIR=$(MANDIR)/man8 +INCLUDEDIR=$(PREFIX)/include + +PKGDATADIR=$(DATADIR)/$(PACKAGE) +PKGLIBDIR=$(LIBDIR)/$(PACKAGE) +PKGINCLUDEIR=$(INCLUDEDIR)/$(PACKAGE) + +MAN_PAGES:= kexec/kexec.8 +MAN_PAGES+= kdump/kdump.8 +BINARIES_i386:= $(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test +BINARIES_x86_64:=$(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test +BINARIES:=$(SBINDIR)/kexec $(SBINDIR)/kdump $(BINARIES_$(ARCH)) + +TARGETS:=$(BINARIES) $(MAN_PAGES) + +all: $(TARGETS) + +# cc-option +# Usage: cflags-y += $(call cc-option, -march=winchip-c6, -march=i586) +cc-option = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \ + > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) + +# Utility function library +# +include util_lib/Makefile + +# +# Stand alone utilities +# +include util/Makefile + +# +# purgatory (code between kernels) +# +include purgatory/Makefile + +# +# kexec (linux booting linux) +# +include kexec/Makefile + + +# kdump (read a crashdump from memory) +# +include kdump/Makefile + +# +# kexec_test (test program) +# +ifeq ($(ARCH),i386) +include kexec_test/Makefile +endif +ifeq ($(ARCH),x86_64) +include kexec_test/Makefile +endif + +GENERATED_SRCS:= ./configure +SPEC=$(OBJDIR)/$(PACKAGE)-$(VERSION).spec +TARBALL=$(OBJDIR)/$(PACKAGE)-$(VERSION).tar.gz +SRCS:=$(shell $(FIND) \ + ./AUTHORS ./COPYING ./News ./TODO \ + ./Makefile ./Makefile.conf.in ./configure.ac \ + ./kexec-tools.spec.in ./config ./doc \ + ./include ./kexec ./purgatory ./kexec_test ./kdump ./util ./util_lib \ + ! -path '*CVS*' ! -name '*~' ! -name '.*' \ + -type f -print ) +SRCS+=$(GENERATED_SRCS) +PSRCS:=$(patsubst ./%,$(PACKAGE)-$(VERSION)/%,$(SRCS)) +PSRCS+=$(PACKAGE)-$(VERSION).spec + +Makefile.conf: Makefile.conf.in configure + /bin/sh ./configure + +configure: configure.ac + autoconf + $(RM) -rf autom4te.cache + +tarball: $(TARBALL) + +$(TARBALL): $(SRCS) $(SPEC) + $(MKDIR) -p $(OBJDIR) + $(RM) -f $(OBJDIR)/$(PACKAGE)-$(VERSION) + $(LN) -s .. $(OBJDIR)/$(PACKAGE)-$(VERSION) + (cd $(OBJDIR); $(TAR) -cf - $(PSRCS) | gzip -9) > $@ + +rpm: $(TARBALL) + $(MKDIR) -p $(OBJDIR)/RPM $(OBJDIR)/SRPM $(OBJDIR)/BUILD $(OBJDIR)/SPECS \ + $(OBJDIR)/TMP $(OBJDIR)/SOURCES + unset MAKEFLAGS MAKELEVEL; \ + $(RPMBUILD) -ta \ + --define '_rpmdir $(OBJDIR)/RPM' \ + --define '_srcrpmdir $(OBJDIR)/SRPM' \ + --define '_builddir $(OBJDIR)/BUILD' \ + --define '_specdir $(OBJDIR)/SPECS' \ + --define '_tmppath $(OBJDIR)/TMP' \ + --define '_sourcedir $(OBJDIR)/SOURCES' \ + $(TARBALL) + +$(SPEC): kexec-tools.spec.in Makefile + $(SED) -e 's,^Version: $$,Version: $(VERSION),' $< > $@ + +echo:: + @echo ARCH=$(ARCH) + @echo BINARIES=$(BINARIES) + @echo TARGETS=$(TARGETS) + @echo CC=$(CC) + @echo AR=$(AR) + @echo LD=$(LD) + +clean: + @$(FIND) $(OBJDIR) ! -name '*.d' -type f | $(XARGS) $(RM) rm -f + @$(RM) -rf rpm + @$(RM) -f config.log config.status config.cache + @$(RM) -f $(TARBALL) + +dist-clean: clean + @$(RM) -rf $(OBJDIR) + @$(FIND) . -type f -name '*~' -o -name '*.orig' | $(XARGS) $(RM) -f + @$(RM) -f Makefile.conf + +maintainer-clean: dist-clean + @$(RM) -f $(GENERATED_SRCS) + + +install: $(TARGETS) + for file in $(TARGETS) ; do \ + if test `$(DIRNAME) $$file` = "$(SBINDIR)" ; then \ + $(MKDIR) -p $(DESTDIR)/$(sbindir)/; \ + $(INSTALL) -m 555 $$file $(DESTDIR)/$(sbindir)/; \ + fi; \ + if test `$(DIRNAME) $$file` = "$(BINDIR)" ; then \ + $(MKDIR) -p $(DESTDIR)/$(bindir)/; \ + $(INSTALL) -m 555 $$file $(DESTDIR)/$(bindir)/; \ + fi; \ + if test `$(DIRNAME) $$file` = "$(LIBEXECDIR)" ; then \ + $(MKDIR) -p $(DESTDIR)/$(libexecdir)/; \ + $(INSTALL) -m 555 $$file $(DESTDIR)/$(libexecdir)/; \ + fi; \ + if test `$(DIRNAME) $$file` = "$(DATADIR)" ; then \ + $(MKDIR) -p $(DESTDIR)/$(datadir)/; \ + $(INSTALL) -m 444 $$file $(DESTDIR)/$(datadir)/; \ + fi; \ + if test `$(DIRNAME) $$file` = "$(SYSCONFDIR)" ; then \ + $(MKDIR) -p $(DESTDIR)/$(sysconfdir)/; \ + $(INSTALL) -m 444 $$file $(DESTDIR)/$(sysconfdir)/; \ + fi; \ + if test `$(DIRNAME) $$file` = "$(SHAREDSTATEDIR)" ; then \ + $(MKDIR) -p $(DESTDIR)/$(sharedstatedir)/; \ + $(INSTALL) -m 444 $$file $(DESTDIR)/$(sharedstatedir)/; \ + fi; \ + if test `$(DIRNAME) $$file` = "$(LOCALSTATEDIR)" ; then \ + $(MKDIR) -p $(DESTDIR)/$(localstatedir)/; \ + $(INSTALL) -m 444 $$file $(DESTDIR)/$(localstatedir)/; \ + fi; \ + if test `$(DIRNAME) $$file` = "$(LIBDIR)" ; then \ + $(MKDIR) -p $(DESTDIR)/$(libdir)/; \ + $(INSTALL) -m 444 $$file $(DESTDIR)/$(libdir)/; \ + fi; \ + if test `$(DIRNAME) $$file` = "$(INFODIR)" ; then \ + $(MKDIR) -p $(DESTDIR)/$(infodir)/; \ + $(INSTALL) -m 444 $$file $(DESTDIR)/$(infodir)/; \ + fi; \ + if test `$(DIRNAME) $$file` = "$(MAN1DIR)" ; then \ + $(MKDIR) -p $(DESTDIR)/$(mandir)/man1; \ + $(INSTALL) -m 444 $$file $(DESTDIR)/$(mandir)/man1; \ + fi; \ + if test `$(DIRNAME) $$file` = "$(MAN2DIR)" ; then \ + $(MKDIR) -p $(DESTDIR)/$(mandir)/man2; \ + $(INSTALL) -m 444 $$file $(DESTDIR)/$(mandir)/man2; \ + fi; \ + if test `$(DIRNAME) $$file` = "$(MAN3DIR)" ; then \ + $(MKDIR) -p $(DESTDIR)/$(mandir)/man3/; \ + $(INSTALL) -m 444 $$file $(DESTDIR)/$(mandir)/man3/; \ + fi; \ + if test `$(DIRNAME) $$file` = "$(MAN4DIR)" ; then \ + $(MKDIR) -p $(DESTDIR)/$(mandir)/man4/; \ + $(INSTALL) -m 444 $$file $(DESTDIR)/$(mandir)/man4/; \ + fi; \ + if test `$(DIRNAME) $$file` = "$(MAN5DIR)" ; then \ + $(MKDIR) -p $(DESTDIR)/$(mandir)/man5/; \ + $(INSTALL) -m 444 $$file $(DESTDIR)/$(mandir)/man5/; \ + fi; \ + if test `$(DIRNAME) $$file` = "$(MAN6DIR)" ; then \ + $(MKDIR) -p $(DESTDIR)/$(mandir)/man6/; \ + $(INSTALL) -m 444 $$file $(DESTDIR)/$(mandir)/man6/; \ + fi; \ + if test `$(DIRNAME) $$file` = "$(MAN7DIR)" ; then \ + $(MKDIR) -p $(DESTDIR)/$(mandir)/man7/; \ + $(INSTALL) -m 444 $$file $(DESTDIR)/$(mandir)/man7/; \ + fi; \ + if test `$(DIRNAME) $$file` = "$(MAN8DIR)" ; then \ + $(MKDIR) -p $(DESTDIR)/$(mandir)/man8/; \ + $(INSTALL) -m 444 $$file $(DESTDIR)/$(mandir)/man8/; \ + fi; \ + if test `$(DIRNAME) $$file` = "$(INCLUDEDIR)" ; then \ + $(MKDIR) -p $(DESTDIR)/$(includedir)/; \ + $(INSTALL) -m 444 $$file $(DESTDIR)/$(includedir)/; \ + fi; \ + if test `$(DIRNAME) $$file` = "$(PKGDATADIR)" ; then \ + $(MKDIR) -p $(DESTDIR)/$(pkgdatadir)/; \ + $(INSTALL) -m 444 $$file $(DESTDIR)/$(pkgdatadir)/; \ + fi; \ + if test `$(DIRNAME) $$file` = "$(PKGLIBDIR)" ; then \ + $(MKDIR) -p $(DESTDIR)/$(pkglibdir)/; \ + $(INSTALL) -m 444 $$file $(DESTDIR)/$(pkglibdir)/; \ + fi; \ + if test `$(DIRNAME) $$file` = "$(PKGINCLUDEDIR)" ; then \ + $(MKDIR) -p $(DESTDIR)/$(pkgincludedir)/; \ + $(INSTALL) -m 444 $$file $(DESTDIR)/$(pkgincludedir)/; \ + fi; \ + done + +.PHONY: echo install all clean dist-clean maintainer-clean tarball rpm Added: trunk/utils/kexec-utils/Makefile.conf =================================================================== --- trunk/utils/kexec-utils/Makefile.conf (rev 0) +++ trunk/utils/kexec-utils/Makefile.conf 2008-04-12 14:16:33 UTC (rev 306) @@ -0,0 +1,52 @@ +# Hey Emacs this is a -*- makefile-*- + +prefix=/usr/local +exec_prefix=${prefix} + +bindir=${exec_prefix}/bin +sbindir=${exec_prefix}/sbin +libexecdir=${exec_prefix}/libexec +datadir=${prefix}/share +sysconfdir=${prefix}/etc +sharedstatedir=${prefix}/com +localstatedir=${prefix}/var +libdir=${exec_prefix}/lib +infodir=${prefix}/info +mandir=${prefix}/man +includedir=${prefix}/include + +DEFS=-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 +LIBS= + +# The target architecture +ARCH =arm +OBJDIR=/home/adan/Desktop/kexec-tools-1.101-arm-initrd/objdir-arm-open2x-linux + +# Compiler for building kexec +CC =arm-open2x-linux-gcc +CPP =arm-open2x-linux-gcc -E +LD =arm-open2x-linux-ld +AS =arm-open2x-linux-as +OBJCOPY =arm-open2x-linux-objcopy +AR =arm-open2x-linux-ar +CFLAGS =-Wall -g -fno-strict-aliasing $(CPPFLAGS) +EXTRA_CFLAGS= +LDFLAGS = + +# Utilities called by the makefiles +INSTALL=/usr/bin/install -c +MKDIR=mkdir +RM=rm +CP=cp +LN=ln +TAR=tar +RPMBUILD=no +SED=sed +FIND=find +XARGS=xargs +DIRNAME=dirname + +# C compiler for building utilities to use +# during the build +BUILD_CC=gcc +BUILD_CFLAGS=-O2 -Wall $(CPPFLAGS) $(DEFS) Added: trunk/utils/kexec-utils/Makefile.conf.in =================================================================== --- trunk/utils/kexec-utils/Makefile.conf.in (rev 0) +++ trunk/utils/kexec-utils/Makefile.conf.in 2008-04-12 14:16:33 UTC (rev 306) @@ -0,0 +1,52 @@ +# Hey Emacs this is a -*- makefile-*- + +prefix=@prefix@ +exec_prefix=@exec_prefix@ + +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +datadir=@datadir@ +sysconfdir=@sysconfdir@ +sharedstatedir=@sharedstatedir@ +localstatedir=@localstatedir@ +libdir=@libdir@ +infodir=@infodir@ +mandir=@mandir@ +includedir=@includedir@ + +DEFS=@DEFS@ +LIBS=@LIBS@ + +# The target architecture +ARCH =@ARCH@ +OBJDIR=@OBJDIR@ + +# Compiler for building kexec +CC =@CC@ +CPP =@CPP@ +LD =@LD@ +AS =@AS@ +OBJCOPY =@OBJCOPY@ +AR =@AR@ +CFLAGS =@CFLAGS@ +EXTRA_CFLAGS=@EXTRA_CFLAGS@ +LDFLAGS =@LDFLAGS@ + +# Utilities called by the makefiles +INSTALL=@INSTALL@ +MKDIR=@MKDIR@ +RM=@RM@ +CP=@CP@ +LN=@LN@ +TAR=@TAR@ +RPMBUILD=@RPMBUILD@ +SED=@SED@ +FIND=@FIND@ +XARGS=@XARGS@ +DIRNAME=@DIRNAME@ + +# C compiler for building utilities to use +# during the build +BUILD_CC=@BUILD_CC@ +BUILD_CFLAGS=@BUILD_CFLAGS@ $(DEFS) Added: trunk/utils/kexec-utils/News =================================================================== --- trunk/utils/kexec-utils/News (rev 0) +++ trunk/utils/kexec-utils/News 2008-04-12 14:16:33 UTC (rev 306) @@ -0,0 +1,73 @@ +* 2.0 + - In purgatory added -fno-zero-initialized-in-bss to prevent issues with + recent versions of gcc + - Add an option to configure to disable zlib support + - Add mismatched architecture support + - Updated the x86 architecture help + - Updated the x86_64 architecture help + - Fixed bzImage support + - Added support for finding either the highest or lowest usable window. + - Change the version number to 2.0 to reflect the major change in + the code base. 1.99 was effectively the release canidate. +* 1.99 + - Rearchitect so the code is maintainable. + - Add multiboot support + - Add ia64 support + - Add beoboot image support + - Create generic elf loader code. + - Created the relocated shared object purgatory to hold + the code that runs between kernels. + - Added a configure script + - Added an rpm target + - Added kexec on panic support + - Initial stab at adding documentation + - Added loader support for ET_DYN objects +* 1.98 + - Add mysteriously dropped changes to make x86_64 work + - Update the distclean target to remove *.orig and *~ files +* 1.97 + - Add support for cross compiling x86_64 +* 1.96 + - add x86_64 support + - add support for linux style arguments to the elf32-x86 loader + - disable clearing of cr4 on x86 +* 1.95 + - add kexec-zImage-ppc64.c source file + - GameCube/PPC32 sync'ed to 1.94 + - use syscall() to call sys_kexec_load() and reboot() + - add kexec-syscall.h, remove kexec-syscall.c + - makefiles know about ARCH-es + - add noifdown kexec option (Albert Herranz) +* 1.94 + - revert a bad 1.92 change (not setting optind & opterr for subsequent + calls to getopt_long()) +* 1.93 + - restored "shutdown" functionality; + - more help/usage text clarification; + - add GPLv2 license to source files (with permission from Eric Biederman) +* 1.92 + - my_kexec(): call kexec() only one time; + - add "unload" option; + - fix some compiler warnings about "<var> might be used uninitialized"; + - commented out shutdown capability since it was unreachable; +* 1.91 + - fix "-t" option: strcmp() was inverted (Albert Herranz) + - check specified kernel image file for file type (Albert Herranz) +* 1.9 + - change reboot function to return type long (was int) + - use kexec reserved syscall numbers (in Linux 2.6.6-mm3) +* 1.8 + - Fixed bug where ramdisk wasn't loaded when specified + - Memory information is now read from /proc/iomem. + Information that is not needed is ignored. +* 1.7 + - Update to new tentative syscall number.... +* 1.6 + - Redo all of the command line arguments. + - Use the 32-bit kernel entry point. + - Work around a failure to clear %cr4. +* 1.5 + - Port to a new kernel interface (Hopefully the final one). + - Start working on setting up legacy hardware + - Add --load and --exec options so the parts can be done at different times. +### Added: trunk/utils/kexec-utils/TODO =================================================================== --- trunk/utils/kexec-utils/TODO (rev 0) +++ trunk/utils/kexec-utils/TODO 2008-04-12 14:16:33 UTC (rev 306) @@ -0,0 +1,11 @@ +- Restore enough state that DOS/arbitrary BIOS calls can be run on some + platforms. Currently disk-related calls are quite likely to blow up. +- x86 filling in other kernel parameters. +- Merge reboot via kexec functionality into /sbin/reboot +- In the kexec-on-panic case preserving memory the both kernels + must use. +- Finish the kexec-on-panic case. +- Improve the documentation +- Add support for loading a boot sector +- Autobuilding of initramfs +### Added: trunk/utils/kexec-utils/config/config.guess =================================================================== --- trunk/utils/kexec-utils/config/config.guess (rev 0) +++ trunk/utils/kexec-utils/config/config.guess 2008-04-12 14:16:33 UTC (rev 306) @@ -0,0 +1,1441 @@ +#! /bin/sh +# Attempt to guess a canonical system name. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + +timestamp='2004-08-13' + +# This file 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. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Originally written by Per Bothner <pe...@bo...>. +# Please send patches to <con...@gn...>. Submit a context +# diff and a properly formatted ChangeLog entry. +# +# This script attempts to guess a canonical system name similar to +# config.sub. If it succeeds, it prints the system name on stdout, and +# exits with 0. Otherwise, it exits with 1. +# +# The plan is that this can be called by configure scripts if you +# don't specify an explicit build system type. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to <con...@gn...>." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit 0 ;; + --version | -v ) + echo "$version" ; exit 0 ;; + --help | --h* | -h ) + echo "$usage"; exit 0 ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + +trap 'exit 1' 1 2 15 + +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ;' + +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +# (gh...@no... 1994-08-24) +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then + PATH=$PATH:/.attbin ; export PATH +fi + +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +# Note: order is significant - the case branches are not exclusive. + +case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep __ELF__ >/dev/null + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # The OS release + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit 0 ;; + amd64:OpenBSD:*:*) + echo x86_64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + cats:OpenBSD:*:*) + echo arm-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + luna88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + macppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvmeppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sgi:OpenBSD:*:*) + echo mips64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sun3:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + *:OpenBSD:*:*) + echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit 0 ;; + macppc:MirBSD:*:*) + echo powerppc-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; + alpha:OSF1:*:*) + case $UNAME_RELEASE in + *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit 0 ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix + exit 0 ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 + exit 0 ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 + exit 0;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos + exit 0 ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos + exit 0 ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit 0 ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit 0 ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit 0;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp + exit 0;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # ak...@wp... (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit 0 ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit 0 ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit 0 ;; + DRS?6000:UNIX_SV:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7 && exit 0 ;; + esac ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + i86pc:SunOS:5.*:*) + echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNA... [truncated message content] |
From: <or...@us...> - 2008-04-12 14:10:18
|
Revision: 305 http://open2x.svn.sourceforge.net/open2x/?rev=305&view=rev Author: orkie Date: 2008-04-12 07:10:17 -0700 (Sat, 12 Apr 2008) Log Message: ----------- Added a kexec syscall to the kernel. Tested and working, patch found here (a few minor alterations were needed to apply): Modified Paths: -------------- trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/config.in trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/kernel/Makefile trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/kernel/calls.S trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/tools/mach-types trunk/kernel/linux-open2x-2.4.26_FW2-3/include/linux/reboot.h trunk/kernel/linux-open2x-2.4.26_FW2-3/include/linux/sys.h trunk/kernel/linux-open2x-2.4.26_FW2-3/kernel/Makefile trunk/kernel/linux-open2x-2.4.26_FW2-3/kernel/sys.c Added Paths: ----------- trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/def-configs/irex_kexec trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/kernel/machine_kexec.c trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/kernel/relocate_kernel.S trunk/kernel/linux-open2x-2.4.26_FW2-3/include/asm-arm/kexec.h trunk/kernel/linux-open2x-2.4.26_FW2-3/include/linux/kexec.h trunk/kernel/linux-open2x-2.4.26_FW2-3/kernel/kexec.c Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/config.in =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/config.in 2008-04-11 21:12:04 UTC (rev 304) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/config.in 2008-04-12 14:10:17 UTC (rev 305) @@ -511,6 +511,7 @@ "$CONFIG_ARCH_INTEGRATOR" = "y" ]; then dep_bool 'Support CPU clock change (EXPERIMENTAL)' CONFIG_CPU_FREQ $CONFIG_EXPERIMENTAL fi +bool 'kexec system call' CONFIG_KEXEC source drivers/pci/Config.in bool 'Support for hot-pluggable devices' CONFIG_HOTPLUG Added: trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/def-configs/irex_kexec =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/def-configs/irex_kexec (rev 0) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/def-configs/irex_kexec 2008-04-12 14:10:17 UTC (rev 305) @@ -0,0 +1,1029 @@ +# +# Automatically generated make config: don't edit +# +CONFIG_ARM=y +# CONFIG_EISA is not set +# CONFIG_SBUS is not set +# CONFIG_MCA is not set +CONFIG_UID16=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set +# CONFIG_GENERIC_BUST_SPINLOCK is not set +# CONFIG_GENERIC_ISA_DMA is not set + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +# CONFIG_OBSOLETE is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +# CONFIG_MODVERSIONS is not set +# CONFIG_KMOD is not set + +# +# System Type +# +# CONFIG_ARCH_ANAKIN is not set +# CONFIG_ARCH_ARCA5K is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +CONFIG_ARCH_PXA=y +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_CAMELOT is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_OMAHA is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_MX1ADS is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_RISCSTATION is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_AT91RM9200DK is not set + +# +# Archimedes/A5000 Implementations +# + +# +# Archimedes/A5000 Implementations (select only ONE) +# +# CONFIG_ARCH_ARC is not set +# CONFIG_ARCH_A5K is not set + +# +# Footbridge Implementations +# +# CONFIG_ARCH_CATS is not set +# CONFIG_ARCH_PERSONAL_SERVER is not set +# CONFIG_ARCH_EBSA285_ADDIN is not set +# CONFIG_ARCH_EBSA285_HOST is not set +# CONFIG_ARCH_NETWINDER is not set + +# +# SA11x0 Implementations +# +# CONFIG_SA1100_ACCELENT is not set +# CONFIG_SA1100_ASSABET is not set +# CONFIG_ASSABET_NEPONSET is not set +# CONFIG_SA1100_ADSAGC is not set +# CONFIG_SA1100_ADSBITSY is not set +# CONFIG_SA1100_ADSBITSYPLUS is not set +# CONFIG_SA1100_BRUTUS is not set +# CONFIG_SA1100_CEP is not set +# CONFIG_SA1100_CERF is not set +# CONFIG_SA1100_H3100 is not set +# CONFIG_SA1100_H3600 is not set +# CONFIG_SA1100_H3800 is not set +# CONFIG_SA1100_H3XXX is not set +# CONFIG_H3600_SLEEVE is not set +# CONFIG_SA1100_EXTENEX1 is not set +# CONFIG_SA1100_FLEXANET is not set +# CONFIG_SA1100_FREEBIRD is not set +# CONFIG_SA1100_FRODO is not set +# CONFIG_SA1100_GRAPHICSCLIENT is not set +# CONFIG_SA1100_GRAPHICSMASTER is not set +# CONFIG_SA1100_HACKKIT is not set +# CONFIG_SA1100_BADGE4 is not set +# CONFIG_SA1100_JORNADA720 is not set +# CONFIG_SA1100_HUW_WEBPANEL is not set +# CONFIG_SA1100_ITSY is not set +# CONFIG_SA1100_LART is not set +# CONFIG_SA1100_NANOENGINE is not set +# CONFIG_SA1100_OMNIMETER is not set +# CONFIG_SA1100_PANGOLIN is not set +# CONFIG_SA1100_PLEB is not set +# CONFIG_SA1100_PT_SYSTEM3 is not set +# CONFIG_SA1100_SHANNON is not set +# CONFIG_SA1100_SHERMAN is not set +# CONFIG_SA1100_SIMPAD is not set +# CONFIG_SA1100_SIMPUTER is not set +# CONFIG_SA1100_PFS168 is not set +# CONFIG_SA1100_VICTOR is not set +# CONFIG_SA1100_XP860 is not set +# CONFIG_SA1100_YOPY is not set +# CONFIG_SA1100_USB is not set +# CONFIG_SA1100_USB_NETLINK is not set +# CONFIG_SA1100_USB_CHAR is not set +# CONFIG_SA1100_SSP is not set + +# +# Intel PXA250/210 Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_ARCH_PXA_CERF is not set +# CONFIG_ARCH_TRIZEPS2 is not set +CONFIG_MACH_PXA_IREX_ER0100=y +# CONFIG_PXA_USB is not set +# CONFIG_PXA_USB_NETLINK is not set +# CONFIG_PXA_USB_CHAR is not set + +# +# CLPS711X/EP721X Implementations +# +# CONFIG_ARCH_AUTCPU12 is not set +# CONFIG_ARCH_CDB89712 is not set +# CONFIG_ARCH_CLEP7312 is not set +# CONFIG_ARCH_EDB7211 is not set +# CONFIG_ARCH_FORTUNET is not set +# CONFIG_ARCH_GUIDEA07 is not set +# CONFIG_ARCH_P720T is not set +# CONFIG_ARCH_EP7211 is not set +# CONFIG_ARCH_EP7212 is not set +# CONFIG_ARCH_ACORN is not set +# CONFIG_FOOTBRIDGE is not set +# CONFIG_FOOTBRIDGE_HOST is not set +# CONFIG_FOOTBRIDGE_ADDIN is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +# CONFIG_CPU_26 is not set +# CONFIG_CPU_ARM610 is not set +# CONFIG_CPU_ARM710 is not set +# CONFIG_CPU_ARM720T is not set +# CONFIG_CPU_ARM920T is not set +# CONFIG_CPU_ARM922T is not set +# CONFIG_PLD is not set +# CONFIG_CPU_ARM926T is not set +# CONFIG_CPU_ARM1020 is not set +# CONFIG_CPU_ARM1026 is not set +# CONFIG_CPU_SA110 is not set +# CONFIG_CPU_SA1100 is not set +CONFIG_CPU_32v5=y +CONFIG_CPU_XSCALE=y +# CONFIG_XSCALE_CACHE_ERRATA is not set +# CONFIG_CPU_32v3 is not set +# CONFIG_CPU_32v4 is not set + +# +# Processor Features +# +# CONFIG_DISCONTIGMEM is not set + +# +# General setup +# +# CONFIG_PCI is not set +# CONFIG_ISA is not set +# CONFIG_ISA_DMA is not set +# CONFIG_ZBOOT_ROM is not set +CONFIG_ZBOOT_ROM_TEXT=0 +CONFIG_ZBOOT_ROM_BSS=0 +CONFIG_CPU_FREQ=y +CONFIG_KEXEC=y +CONFIG_HOTPLUG=y + +# +# PCMCIA/CardBus support +# +CONFIG_PCMCIA=y +# CONFIG_I82092 is not set +# CONFIG_I82365 is not set +# CONFIG_TCIC is not set +# CONFIG_PCMCIA_CLPS6700 is not set +# CONFIG_PCMCIA_SA1100 is not set +CONFIG_PCMCIA_PXA=y + +# +# MMC device drivers +# +CONFIG_MMC=m +CONFIG_MMC_PXA=m +CONFIG_MMC_BLOCK=m +# CONFIG_MMC_PARTITIONS is not set +CONFIG_NET=y +CONFIG_SYSVIPC=y +# CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_SYSCTL=y +# CONFIG_XIP_KERNEL is not set + +# +# At least one math emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_FASTFPE is not set +CONFIG_KCORE_ELF=y +# CONFIG_KCORE_AOUT is not set +# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_MISC is not set +CONFIG_PM=y +# CONFIG_ARTHUR is not set +CONFIG_CMDLINE="root=/dev/ram rw initrd=0xA1000000,4M rootfstype=ext2 init=/linuxrc rw console=ttyS2,115200 mem=64M" +CONFIG_ALIGNMENT_TRAP=y + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Memory Technology Devices (MTD) +# +# CONFIG_MTD is not set + +# +# Plug and Play configuration +# +# CONFIG_PNP is not set +# CONFIG_ISAPNP is not set + +# +# Block devices +# +# CONFIG_BLK_DEV_FD is not set +# CONFIG_BLK_DEV_XD is not set +# CONFIG_PARIDE is not set +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_CPQ_CISS_DA is not set +# CONFIG_CISS_SCSI_TAPE is not set +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_NBD is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_BLK_DEV_INITRD=y + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set +# CONFIG_BLK_DEV_MD is not set +# CONFIG_MD_LINEAR is not set +# CONFIG_MD_RAID0 is not set +# CONFIG_MD_RAID1 is not set +# CONFIG_MD_RAID5 is not set +# CONFIG_MD_MULTIPATH is not set +# CONFIG_BLK_DEV_LVM is not set + +# +# Networking options +# +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +# CONFIG_NETLINK_DEV is not set +# CONFIG_NETFILTER is not set +CONFIG_FILTER=y +CONFIG_UNIX=y +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_PNP=y +# CONFIG_IP_PNP_DHCP is not set +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_INET_ECN is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_IPV6 is not set +# CONFIG_KHTTPD is not set +# CONFIG_ATM is not set +# CONFIG_VLAN_8021Q is not set + +# +# +# +# CONFIG_IPX is not set +# CONFIG_ATALK is not set + +# +# Appletalk devices +# +# CONFIG_DEV_APPLETALK is not set +# CONFIG_DECNET is not set +# CONFIG_BRIDGE is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_LLC is not set +# CONFIG_NET_DIVERT is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_NET_FASTROUTE is not set +# CONFIG_NET_HW_FLOWCONTROL is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set + +# +# Network device support +# +CONFIG_NETDEVICES=y + +# +# ARCnet devices +# +# CONFIG_ARCNET is not set +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_ETHERTAP is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +# CONFIG_ARM_AM79C961A is not set +# CONFIG_ARM_CIRRUS is not set +# CONFIG_SUNLANCE is not set +# CONFIG_SUNBMAC is not set +# CONFIG_SUNQE is not set +# CONFIG_SUNGEM is not set +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_LANCE is not set +CONFIG_NET_VENDOR_SMC=y +# CONFIG_WD80x3 is not set +# CONFIG_ULTRAMCA is not set +# CONFIG_ULTRA is not set +# CONFIG_ULTRA32 is not set +# CONFIG_SMC9194 is not set +CONFIG_SMC91X=m +# CONFIG_NET_VENDOR_RACAL is not set +# CONFIG_NET_ISA is not set +# CONFIG_NET_PCI is not set +# CONFIG_NET_POCKET is not set + +# +# Ethernet (1000 Mbit) +# +# CONFIG_ACENIC is not set +# CONFIG_DL2K is not set +# CONFIG_MYRI_SBUS is not set +# CONFIG_NS83820 is not set +# CONFIG_HAMACHI is not set +# CONFIG_YELLOWFIN is not set +# CONFIG_SK98LIN is not set +# CONFIG_TIGON3 is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_PLIP is not set +CONFIG_PPP=m +# CONFIG_PPP_MULTILINK is not set +# CONFIG_PPP_FILTER is not set +CONFIG_PPP_ASYNC=m +# CONFIG_PPP_SYNC_TTY is not set +# CONFIG_PPP_DEFLATE is not set +# CONFIG_PPP_BSDCOMP is not set +# CONFIG_PPPOE is not set +# CONFIG_SLIP is not set + +# +# Wireless LAN (non-hamradio) +# +# CONFIG_NET_RADIO is not set + +# +# Token Ring devices +# +# CONFIG_TR is not set +# CONFIG_NET_FC is not set +# CONFIG_RCPCI is not set +# CONFIG_SHAPER is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set + +# +# PCMCIA network device support +# +CONFIG_NET_PCMCIA=y +# CONFIG_PCMCIA_3C589 is not set +# CONFIG_PCMCIA_3C574 is not set +# CONFIG_PCMCIA_FMVJ18X is not set +# CONFIG_PCMCIA_PCNET is not set +# CONFIG_PCMCIA_AXNET is not set +# CONFIG_PCMCIA_NMCLAN is not set +# CONFIG_PCMCIA_SMC91C92 is not set +# CONFIG_PCMCIA_XIRC2PS is not set +# CONFIG_ARCNET_COM20020_CS is not set +# CONFIG_PCMCIA_IBMTR is not set +CONFIG_NET_PCMCIA_RADIO=y +# CONFIG_PCMCIA_RAYCS is not set +# CONFIG_PCMCIA_NETWAVE is not set +# CONFIG_PCMCIA_WAVELAN is not set +# CONFIG_AIRONET4500_CS is not set + +# +# Amateur Radio support +# +# CONFIG_HAMRADIO is not set + +# +# IrDA (infrared) support +# +# CONFIG_IRDA is not set + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=m + +# +# IDE, ATA and ATAPI Block devices +# +CONFIG_BLK_DEV_IDE=m + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_HD_IDE is not set +# CONFIG_BLK_DEV_HD is not set +CONFIG_BLK_DEV_IDEDISK=m +# CONFIG_IDEDISK_MULTI_MODE is not set +# CONFIG_IDEDISK_STROKE is not set +# CONFIG_BLK_DEV_IDEDISK_VENDOR is not set +# CONFIG_BLK_DEV_IDEDISK_FUJITSU is not set +# CONFIG_BLK_DEV_IDEDISK_IBM is not set +# CONFIG_BLK_DEV_IDEDISK_MAXTOR is not set +# CONFIG_BLK_DEV_IDEDISK_QUANTUM is not set +# CONFIG_BLK_DEV_IDEDISK_SEAGATE is not set +# CONFIG_BLK_DEV_IDEDISK_WD is not set +# CONFIG_BLK_DEV_COMMERIAL is not set +# CONFIG_BLK_DEV_TIVO is not set +CONFIG_BLK_DEV_IDECS=m +# CONFIG_BLK_DEV_IDECD is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_BLK_DEV_IDEFLOPPY is not set +# CONFIG_BLK_DEV_IDESCSI is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +# CONFIG_BLK_DEV_CMD640 is not set +# CONFIG_BLK_DEV_CMD640_ENHANCED is not set +# CONFIG_BLK_DEV_ISAPNP is not set +# CONFIG_IDE_CHIPSETS is not set +# CONFIG_IDEDMA_AUTO is not set +# CONFIG_DMA_NONPCI is not set +# CONFIG_BLK_DEV_IDE_MODES is not set +# CONFIG_BLK_DEV_ATARAID is not set +# CONFIG_BLK_DEV_ATARAID_PDC is not set +# CONFIG_BLK_DEV_ATARAID_HPT is not set + +# +# SCSI support +# +CONFIG_SCSI=m + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_SD_EXTRA_DEVS=3 +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +# CONFIG_BLK_DEV_SR is not set +CONFIG_CHR_DEV_SG=m + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +# CONFIG_SCSI_DEBUG_QUEUES is not set +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set + +# +# SCSI low-level drivers +# +# CONFIG_SCSI_7000FASST is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AHA152X is not set +# CONFIG_SCSI_AHA1542 is not set +# CONFIG_SCSI_AHA1740 is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_IN2000 is not set +# CONFIG_SCSI_AM53C974 is not set +# CONFIG_SCSI_MEGARAID is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_DTC3280 is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_EATA_DMA is not set +# CONFIG_SCSI_EATA_PIO is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_GENERIC_NCR5380 is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_NCR53C406A is not set +# CONFIG_SCSI_NCR53C7xx is not set +# CONFIG_SCSI_PAS16 is not set +# CONFIG_SCSI_PCI2000 is not set +# CONFIG_SCSI_PCI2220I is not set +# CONFIG_SCSI_PSI240I is not set +# CONFIG_SCSI_QLOGIC_FAS is not set +# CONFIG_SCSI_SIM710 is not set +# CONFIG_SCSI_SYM53C416 is not set +# CONFIG_SCSI_T128 is not set +# CONFIG_SCSI_U14_34F is not set +# CONFIG_SCSI_DEBUG is not set + +# +# PCMCIA SCSI adapter support +# +# CONFIG_SCSI_PCMCIA is not set + +# +# I2O device support +# +# CONFIG_I2O is not set +# CONFIG_I2O_BLOCK is not set +# CONFIG_I2O_LAN is not set +# CONFIG_I2O_SCSI is not set +# CONFIG_I2O_PROC is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input core support +# +# CONFIG_INPUT is not set +# CONFIG_INPUT_KEYBDEV is not set +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_EVDEV is not set + +# +# Character devices +# +CONFIG_VT=y +# CONFIG_VT_CONSOLE is not set +CONFIG_SERIAL=y +CONFIG_SERIAL_CONSOLE=y +# CONFIG_SERIAL_EXTENDED is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_ANAKIN is not set +# CONFIG_SERIAL_ANAKIN_CONSOLE is not set +# CONFIG_SERIAL_AMBA is not set +# CONFIG_SERIAL_AMBA_CONSOLE is not set +# CONFIG_SERIAL_CLPS711X is not set +# CONFIG_SERIAL_CLPS711X_CONSOLE is not set +# CONFIG_SERIAL_21285 is not set +# CONFIG_SERIAL_21285_OLD is not set +# CONFIG_SERIAL_21285_CONSOLE is not set +# CONFIG_SERIAL_UART00 is not set +# CONFIG_SERIAL_UART00_CONSOLE is not set +# CONFIG_SERIAL_SA1100 is not set +# CONFIG_SERIAL_SA1100_CONSOLE is not set +# CONFIG_SERIAL_OMAHA is not set +# CONFIG_SERIAL_OMAHA_CONSOLE is not set +# CONFIG_SERIAL_AT91US3 is not set +# CONFIG_SERIAL_AT91US3_CONSOLE is not set +# CONFIG_SERIAL_8250 is not set +# CONFIG_SERIAL_8250_CONSOLE is not set +# CONFIG_SERIAL_8250_EXTENDED is not set +# CONFIG_SERIAL_8250_MANY_PORTS is not set +# CONFIG_SERIAL_8250_SHARE_IRQ is not set +# CONFIG_SERIAL_8250_DETECT_IRQ is not set +# CONFIG_SERIAL_8250_MULTIPORT is not set +# CONFIG_SERIAL_8250_HUB6 is not set +CONFIG_UNIX98_PTYS=y +CONFIG_UNIX98_PTY_COUNT=64 + +# +# I2C support +# +CONFIG_I2C=y +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +CONFIG_I2C_PXA_ALGO=y +CONFIG_I2C_PXA_ADAP=y +# CONFIG_I2C_CHARDEV is not set +# CONFIG_I2C_PROC is not set +# CONFIG_I2C_DS1307 is not set + +# +# L3 serial bus support +# +# CONFIG_L3 is not set +# CONFIG_L3_ALGOBIT is not set +# CONFIG_L3_BIT_SA1100_GPIO is not set + +# +# Other L3 adapters +# +# CONFIG_L3_SA1111 is not set +# CONFIG_BIT_SA1100_GPIO is not set + +# +# Mice +# +# CONFIG_BUSMOUSE is not set +# CONFIG_MOUSE is not set + +# +# Joysticks +# +# CONFIG_INPUT_GAMEPORT is not set + +# +# Input core support is needed for gameports +# + +# +# Input core support is needed for joysticks +# +# CONFIG_QIC02_TAPE is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +# CONFIG_NVRAM is not set +# CONFIG_RTC is not set +CONFIG_PXA_RTC=y +CONFIG_PCF8563_RTC=y +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_FTAPE is not set +# CONFIG_AGP is not set +# CONFIG_DRM is not set + +# +# PCMCIA character devices +# +CONFIG_PCMCIA_SERIAL_CS=m + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# +# File systems +# +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_ADFS_FS is not set +# CONFIG_ADFS_FS_RW is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EXT3_FS is not set +# CONFIG_JBD is not set +# CONFIG_JBD_DEBUG is not set +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +# CONFIG_UMSDOS_FS is not set +CONFIG_VFAT_FS=y +# CONFIG_EFS_FS is not set +# CONFIG_JFFS_FS is not set +# CONFIG_JFFS2_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_CRAMFS_LINEAR is not set +# CONFIG_CRAMFS_LINEAR_XIP is not set +# CONFIG_ROOT_CRAMFS_LINEAR is not set +# CONFIG_TMPFS is not set +CONFIG_RAMFS=y +# CONFIG_ISO9660_FS is not set +# CONFIG_JOLIET is not set +# CONFIG_ZISOFS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_NTFS_FS is not set +# CONFIG_NTFS_RW is not set +# CONFIG_HPFS_FS is not set +CONFIG_PROC_FS=y +# CONFIG_DEVFS_FS is not set +# CONFIG_DEVFS_MOUNT is not set +# CONFIG_DEVFS_DEBUG is not set +CONFIG_DEVPTS_FS=y +# CONFIG_QNX4FS_FS is not set +# CONFIG_QNX4FS_RW is not set +# CONFIG_ROMFS_FS is not set +CONFIG_EXT2_FS=y +# CONFIG_SYSV_FS is not set +# CONFIG_UDF_FS is not set +# CONFIG_UDF_RW is not set +# CONFIG_UFS_FS is not set +# CONFIG_UFS_FS_WRITE is not set + +# +# Network File Systems +# +# CONFIG_CODA_FS is not set +# CONFIG_INTERMEZZO_FS is not set +# CONFIG_NFS_FS is not set +# CONFIG_NFS_V3 is not set +# CONFIG_ROOT_NFS is not set +# CONFIG_NFSD is not set +# CONFIG_NFSD_V3 is not set +# CONFIG_SUNRPC is not set +# CONFIG_LOCKD is not set +CONFIG_CIFS=m +# CONFIG_SMB_FS is not set +# CONFIG_SMB_NLS_DEFAULT is not set +# CONFIG_NCP_FS is not set +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +# CONFIG_NCPFS_NFS_NS is not set +# CONFIG_NCPFS_OS2_NS is not set +# CONFIG_NCPFS_SMALLDOS is not set +# CONFIG_NCPFS_NLS is not set +# CONFIG_NCPFS_EXTRAS is not set +# CONFIG_ZISOFS_FS is not set +# CONFIG_ZLIB_FS_INFLATE is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y +CONFIG_SMB_NLS=y +CONFIG_NLS=y + +# +# Native Language Support +# +CONFIG_NLS_DEFAULT="iso8859-1" +# CONFIG_NLS_CODEPAGE_437 is not set +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# 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_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ISO8859_1 is not set +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# 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_U is not set +CONFIG_NLS_UTF8=y + +# +# Console drivers +# +CONFIG_PC_KEYMAP=y +# CONFIG_VGA_CONSOLE is not set + +# +# Frame-buffer support +# +CONFIG_FB=y +CONFIG_DUMMY_CONSOLE=y +# CONFIG_FB_ACORN is not set +# CONFIG_FB_ANAKIN is not set +# CONFIG_FB_CLPS711X is not set +# CONFIG_FB_SA1100 is not set +# CONFIG_FB_PXA is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FBCON_ADVANCED is not set +CONFIG_FBCON_FONTWIDTH8_ONLY=y +# CONFIG_FBCON_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y + +# +# Sound +# +CONFIG_SOUND=y +# CONFIG_SOUND_BT878 is not set +# CONFIG_SOUND_CMPCI is not set +# CONFIG_SOUND_EMU10K1 is not set +# CONFIG_MIDI_EMU10K1 is not set +# CONFIG_SOUND_FUSION is not set +# CONFIG_SOUND_CS4281 is not set +# CONFIG_SOUND_ES1370 is not set +# CONFIG_SOUND_ES1371 is not set +# CONFIG_SOUND_ESSSOLO1 is not set +# CONFIG_SOUND_MAESTRO is not set +# CONFIG_SOUND_MAESTRO3 is not set +# CONFIG_SOUND_ICH is not set +# CONFIG_SOUND_RME96XX is not set +# CONFIG_SOUND_SONICVIBES is not set +# CONFIG_SOUND_TRIDENT is not set +# CONFIG_SOUND_MSNDCLAS is not set +# CONFIG_SOUND_MSNDPIN is not set +# CONFIG_SOUND_VIA82CXXX is not set +# CONFIG_MIDI_VIA82CXXX is not set +# CONFIG_SOUND_OSS is not set +# CONFIG_SOUND_VIDC is not set +# CONFIG_SOUND_WAVEARTIST is not set +CONFIG_SOUND_PXA_AC97=y +# CONFIG_SOUND_TVMIXER is not set + +# +# Multimedia Capabilities Port drivers +# +# CONFIG_MCP is not set +# CONFIG_MCP_SA1100 is not set +# CONFIG_MCP_UCB1200 is not set +# CONFIG_MCP_UCB1200_AUDIO is not set +# CONFIG_MCP_UCB1200_TS is not set +CONFIG_MCP_UCB1400_TS=y + +# +# USB support +# +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_BANDWIDTH is not set +# CONFIG_USB_LONG_TIMEOUT is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_EHCI_HCD is not set +# CONFIG_USB_UHCI is not set +# CONFIG_USB_UHCI_ALT is not set +# CONFIG_USB_OHCI is not set +# CONFIG_USB_OHCI_SA1111 is not set + +# +# USB Device Class drivers +# +# CONFIG_USB_AUDIO is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_BLUETOOTH is not set +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_DPCM is not set +# CONFIG_USB_STORAGE_HP8200e is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set + +# +# USB Human Interface Devices (HID) +# +# CONFIG_USB_HID is not set + +# +# Input core support is needed for USB HID input layer or HIDBP support +# +# CONFIG_USB_HIDINPUT is not set +# CONFIG_USB_HIDDEV is not set +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +# CONFIG_USB_WACOM is not set + +# +# USB Imaging devices +# +# CONFIG_USB_DC2XX is not set +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_SCANNER is not set +# CONFIG_USB_MICROTEK is not set +# CONFIG_USB_HPUSBSCSI is not set + +# +# USB Multimedia devices +# + +# +# Video4Linux support is needed for USB Multimedia device support +# + +# +# USB Network adaptors +# +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_CATC is not set +# CONFIG_USB_CDCETHER is not set +# CONFIG_USB_USBNET is not set + +# +# USB port drivers +# +# CONFIG_USB_USS720 is not set + +# +# USB Serial Converter support +# +# CONFIG_USB_SERIAL is not set +# CONFIG_USB_SERIAL_GENERIC is not set +# CONFIG_USB_SERIAL_BELKIN is not set +# CONFIG_USB_SERIAL_WHITEHEAT is not set +# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set +# CONFIG_USB_SERIAL_EMPEG is not set +# CONFIG_USB_SERIAL_FTDI_SIO is not set +# CONFIG_USB_SERIAL_VISOR is not set +# CONFIG_USB_SERIAL_IPAQ is not set +# CONFIG_USB_SERIAL_IR is not set +# CONFIG_USB_SERIAL_EDGEPORT is not set +# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set +# CONFIG_USB_SERIAL_KEYSPAN is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set +# CONFIG_USB_SERIAL_MCT_U232 is not set +# CONFIG_USB_SERIAL_KLSI is not set +# CONFIG_USB_SERIAL_PL2303 is not set +# CONFIG_USB_SERIAL_CYBERJACK is not set +# CONFIG_USB_SERIAL_XIRCOM is not set +# CONFIG_USB_SERIAL_OMNINET is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_BRLVGER is not set + +# +# Bluetooth support +# +# CONFIG_BLUEZ is not set + +# +# Kernel hacking +# +CONFIG_FRAME_POINTER=y +# CONFIG_DEBUG_USER is not set +CONFIG_DEBUG_INFO=y +# CONFIG_NO_PGT_CACHE is not set +# CONFIG_DEBUG_KERNEL is not set +# CONFIG_DEBUG_SLAB is not set +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_WAITQ is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +# CONFIG_DEBUG_ERRORS is not set +# CONFIG_DEBUG_LL is not set +# CONFIG_DEBUG_DC21285_PORT is not set +# CONFIG_DEBUG_CLPS711X_UART2 is not set +# CONFIG_TRACE32_DBG is not set Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/kernel/Makefile =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/kernel/Makefile 2008-04-11 21:12:04 UTC (rev 304) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/kernel/Makefile 2008-04-12 14:10:17 UTC (rev 305) @@ -59,6 +59,7 @@ obj-$(CONFIG_ARTHUR) += arthur.o obj-$(CONFIG_ISA_DMA) += dma-isa.o obj-$(CONFIG_PCI) += bios32.o $(pci-$(MACHINE)) $(pci-y) +obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o ifneq ($(MACHINE),ebsa110) obj-y += io.o Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/kernel/calls.S =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/kernel/calls.S 2008-04-11 21:12:04 UTC (rev 304) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/kernel/calls.S 2008-04-12 14:10:17 UTC (rev 305) @@ -10,7 +10,7 @@ * This file is included twice in entry-common.S */ #ifndef NR_syscalls -#define NR_syscalls 288 +#define NR_syscalls 348 #else __syscall_start: @@ -271,6 +271,101 @@ .long SYMBOL_NAME(sys_ni_syscall) /* set_thread_area */ /* 255 */ .long SYMBOL_NAME(sys_ni_syscall) /* get_thread_area */ .long SYMBOL_NAME(sys_ni_syscall) /* set_tid_address */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ +/* 260 */ .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ +/* 265 */ .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ +/* 270 */ .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ +/* 275 */ .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ +/* 280 */ .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ +/* 285 */ .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ +/* 290 */ .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ +/* 295 */ .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ +/* 300 */ .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ +/* 305 */ .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ +/* 310 */ .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ +/* 315 */ .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ +/* 320 */ .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ +/* 325 */ .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ +/* 330 */ .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ +/* 335 */ .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ +/* 340 */ .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ +/* 345 */ .long SYMBOL_NAME(sys_ni_syscall) /* padding */ + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ +#ifdef CONFIG_KEXEC + .long SYMBOL_NAME(sys_kexec_load) +#else + .long SYMBOL_NAME(sys_ni_syscall) /* padding */ +#endif __syscall_end: .rept NR_syscalls - (__syscall_end - __syscall_start) / 4 Added: trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/kernel/machine_kexec.c =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/kernel/machine_kexec.c (rev 0) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/kernel/machine_kexec.c 2008-04-12 14:10:17 UTC (rev 305) @@ -0,0 +1,78 @@ +/* + * machine_kexec.c - handle transition of Linux booting another kernel + */ + +#include <linux/mm.h> +#include <linux/kexec.h> +#include <linux/delay.h> +#include <linux/reboot.h> +#include <asm/pgtable.h> +#include <asm/pgalloc.h> +#include <asm/mmu_context.h> +#include <asm/io.h> +//MV #include <asm/cacheflush.h> +#include <asm/mach-types.h> + +const extern unsigned char relocate_new_kernel[]; +const extern unsigned int relocate_new_kernel_size; + +extern void setup_mm_for_reboot(char mode); + +extern unsigned long kexec_start_address; +extern unsigned long kexec_indirection_page; +extern unsigned long kexec_mach_type; + +/* + * Provide a dummy crash_notes definition while crash dump arrives to arm. + * This prevents breakage of crash_notes attribute in kernel/ksysfs.c. + */ + +int machine_kexec_prepare(struct kimage *image) +{ + return 0; +} + +void machine_kexec_cleanup(struct kimage *image) +{ +} + +void machine_shutdown(void) +{ +} + +void machine_crash_shutdown(struct pt_regs *regs) +{ +} + +void machine_kexec(struct kimage *image) +{ + unsigned long page_list; + unsigned long reboot_code_buffer_phys; + void *reboot_code_buffer; + + + page_list = image->head & PAGE_MASK; + + /* we need both effective and real address here */ + reboot_code_buffer_phys = + page_to_pfn(image->control_code_page) << PAGE_SHIFT; + reboot_code_buffer = page_address(image->control_code_page); + + /* Prepare parameters for reboot_code_buffer*/ + kexec_start_address = image->start; + kexec_indirection_page = page_list; + kexec_mach_type = machine_arch_type; + + /* copy our kernel relocation code to the control code page */ + memcpy(reboot_code_buffer, + relocate_new_kernel, relocate_new_kernel_size); + + + flush_icache_range((unsigned long) reboot_code_buffer, + (unsigned long) reboot_code_buffer + KEXEC_CONTROL_CODE_SIZE); + printk(KERN_INFO "Bye!\n"); + + cpu_proc_fin(); + setup_mm_for_reboot(0); /* mode is not used, so just pass 0*/ + cpu_reset(reboot_code_buffer_phys); +} Added: trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/kernel/relocate_kernel.S =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/kernel/relocate_kernel.S (rev 0) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/kernel/relocate_kernel.S 2008-04-12 14:10:17 UTC (rev 305) @@ -0,0 +1,74 @@ +/* + * relocate_kernel.S - put the kernel image in place to boot + */ + +#include <asm/kexec.h> + + .globl relocate_new_kernel +relocate_new_kernel: + + ldr r0,kexec_indirection_page + ldr r1,kexec_start_address + + +0: /* top, read another word for the indirection page */ + ldr r3, [r0],#4 + + /* Is it a destination page. Put destination address to r4 */ + tst r3,#1,0 + beq 1f + bic r4,r3,#1 + b 0b +1: + /* Is it an indirection page */ + tst r3,#2,0 + beq 1f + bic r0,r3,#2 + b 0b +1: + + /* are we done ? */ + tst r3,#4,0 + beq 1f + b 2f + +1: + /* is it source ? */ + tst r3,#8,0 + beq 0b + bic r3,r3,#8 + mov r6,#1024 +9: + ldr r5,[r3],#4 + str r5,[r4],#4 + subs r6,r6,#1 + bne 9b + b 0b + +2: + /* Jump to relocated kernel */ + mov lr,r1 + mov r0,#0 + ldr r1,kexec_mach_type + mov r2,#0 + mov pc,lr + + .globl kexec_start_address +kexec_start_address: + .long 0x0 + + .globl kexec_indirection_page +kexec_indirection_page: + .long 0x0 + + .globl kexec_mach_type +kexec_mach_type: + .long 0x0 + +relocate_new_kernel_end: + + .globl relocate_new_kernel_size +relocate_new_kernel_size: + .long relocate_new_kernel_end - relocate_new_kernel + + Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/tools/mach-types =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/tools/mach-types 2008-04-11 21:12:04 UTC (rev 304) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/arch/arm/tools/mach-types 2008-04-12 14:10:17 UTC (rev 305) @@ -2,12 +2,18 @@ # # This file is linux/arch/arm/tools/mach-types # +# Up to date versions of this file can be obtained from: +# +# http://www.arm.linux.org.uk/developer/machines/download.php +# # Please do not send patches to this file; it is automatically generated! # To add an entry into this database, please see Documentation/arm/README, -# or contact rm...@ar... +# or visit: # -# Last update: Tue Feb 10 17:10:34 2004 +# http://www.arm.linux.org.uk/developer/machines/?action=new # +# Last update: Sat Apr 12 11:08:49 2008 +# # machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number # ebsa110 ARCH_EBSA110 EBSA110 0 @@ -73,7 +79,7 @@ aln SA1100_ALN ALN 61 epxa ARCH_CAMELOT CAMELOT 62 gds2200 SA1100_GDS2200 GDS2200 63 -psion_series7 SA1100_PSION_SERIES7 PSION_SERIES7 64 +netbook SA1100_PSION_SERIES7 PSION_SERIES7 64 xfile SA1100_XFILE XFILE 65 accelent_ep9312 ARCH_ACCELENT_EP9312 ACCELENT_EP9312 66 ic200 ARCH_IC200 IC200 67 @@ -226,7 +232,7 @@ pnp1110 SA1100_PNP1110 PNP1110 215 csb226 ARCH_CSB226 CSB226 216 arnold SA1100_ARNOLD ARNOLD 217 -psiboard SA1100_PSIBOARD PSIBOARD 218 +voiceblue MACH_VOICEBLUE VOICEBLUE 218 jz8028 ARCH_JZ8028 JZ8028 219 h5400 ARCH_H5400 H5400 220 forte SA1100_FORTE FORTE 221 @@ -242,16 +248,16 @@ yoho ARCH_YOHO YOHO 231 jasper ARCH_JASPER JASPER 232 dsc25 ARCH_DSC25 DSC25 233 -innovator ARCH_INNOVATOR INNOVATOR 234 -ramses ARCH_RAMSES RAMSES 235 +omap_innovator MACH_OMAP_INNOVATOR OMAP_INNOVATOR 234 +mnci ARCH_RAMSES RAMSES 235 s28x ARCH_S28X S28X 236 mport3 ARCH_MPORT3 MPORT3 237 pxa_eagle250 ARCH_PXA_EAGLE250 PXA_EAGLE250 238 pdb ARCH_PDB PDB 239 blue_2g SA1100_BLUE_2G BLUE_2G 240 bluearch SA1100_BLUEARCH BLUEARCH 241 -ixdp2400 ARCH_IXMB2400 IXMB2400 242 -ixdp2800 ARCH_IXMB2800 IXMB2800 243 +ixdp2400 ARCH_IXDP2400 IXDP2400 242 +ixdp2800 ARCH_IXDP2800 IXDP2800 243 explorer SA1100_EXPLORER EXPLORER 244 ixdp425 ARCH_IXDP425 IXDP425 245 chimp ARCH_CHIMP CHIMP 246 @@ -260,7 +266,7 @@ wismo SA1100_WISMO WISMO 249 ezlinx ARCH_EZLINX EZLINX 250 at91rm9200 ARCH_AT91RM9200 AT91RM9200 251 -orion ARCH_ORION ORION 252 +adtech_orion ARCH_ADTECH_ORION ADTECH_ORION 252 neptune ARCH_NEPTUNE NEPTUNE 253 hackkit SA1100_HACKKIT HACKKIT 254 pxa_wins30 ARCH_PXA_WINS30 PXA_WINS30 255 @@ -295,7 +301,7 @@ adsbitsyplus SA1100_ADSBITSYPLUS ADSBITSYPLUS 284 adsagc SA1100_ADSAGC ADSAGC 285 stp7312 ARCH_STP7312 STP7312 286 -nx_phnx ARCH_PXA255 PXA255 287 +nx_phnx MACH_NX_PHNX NX_PHNX 287 wep_ep250 ARCH_WEP_EP250 WEP_EP250 288 inhandelf3 ARCH_INHANDELF3 INHANDELF3 289 adi_coyote ARCH_ADI_COYOTE ADI_COYOTE 290 @@ -375,13 +381,13 @@ se4000 ARCH_SE4000 SE4000 364 quadriceps ARCH_QUADRICEPS QUADRICEPS 365 bronco ARCH_BRONCO BRONCO 366 -esl_wireless_tab ARCH_ESL_WIRELESS_TABLETESL_WIRELESS_TABLET 367 +esl_wireless_tab ARCH_ESL_WIRELESS_TAB ESL_WIRELESS_TAB 367 esl_sofcomp ARCH_ESL_SOFCOMP ESL_SOFCOMP 368 s5c7375 ARCH_S5C7375 S5C7375 369 spearhead ARCH_SPEARHEAD SPEARHEAD 370 pantera ARCH_PANTERA PANTERA 371 prayoglite ARCH_PRAYOGLITE PRAYOGLITE 372 -gumstik ARCH_GUMSTIK GUMSTIK 373 +gumstix ARCH_GUMSTIX GUMSTIX 373 rcube ARCH_RCUBE RCUBE 374 rea_olv ARCH_REA_OLV REA_OLV 375 pxa_iphone ARCH_PXA_IPHONE PXA_IPHONE 376 @@ -390,9 +396,9 @@ mp1x ARCH_MP1X MP1X 379 at91rm9200tb ARCH_AT91RM9200TB AT91RM9200TB 380 adsvgx ARCH_ADSVGX ADSVGX 381 -omap1610 ARCH_OMAP1610 OMAP1610 382 +omap_h2 MACH_OMAP_H2 OMAP_H2 382 pelee ARCH_PELEE PELEE 383 -e7xx ARCH_E7XX E7XX 384 +e740 MACH_E740 E740 384 iq80331 ARCH_IQ80331 IQ80331 385 versatile_pb ARCH_VERSATILE_PB VERSATILE_PB 387 kev7a400 MACH_KEV7A400 KEV7A400 388 @@ -421,7 +427,7 @@ mport3s MACH_MPORT3S MPORT3S 411 ra_alpha MACH_RA_ALPHA RA_ALPHA 412 xcep MACH_XCEP XCEP 413 -arcom_mercury MACH_ARCOM_MERCURY ARCOM_MERCURY 414 +arcom_vulcan MACH_ARCOM_VULCAN ARCOM_VULCAN 414 stargate MACH_STARGATE STARGATE 415 armadilloj MACH_ARMADILLOJ ARMADILLOJ 416 elroy_jack MACH_ELROY_JACK ELROY_JACK 417 @@ -454,7 +460,7 @@ xm250 MACH_XM250 XM250 444 t6tc1xb MACH_T6TC1XB T6TC1XB 445 ess710 MACH_ESS710 ESS710 446 -mx3ads MACH_MX3ADS MX3ADS 447 +mx31ads MACH_MX31ADS MX31ADS 447 himalaya MACH_HIMALAYA HIMALAYA 448 bolfenk MACH_BOLFENK BOLFENK 449 at91rm9200kr MACH_AT91RM9200KR AT91RM9200KR 450 @@ -464,4 +470,1247 @@ eb67xdip MACH_EB67XDIP EB67XDIP 454 webtxs MACH_WEBTXS WEBTXS 455 hawk MACH_HAWK HAWK 456 +ccat91sbc001 MACH_CCAT91SBC001 CCAT91SBC001 457 +expresso MACH_EXPRESSO EXPRESSO 458 +h4000 MACH_H4000 H4000 459 +dino MACH_DINO DINO 460 +ml675k MACH_ML675K ML675K 461 +edb9301 MACH_EDB9301 EDB9301 462 +edb9315 MACH_EDB9315 EDB9315 463 +reciva_tt MACH_RECIVA_TT RECIVA_TT 464 +cstcb01 MACH_CSTCB01 CSTCB01 465 +cstcb1 MACH_CSTCB1 CSTCB1 466 +shadwell MACH_SHADWELL SHADWELL 467 +goepel263 MACH_GOEPEL263 GOEPEL263 468 +acq100 MACH_ACQ100 ACQ100 469 +mx1fs2 MACH_MX1FS2 MX1FS2 470 +hiptop_g1 MACH_HIPTOP_G1 HIPTOP_G1 471 +sparky MACH_SPARKY SPARKY 472 +ns9750 MACH_NS9750 NS9750 473 +phoenix MACH_PHOENIX PHOENIX 474 +vr1000 MACH_VR1000 VR1000 475 +deisterpxa MACH_DEISTERPXA DEISTERPXA 476 +bcm1160 MACH_BCM1160 BCM1160 477 +pcm022 MACH_PCM022 PCM022 478 +adsgcx MACH_ADSGCX ADSGCX 479 +dreadnaught MACH_DREADNAUGHT DREADNAUGHT 480 +dm320 MACH_DM320 DM320 481 +markov MACH_MARKOV MARKOV 482 +cos7a400 MACH_COS7A400 COS7A400 483 +milano MACH_MILANO MILANO 484 +ue9328 MACH_UE9328 UE9328 485 +uex255 MACH_UEX255 UEX255 486 +ue2410 MACH_UE2410 UE2410 487 +a620 MACH_A620 A620 488 +ocelot MACH_OCELOT OCELOT 489 +cheetah MACH_CHEETAH CHEETAH 490 +omap_perseus2 MACH_OMAP_PERSEUS2 OMAP_PERSEUS2 491 +zvue MACH_ZVUE ZVUE 492 +roverp1 MACH_ROVERP1 ROVERP1 493 +asidial2 MACH_ASIDIAL2 ASIDIAL2 494 +s3c24a0 MACH_S3C24A0 S3C24A0 495 +e800 MACH_E800 E800 496 +e750 MACH_E750 E750 497 +s3c5500 MACH_S3C5500 S3C5500 498 +smdk5500 MACH_SMDK5500 SMDK5500 499 +signalsync MACH_SIGNALSYNC SIGNALSYNC 500 +nbc MACH_NBC NBC 501 +kodiak MACH_KODIAK KODIAK 502 +netbookpro MACH_NETBOOKPRO NETBOOKPRO 503 +hw90200 MACH_HW90200 HW90200 504 +condor MACH_CONDOR CONDOR 505 +cup MACH_CUP CUP 506 +kite MACH_KITE KITE 507 +scb9328 MACH_SCB9328 SCB9328 508 +omap_h3 MACH_OMAP_H3 OMAP_H3 509 +omap_h4 MACH_OMAP_H4 OMAP_H4 510 +n10 MACH_N10 N10 511 +montejade MACH_MONTAJADE MONTAJADE 512 +sg560 MACH_SG560 SG560 513 +dp1000 MACH_DP1000 DP1000 514 +omap_osk MACH_OMAP_OSK OMAP_OSK 515 +rg100v3 MACH_RG100V3 RG100V3 516 +mx2ads MACH_MX2ADS MX2ADS 517 +pxa_kilo MACH_PXA_KILO PXA_KILO 518 +ixp4xx_eagle MACH_IXP4XX_EAGLE IXP4XX_EAGLE 519 +tosa MACH_TOSA TOSA 520 +mb2520f MACH_MB2520F MB2520F 521 +emc1000 MACH_EMC1000 EMC1000 522 +tidsc25 MACH_TIDSC25 TIDSC25 523 +akcpmxl MACH_AKCPMXL AKCPMXL 524 +av3xx MACH_AV3XX AV3XX 525 +avila MACH_AVILA AVILA 526 +pxa_mpm10 MACH_PXA_MPM10 PXA_MPM10 527 +pxa_kyanite MACH_PXA_KYANITE PXA_KYANITE 528 +sgold MACH_SGOLD SGOLD 529 +oscar MACH_OSCAR OSCAR 530 +epxa4usb2 MACH_EPXA4USB2 EPXA4USB2 531 +xsengine MACH_XSENGINE XSENGINE 532 +ip600 MACH_IP600 IP600 533 +mcan2 MACH_MCAN2 MCAN2 534 +ddi_blueridge MACH_DDI_BLUERIDGE DDI_BLUERIDGE 535 +skyminder MACH_SKYMINDER SKYMINDER 536 +lpd79520 MACH_LPD79520 LPD79520 537 +edb9302 MACH_EDB9302 EDB9302 538 +hw90340 MACH_HW90340 HW90340 539 +cip_box MACH_CIP_BOX CIP_BOX 540 +ivpn MACH_IVPN IVPN 541 +rsoc2 MACH_RSOC2 RSOC2 542 +husky MACH_HUSKY HUSKY 543 +boxer MACH_BOXER BOXER 544 +shepherd MACH_SHEPHERD SHEPHERD 545 +aml42800aa MACH_AML42800AA AML42800AA 546 +ml674001 MACH_MACH_TYPE_ML674001 MACH_TYPE_ML674001 547 +lpc2294 MACH_LPC2294 LPC2294 548 +switchgrass MACH_SWITCHGRASS SWITCHGRASS 549 +ens_cmu MACH_ENS_CMU ENS_CMU 550 +mm6_sdb MACH_MM6_SDB MM6_SDB 551 +saturn MACH_SATURN SATURN 552 +i30030evb MACH_I30030EVB I30030EVB 553 +mxc27530evb MACH_MXC27530EVB MXC27530EVB 554 +smdk2800 MACH_SMDK2800 SMDK2800 555 +mtwilson MACH_MTWILSON MTWILSON 556 +ziti MACH_ZITI ZITI 557 +grandfather MACH_GRANDFATHER GRANDFATHER 558 +tengine MACH_TENGINE TENGINE 559 +s3c2460 MACH_S3C2460 S3C2460 560 +pdm MACH_PDM PDM 561 +h4700 MACH_H4700 H4700 562 +h6300 MACH_H6300 H6300 563 +rz1700 MACH_RZ1700 RZ1700 564 +a716 MACH_A716 A716 565 +estk2440a MACH_ESTK2440A ESTK2440A 566 +atwixp425 MACH_ATWIXP425 ATWIXP425 567 +csb336 MACH_CSB336 CSB336 568 +rirm2 MACH_RIRM2 RIRM2 569 +cx23518 MACH_CX23518 CX23518 570 +cx2351x MACH_CX2351X CX2351X 571 +computime MACH_COMPUTIME COMPUTIME 572 +izarus MACH_IZARUS IZARUS 573 +pxa_rts MACH_RTS RTS 574 +se5100 MACH_SE5100 SE5100 575 +s3c2510 MACH_S3C2510 S3C2510 576 +csb437tl MACH_CSB437TL CSB437TL 577 +slauson MACH_SLAUSON SLAUSON 578 +pearlriver MACH_PEARLRIVER PEARLRIVER 579 +tdc_p210 MACH_TDC_P210 TDC_P210 580 +sg580 MACH_SG580 SG580 581 +wrsbcarm7 MACH_WRSBCARM7 WRSBCARM7 582 +ipd MACH_IPD IPD 583 +pxa_dnp2110 MACH_PXA_DNP2110 PXA_DNP2110 584 +xaeniax MACH_XAENIAX XAENIAX 585 +somn4250 MACH_SOMN4250 SOMN4250 586 +pleb2 MACH_PLEB2 PLEB2 587 +cornwallis MACH_CORNWALLIS CORNWALLIS 588 +gurney_drv MACH_GURNEY_DRV GURNEY_DRV 589 +chaffee MACH_CHAFFEE CHAFFEE 590 +rms101 MACH_RMS101 RMS101 591 +rx3715 MACH_RX3715 RX3715 592 +swift MACH_SWIFT SWIFT 593 +roverp7 MACH_ROVERP7 ROVERP7 594 +pr818s MACH_PR818S PR818S 595 +trxpro MACH_TRXPRO TRXPRO 596 +nslu2 MACH_NSLU2 NSLU2 597 +e400 MACH_E400 E400 598 +trab MACH_TRAB TRAB 599 +cmc_pu2 MACH_CMC_PU2 CMC_PU2 600 +fulcrum MACH_FULCRUM FULCRUM 601 +netgate42x MACH_NETGATE42X NETGATE42X 602 +str710 MACH_STR710 STR710 603 +ixdpg425 MACH_IXDPG425 IXDPG425 604 +tomtomgo MACH_TOMTOMGO TOMTOMGO 605 +versatile_ab MACH_VERSATILE_AB VERSATILE_AB 606 +edb9307 MACH_EDB9307 EDB9307 607 +sg565 MACH_SG565 SG565 608 +lpd79524 MACH_LPD79524 LPD79524 609 +lpd79525 MACH_LPD79525 LPD79525 610 +rms100 MACH_RMS100 RMS100 611 +kb9200 MACH_KB9200 KB9200 612 +sx1 MACH_SX1 SX1 613 +hms39c7092 MACH_HMS39C7092 HMS39C7092 614 +armadillo MACH_ARMADILLO ARMADILLO 615 +ipcu MACH_IPCU IPCU 616 +loox720 MACH_LOOX720 LOOX720 617 +ixdp465 MACH_IXDP465 IXDP465 618 +ixdp2351 MACH_IXDP2351 IXDP2351 619 +adsvix MACH_ADSVIX ADSVIX 620 +dm270 MACH_DM270 DM270 621 +socltplus MACH_SOCLTPLUS SOCLTPLUS 622 +ecia MACH_ECIA ECIA 623 +cm4008 MACH_CM4008 CM4008 624 +p2001 MACH_P2001 P2001 625 +twister MACH_TWISTER TWISTER 626 +mudshark MACH_MUDSHARK MUDSHARK 627 +hb2 MACH_HB2 HB2 628 +iq80332 MACH_IQ80332 IQ80332 629 +sendt MACH_SENDT SENDT 630 +mx2jazz MACH_MX2JAZZ MX2JAZZ 631 +multiio MACH_MULTIIO MULTIIO 632 +hrdisplay MACH_HRDISPLAY HRDISPLAY 633 +mxc27530ads MACH_MXC27530ADS MXC27530ADS 634 +trizeps3 MACH_TRIZEPS3 TRIZEPS3 635 +zefeerdza MACH_ZEFEERDZA ZEFEERDZA 636 +zefeerdzb MACH_ZEFEERDZB ZEFEERDZB 637 +zefeerdzg MACH_ZEFEERDZG ZEFEERDZG 638 +zefeerdzn MACH_ZEFEERDZN ZEFEERDZN 639 +zefeerdzq MACH_ZEFEERDZQ ZEFEERDZQ 640 +gtwx5715 MACH_GTWX5715 GTWX5715 641 +astro_jack MACH_ASTRO_JACK ASTRO_JACK 643 +tip03 MACH_TIP03 TIP03 644 +a9200ec MACH_A9200EC A9200EC 645 +pnx0105 MACH_PNX0105 PNX0105 646 +adcpoecpu MACH_ADCPOECPU ADCPOECPU 647 +csb637 MACH_CSB637 CSB637 648 +mb9200 MACH_MB9200 MB9200 650 +kulun MACH_KULUN KULUN 651 +snapper MACH_SNAPPER SNAPPER 652 +optima MACH_OPTIMA OPTIMA 653 +dlhsbc MACH_DLHSBC DLHSBC 654 +x30 MACH_X30 X30 655 +n30 MACH_N30 N30 656 +manga_ks8695 MACH_MANGA_KS8695 MANGA_KS8695 657 +ajax MACH_AJAX AJAX 658 +nec_mp900 MACH_NEC_MP900 NEC_MP900 659 +vvtk1000 MACH_VVTK1000 VVTK1000 661 +kafa MACH_KAFA KAFA 662 +vvtk3000 MACH_VVTK3000 VVTK3000 663 +pimx1 MACH_PIMX1 PIMX1 664 +ollie MACH_OLLIE OLLIE 665 +skymax MACH_SKYMAX SKYMAX 666 +jazz MACH_JAZZ JAZZ 667 +tel_t3 MACH_TEL_T3 TEL_T3 668 +aisino_fcr255 MACH_AISINO_FCR255 AISINO_FCR255 669 +btweb MACH_BTWEB BTWEB 670 +dbg_lh79520 MACH_DBG_LH79520 DBG_LH79520 671 +cm41xx MACH_CM41XX CM41XX 672 +ts72xx MACH_TS72XX TS72XX 673 +nggpxa MACH_NGGPXA NGGPXA 674 +csb535 MACH_CSB535 CSB535 675 +csb536 MACH_CSB536 CSB536 676 +pxa_trakpod MACH_PXA_TRAKPOD PXA_TRAKPOD 677 +praxis MACH_PRAXIS PRAXIS 678 +lh75411 MACH_LH75411 LH75411 679 +otom MACH_OTOM OTOM 680 +nexcoder_2440 MACH_NEXCODER_2440 NEXCODER_2440 681 +loox410 MACH_LOOX410 LOOX410 682 +westlake MACH_WESTLAKE WESTLAKE 683 +nsb MACH_NSB NSB 684 +esl_sarva_stn MACH_ESL_SARVA_STN ESL_SARVA_STN 685 +esl_sarva_tft MACH_ESL_SARVA_TFT ESL_SARVA_TFT 686 +esl_sarva_iad MACH_ESL_SARVA_IAD ESL_SARVA_IAD 687 +esl_sarva_acc MACH_ESL_SARVA_ACC ESL_SARVA_ACC 688 +typhoon MACH_TYPHOON TYPHOON 689 +cnav MACH_CNAV CNAV 690 +a730 MACH_A730 A730 691 +netstar MACH_NETSTAR NETSTAR 692 +supercon MACH_PHASEFALE_SUPERCON PHASEFALE_SUPERCON 693 +shiva1100 MACH_SHIVA1100 SHIVA1100 694 +etexsc MACH_ETEXSC ETEXSC 695 +ixdpg465 MACH_IXDPG465 IXDPG465 696 +a9m2410 MACH_A9M2410 A9M2410 697 +a9m2440 MACH_A9M2440 A9M2440 698 +a9m9750 MACH_A9M9750 A9M9750 699 +a9m9360 MACH_A9M9360 A9M9360 700 +unc90 MACH_UNC90 UNC90 701 +eco920 MACH_ECO920 ECO920 702 +satview MACH_SATVIEW SATVIEW 703 +roadrunner MACH_ROADRUNNER ROADRUNNER 704 +at91rm9200ek MACH_AT91RM9200EK AT91RM9200EK 705 +gp32 MACH_GP32 GP32 706 +gem MACH_GEM GEM 707 +i858 MACH_I858 I858 708 +hx2750 MACH_HX2750 HX2750 709 +mxc91131evb MACH_MXC91131EVB MXC91131EVB 710 +p700 MACH_P700 P700 711 +cpe MACH_CPE CPE 712 +spitz MACH_SPITZ SPITZ 713 +nimbra340 MACH_NIMBRA340 NIMBRA340 714 +lpc22xx MACH_LPC22XX LPC22XX 715 +omap_comet3 MACH_COMET3 COMET3 716 +omap_comet4 MACH_COMET4 COMET4 717 +csb625 MACH_CSB625 CSB625 718 +fortunet2 MACH_FORTUNET2 FORTUNET2 719 +s5h2200 MACH_S5H2200 S5H2200 720 +optorm920 MACH_OPTORM920 OPTORM920 721 +adsbitsyxb MACH_ADSBITSYXB ADSBITSYXB 722 +adssphere MACH_ADSSPHERE ADSSPHERE 723 +adsportal MACH_ADSPORTAL ADSPORTAL 724 +ln2410sbc MACH_LN2410SBC LN2410SBC 725 +cb3rufc MACH_CB3RUFC CB3RUFC 726 +mp2usb MACH_MP2USB MP2USB 727 +ntnp425c MACH_NTNP425C NTNP425C 728 +colibri MACH_COLIBRI COLIBRI 729 +pcm7220 MACH_PCM7220 PCM7220 730 +gateway7001 MACH_GATEWAY7001 GATEWAY7001 731 +pcm027 MACH_PCM027 PCM027 732 +cmpxa MACH_CMPXA CMPXA 733 +anubis MACH_ANUBIS ANUBIS 734 +ite8152 MACH_ITE8152 ITE8152 735 +lpc3xxx MACH_LPC3XXX LPC3XXX 736 +puppeteer MACH_PUPPETEER PUPPETEER 737 +vt001 MACH_MACH_VADATECH MACH_VADATECH 738 +e570 MACH_E570 E570 739 +x50 MACH_X50 X50 740 +recon MACH_RECON RECON 741 +xboardgp8 MACH_XBOARDGP8 XBOARDGP8 742 +fpic2 MACH_FPIC2 FPIC2 743 +akita MACH_AKITA AKITA 744 +a81 MACH_A81 A81 745 +svm_sc25x MACH_SVM_SC25X SVM_SC25X 746 +vt020 MACH_VADATECH020 VADATECH020 747 +tli MACH_TLI TLI 748 +edb9315lc MACH_EDB9315LC EDB9315LC 749 +passec MACH_PASSEC PASSEC 750 +ds_tiger MACH_DS_TIGER DS_TIGER 751 +e310 MACH_E310 E310 752 +e330 MACH_E330 E330 753 +rt3000 MACH_RT3000 RT3000 754 +nokia770 MACH_NOKIA770 NOKIA770 755 +pnx0106 MACH_PNX0106 PNX0106 756 +hx21xx MACH_HX21XX HX21XX 757 +faraday MACH_FARADAY FARADAY 758 +sbc9312 MACH_SBC9312 SBC9312 759 +batman MACH_BATMAN BATMAN 760 +jpd201 MACH_JPD201 JPD201 761 +mipsa MACH_MIPSA MIPSA 762 +kacom MACH_KACOM KACOM 763 +swarcocpu MACH_SWARCOCPU SWARCOCPU 764 +swarcodsl MACH_SWARCODSL SWARCODSL 765 +blueangel MACH_BLUEANGEL BLUEANGEL 766 +hairygrama MACH_HAIRYGRAMA HAIRYGRAMA 767 +banff MACH_BANFF BANFF 768 +carmeva MACH_CARMEVA CARMEVA 769 +sam255 MACH_SAM255 SAM255 770 +ppm10 MACH_PPM10 PPM10 771 +edb9315a MACH_EDB9315A EDB9315A 772 +sunset MACH_SUNSET SUNSET 773 +stargate2 MACH_STARGATE2 STARGATE2 774 +intelmote2 MACH_INTELMOTE2 INTELMOTE2 775 +trizeps4 MACH_TRIZEPS4 TRIZEPS4 776 +mainstone2 MACH_MAINSTONE2 MAINSTONE2 777 +ez_ixp42x MACH_EZ_IXP42X EZ_IXP42X 778 +tapwave_zodiac MACH_TAPWAVE_ZODIAC TAPWAVE_ZODIAC 779 +universalmeter MACH_UNIVERSALMETER UNIVERSALMETER 780 +hicoarm9 MACH_HICOARM9 HICOARM9 781 +pnx4008 MACH_PNX4008 PNX4008 782 +kws6000 MACH_KWS6000 KWS6000 783 +portux920t MACH_PORTUX920T PORTUX920T 784 +ez_x5 MACH_EZ_X5 EZ_X5 785 +omap_rudolph MACH_OMAP_RUDOLPH OMAP_RUDOLPH 786 +cpuat91 MACH_CPUAT91 CPUAT91 787 +rea9200 MACH_REA9200 REA9200 788 +acts_pune_sa1110 MACH_ACTS_PUNE_SA1110 ACTS_PUNE_SA1110 789 +ixp425 MACH_IXP425 IXP425 790 +i30030ads MACH_I30030ADS I30030ADS 791 +perch MACH_PERCH PERCH 792 +eis05r1 MACH_EIS05R1 EIS05R1 793 +pepperpad MACH_PEPPERPAD PEPPERPAD 794 +sb3010 MACH_SB3010 SB3010 795 +rm9200 MACH_RM9200 RM9200 796 +dma03 MACH_DMA03 DMA03 797 +road_s101 MACH_ROAD_S101 ROAD_S101 798 +iq81340sc MACH_IQ81340SC IQ81340SC 799 +iq_nextgen_b MACH_IQ_NEXTGEN_B IQ_NEXTGEN_B 800 +iq81340mc MACH_IQ81340MC IQ81340MC 801 +iq_nextgen_d MACH_IQ_NEXTGEN_D IQ_NEXTGEN_D 802 +iq_nextgen_e MACH_IQ_NEXTGEN_E IQ_NEXTGEN_E 803 +mallow_at91 MACH_MALLOW_AT91 MALLOW_AT91 804 +cybertracker_i MACH_CYBERTRACKER_I CYBERTRACKER_I 805 +gesbc931x MACH_GESBC931X GESBC931X 806 +centipad MACH_CENTIPAD CENTIPAD 807 +armsoc MACH_ARMSOC ARMSOC 808 +se4200 MACH_SE4200 SE4200 809 +ems197a MACH_EMS197A EMS197A 810 +micro9 MACH_MICRO9 MICRO9 811 +micro9l MACH_MICRO9L MICRO9L 812 +uc5471dsp MACH_UC5471DSP UC5471DSP 813 +sj5471eng MACH_SJ5471ENG SJ5471ENG 814 +none MACH_CMPXA26X CMPXA26X 815 +nc1 MACH_NC NC 816 +omap_palmte MACH_OMAP_PALMTE OMAP_PALMTE 817 +ajax52x MACH_AJAX52X AJAX52X 818 +siriustar MACH_SIRIUSTAR SIRIUSTAR 819 +iodata_hdlg MACH_IODATA_HDLG IODATA_HDLG 820 +at91rm9200utl MACH_AT91RM9200UTL AT91RM9200UTL 821 +biosafe MACH_BIOSAFE BIOSAFE 822 +mp1000 MACH_MP1000 MP1000 823 +parsy MACH_PARSY PARSY 824 +ccxp270 MACH_CCXP CCXP 825 +omap_gsample MACH_OMAP_GSAMPLE OMAP_GSAMPLE 826 +realview_eb MACH_REALVIEW_EB REALVIEW_EB 827 +samoa MACH_SAMOA SAMOA 828 +t3xscale MACH_T3XSCALE T3XSCALE 829 +i878 MACH_I878 I878 830 +borzoi MACH_BORZOI BORZOI 831 +gecko MACH_GECKO GECKO 832 +ds101 MACH_DS101 DS101 833 +omap_palmtt2 MACH_OMAP_PALMTT2 OMAP_PALMTT2 834 +xscale_palmld MACH_XSCALE_PALMLD XSCALE_PALMLD 835 +cc9c MACH_CC9C CC9C 836 +sbc1670 MACH_SBC1670 SBC1670 837 +ixdp28x5 MACH_IXDP28X5 IXDP28X5 838 +omap_palmtt MACH_OMAP_PALMTT OMAP_PALMTT 839 +ml696k MACH_ML696K ML696K 840 +arcom_zeus MACH_ARCOM_ZEUS ARCOM_ZEUS 841 +osiris MACH_OSIRIS OSIRIS 842 +maestro MACH_MAESTRO MAESTRO 843 +tunge2 MACH_TUNGE2 TUNGE2 844 +ixbbm MACH_IXBBM IXBBM 845 +mx27ads MACH_MX27ADS MX27ADS 846 +ax8004 MACH_AX8004 AX8004 847 +at91sam9261ek MACH_AT91SAM9261EK AT91SAM9261EK 848 +loft MACH_LOFT LOFT 849 +magpie MACH_MAGPIE MAGPIE 850 +mx21ads MACH_MX21ADS MX21ADS 851 +mb87m3400 MACH_MB87M3400 MB87M3400 852 +mguard_delta MACH_MGUARD_DELTA MGUARD_DELTA 853 +davinci_dvdp MACH_DAVINCI_DVDP DAVINCI_DVDP 854 +htcuniversal MACH_HTCUNIVERSAL HTCUNIVERSAL 855 +tpad MACH_TPAD TPAD 856 +roverp3 MACH_ROVERP3 ROVERP3 857 +jornada928 MACH_JORNADA928 JORNADA928 858 +mv88fxx81 MACH_MV88FXX81 MV88FXX81 859 +stmp36xx MACH_STMP36XX STMP36XX 860 +sxni79524 MACH_SXNI79524 SXNI79524 861 +ams_delta MACH_AMS_DELTA AMS_DELTA 862 +uranium MACH_URANIUM URANIUM 863 +ucon MACH_UCON UCON 864 +nas100d MACH_NAS100D NAS100D 865 +l083 MACH_L083_1000 L083_1000 866 +ezx MACH_EZX EZX 867 +pnx5220 MACH_PNX5220 PNX5220 868 +butte MACH_BUTTE BUTTE 869 +srm2 MACH_SRM2 SRM2 870 +dsbr MACH_DSBR DSBR 871 +crystalball MACH_CRYSTALBALL CRYSTALBALL 872 +tinypxa27x MACH_TINYPXA27X TINYPXA27X 873 +herbie MACH_HERBIE HERBIE 874 +magician MACH_MAGICIAN MAGICIAN 875 +cm4002 MACH_CM4002 CM4002 876 +b4 MACH_B4 B4 877 +maui MACH_MAUI MAUI 878 +cybertracker_g MACH_CYBERTRACKER_G CYBERTRACKER_G 879 +nxdkn MACH_NXDKN NXDKN 880 +mio8390 MACH_MIO8390 MIO8390 881 +omi_board MACH_OMI_BOARD OMI_BOARD 882 +mx21civ MACH_MX21CIV MX21CIV 883 +mahi_cdac MACH_MAHI_CDAC MAHI_CDAC 884 +xscale_palmtx MACH_XSCALE_PALMTX XSCALE_PALMTX 885 +s3c2413 MACH_S3C2413 S3C2413 887 +samsys_ep0 MACH_SAMSYS_EP0 SAMSYS_EP0 888 +wg302v1 MACH_WG302V1 WG302V1 889 +wg302v2 MACH_WG302V2 WG302V2 890 +eb42x MACH_EB42X EB42X 891 +iq331es MACH_IQ331ES IQ331ES 892 +cosydsp MACH_COSYDSP COSYDSP 893 +uplat7d_proto MACH_UPLAT7D UPLAT7D 894 +ptdavinci MACH_PTDAVINCI PTDAVINCI 895 +mbus MACH_MBUS MBUS 896 +nadia2vb MACH_NADIA2VB NADIA2VB 897 +r1000 MACH_R1000 R1000 898 +hw90250 MACH_HW90250 HW90250 899 +omap_2430sdp MACH_OMAP_2430SDP OMAP_2430SDP 900 +davinci_evm MACH_DAVINCI_EVM DAVINCI_EVM 901 +omap_tornado MACH_OMAP_TORNADO OMAP_TORNADO 902 +olocreek MACH_OLOCREEK OLOCREEK 903 +palmz72 MACH_PALMZ72 PALMZ72 904 +nxdb500 MACH_NXDB500 NXDB500 905 +apf9328 MACH_APF9328 APF9328 906 +omap_wipoq MACH_OMAP_WIPOQ OMAP_WIPOQ 907 +omap_twip MACH_OMAP_TWIP OMAP_TWIP 908 +xscale_treo650 MACH_XSCALE_PALMTREO650 XSCALE_PALMTREO650 909 +acumen MACH_ACUMEN ACUMEN 910 +xp100 MACH_XP100 XP100 911 +fs2410 MACH_FS2410 FS2410 912 +pxa270_cerf MACH_PXA270_CERF PXA270_CERF 913 +sq2ftlpalm MACH_SQ2FTL... [truncated message content] |
From: <or...@us...> - 2008-04-11 21:12:07
|
Revision: 304 http://open2x.svn.sourceforge.net/open2x/?rev=304&view=rev Author: orkie Date: 2008-04-11 14:12:04 -0700 (Fri, 11 Apr 2008) Log Message: ----------- Patches to NAND and SD drivers to provide a dedicated SD automounter, the ability to force erase bad blocks on the NAND and an option to swtich between NAND layout versions (i.e. full NAND layout for DR4+ or partitioned into filesystem and user NAND areas for DR3 and below, including GPH Modified Paths: -------------- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/mmcsd/Config.in trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/mmcsd/mmcsd_slot_mmsp2.c trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/mtd/nand/Config.in trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/mtd/nand/mp2520f.c trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/mtd/nand/nand.c Added Paths: ----------- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_afsk1200.h trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_afsk2400_7.h trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_afsk2400_8.h trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_afsk2666.h trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_fsk9600.h trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_hapn4800.h trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_psk4800.h Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/mmcsd/Config.in =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/mmcsd/Config.in 2008-04-01 20:09:47 UTC (rev 303) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/mmcsd/Config.in 2008-04-11 21:12:04 UTC (rev 304) @@ -7,6 +7,7 @@ tristate 'MMC/SD support' CONFIG_MMCSD if [ "$CONFIG_MMCSD" = "y" -o "$CONFIG_MMCSD" = "m" ]; then bool ' MMC/SD debugging' CONFIG_MMCSD_DEBUG + bool ' Open2x SD automounter' CONFIG_OPEN2X_SD_AUTOMOUNT if [ "$CONFIG_MMCSD_DEBUG" = "y" ]; then int ' MMC/SD debugging verbosity (0=quiet, 3=noisy)' CONFIG_MMCSD_DEBUG_VERBOSE 0 fi Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/mmcsd/mmcsd_slot_mmsp2.c =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/mmcsd/mmcsd_slot_mmsp2.c 2008-04-01 20:09:47 UTC (rev 303) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/mmcsd/mmcsd_slot_mmsp2.c 2008-04-11 21:12:04 UTC (rev 304) @@ -822,11 +822,16 @@ add_mmcsd_device(slot); + #ifdef CONFIG_OPEN2X_SD_AUTOMOUNT printk("mount...1 \n"); -#if 1 - sys_mount("/dev/mmcsd/disc0/part1", "/mnt/sd", "auto", 0xC0ED0000|MS_NOATIME|MS_SYNCHRONOUS, "iocharset=utf8"); -#endif + + argv[0] = "/bin/mount"; + argv[1] = "/mnt/sd"; + argv[2] = 0; + call_usermodehelper(argv[0], argv, 0); + printk("mount...2: \n"); + #endif /* CONFIG_OPEN2X_SD_AUTOMOUNT */ #if 1 Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/mtd/nand/Config.in =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/mtd/nand/Config.in 2008-04-01 20:09:47 UTC (rev 303) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/mtd/nand/Config.in 2008-04-11 21:12:04 UTC (rev 304) @@ -10,6 +10,8 @@ if [ "$CONFIG_MTD_NAND" = "y" -o "$CONFIG_MTD_NAND" = "m" ]; then bool ' Verify NAND page writes' CONFIG_MTD_NAND_VERIFY_WRITE bool ' Simple Block Device for Nand Flash(BON FS)' CONFIG_MTD_NAND_BONFS + bool ' Open2x single NAND partition scheme' CONFIG_MTD_OPEN2X_SINGLE_PARTITION + bool ' Force erase bad blocks' CONFIG_OPEN2X_IGNORE_BB_ERASE fi if [ "$CONFIG_ARM" = "y" ]; then Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/mtd/nand/mp2520f.c =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/mtd/nand/mp2520f.c 2008-04-01 20:09:47 UTC (rev 303) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/mtd/nand/mp2520f.c 2008-04-11 21:12:04 UTC (rev 304) @@ -103,6 +103,7 @@ real 0x220000 rootfs(YAFFS) 0x1E00000 0x2000000 YAFFS(FAT) 0x2000000 */ +#ifdef CONFIG_MTD_OPEN2X_SINGLE_PARTITION static struct mtd_partition partition_info[] = { { name: "Bootloader", @@ -115,10 +116,32 @@ offset: MTDPART_OFS_APPEND, }, { name: "Param", - size: 0x60000, /* Real address */ + size: 0x60000, /* Real address */ offset: MTDPART_OFS_APPEND, }, { name: "Filesystem", + size: MTDPART_SIZ_FULL, /* 30MB */ + offset: MTDPART_OFS_APPEND, + } +}; +#define NUM_PARTITIONS 4 +#else +static struct mtd_partition partition_info[] = { + { + name: "Bootloader", + size: 0x80000, + offset: 0, + mask_flags: MTD_WRITEABLE, /* force read-only */ + }, { + name: "Kernel", + size: 0x120000, + offset: MTDPART_OFS_APPEND, + }, { + name: "Param", + size: 0x60000, /* Real address */ + offset: MTDPART_OFS_APPEND, + }, { + name: "Filesystem", size: 0x1E00000, /* 30MB */ offset: MTDPART_OFS_APPEND, }, { @@ -128,7 +151,8 @@ } }; #define NUM_PARTITIONS 5 -#endif +#endif /* CONFIG_MTD_OPEN2X_SINGLE_PARTITION */ +#endif /* 0 */ #endif /* CONFIG_MTD_NAND_BONFS */ Modified: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/mtd/nand/nand.c =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/mtd/nand/nand.c 2008-04-01 20:09:47 UTC (rev 303) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/mtd/nand/nand.c 2008-04-11 21:12:04 UTC (rev 304) @@ -1712,11 +1712,13 @@ while (len) { /* Check if we have a bad block, we do not erase bad blocks ! */ + #ifndef CONFIG_OPEN2X_IGNORE_BB_ERASE if (this->block_bad(mtd, (loff_t) page, 0)) { printk (KERN_WARNING "nand_erase: attempt to erase a bad block at page 0x%08x\n", page); instr->state = MTD_ERASE_FAILED; goto erase_exit; } + #endif /* CONFIG_OPEN2X_IGNORE_BB_ERASE */ /* Send commands to erase a page */ this->cmdfunc (mtd, NAND_CMD_ERASE1, -1, page); Added: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_afsk1200.h =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_afsk1200.h (rev 0) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_afsk1200.h 2008-04-11 21:12:04 UTC (rev 304) @@ -0,0 +1,72 @@ +/* + * THIS FILE IS GENERATED AUTOMATICALLY BY ./gentbl, DO NOT EDIT! + */ + + +/* + * small cosine table in U8 format + */ +#define OFFSCOSTABBITS 6 +#define OFFSCOSTABSIZE (1<<OFFSCOSTABBITS) + +static unsigned char offscostab[OFFSCOSTABSIZE] = { + 255, 254, 252, 249, 245, 240, 233, 226, + 217, 208, 198, 187, 176, 164, 152, 140, + 128, 115, 103, 91, 79, 68, 57, 47, + 38, 29, 22, 15, 10, 6, 3, 1, + 1, 1, 3, 6, 10, 15, 22, 29, + 38, 47, 57, 68, 79, 91, 103, 115, + 127, 140, 152, 164, 176, 187, 198, 208, + 217, 226, 233, 240, 245, 249, 252, 254 +}; + +#define OFFSCOS(x) offscostab[((x)>>10)&0x3f] + + +/* + * more accurate cosine table + */ + +static const short costab[64] = { + 32767, 32609, 32137, 31356, 30272, 28897, 27244, 25329, + 23169, 20787, 18204, 15446, 12539, 9511, 6392, 3211, + 0, -3211, -6392, -9511, -12539, -15446, -18204, -20787, + -23169, -25329, -27244, -28897, -30272, -31356, -32137, -32609, + -32767, -32609, -32137, -31356, -30272, -28897, -27244, -25329, + -23169, -20787, -18204, -15446, -12539, -9511, -6392, -3211, + 0, 3211, 6392, 9511, 12539, 15446, 18204, 20787, + 23169, 25329, 27244, 28897, 30272, 31356, 32137, 32609 +}; + +#define COS(x) costab[((x)>>10)&0x3f] +#define SIN(x) COS((x)+0xc000) + + +/* + * afsk1200 specific tables + */ +#define AFSK12_SAMPLE_RATE 9600 +#define AFSK12_TX_FREQ_LO 1200 +#define AFSK12_TX_FREQ_HI 2200 +#define AFSK12_CORRLEN 8 + +static const int afsk12_tx_lo_i[] = { + 127, 89, 0, -89, -127, -89, 0, 89 +}; +#define SUM_AFSK12_TX_LO_I 0 + +static const int afsk12_tx_lo_q[] = { + 0, 89, 127, 89, 0, -89, -127, -89 +}; +#define SUM_AFSK12_TX_LO_Q 0 + +static const int afsk12_tx_hi_i[] = { + 127, 16, -122, -48, 109, 77, -89, -100 +}; +#define SUM_AFSK12_TX_HI_I -30 + +static const int afsk12_tx_hi_q[] = { + 0, 125, 32, -117, -63, 100, 89, -77 +}; +#define SUM_AFSK12_TX_HI_Q 89 + Added: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_afsk2400_7.h =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_afsk2400_7.h (rev 0) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_afsk2400_7.h 2008-04-11 21:12:04 UTC (rev 304) @@ -0,0 +1,72 @@ +/* + * THIS FILE IS GENERATED AUTOMATICALLY BY ./gentbl, DO NOT EDIT! + */ + + +/* + * small cosine table in U8 format + */ +#define OFFSCOSTABBITS 6 +#define OFFSCOSTABSIZE (1<<OFFSCOSTABBITS) + +static unsigned char offscostab[OFFSCOSTABSIZE] = { + 255, 254, 252, 249, 245, 240, 233, 226, + 217, 208, 198, 187, 176, 164, 152, 140, + 128, 115, 103, 91, 79, 68, 57, 47, + 38, 29, 22, 15, 10, 6, 3, 1, + 1, 1, 3, 6, 10, 15, 22, 29, + 38, 47, 57, 68, 79, 91, 103, 115, + 127, 140, 152, 164, 176, 187, 198, 208, + 217, 226, 233, 240, 245, 249, 252, 254 +}; + +#define OFFSCOS(x) offscostab[((x)>>10)&0x3f] + + +/* + * more accurate cosine table + */ + +static const short costab[64] = { + 32767, 32609, 32137, 31356, 30272, 28897, 27244, 25329, + 23169, 20787, 18204, 15446, 12539, 9511, 6392, 3211, + 0, -3211, -6392, -9511, -12539, -15446, -18204, -20787, + -23169, -25329, -27244, -28897, -30272, -31356, -32137, -32609, + -32767, -32609, -32137, -31356, -30272, -28897, -27244, -25329, + -23169, -20787, -18204, -15446, -12539, -9511, -6392, -3211, + 0, 3211, 6392, 9511, 12539, 15446, 18204, 20787, + 23169, 25329, 27244, 28897, 30272, 31356, 32137, 32609 +}; + +#define COS(x) costab[((x)>>10)&0x3f] +#define SIN(x) COS((x)+0xc000) + + +/* + * afsk2400 specific tables (tcm3105 clk 7372800.000000Hz) + */ +#define AFSK24_TX_FREQ_LO 1995 +#define AFSK24_TX_FREQ_HI 3658 +#define AFSK24_BITPLL_INC 9830 +#define AFSK24_SAMPLERATE 16000 + +static const int afsk24_tx_lo_i[] = { + 10, 11, 0, -43, -89, -80, -1, 87, 112, 64, 0, -24, -16, -7 +}; +#define SUM_AFSK24_TX_LO_I 24 + +static const int afsk24_tx_lo_q[] = { + 0, 11, 35, 43, 0, -78, -125, -89, -1, 62, 61, 25, 0, -7 +}; +#define SUM_AFSK24_TX_LO_Q -63 + +static const int afsk24_tx_hi_i[] = { + 10, 2, -34, -24, 76, 69, -86, -101, 53, 83, -14, -35, 0, 10 +}; +#define SUM_AFSK24_TX_HI_I 9 + +static const int afsk24_tx_hi_q[] = { + 0, 16, 9, -56, -45, 88, 90, -74, -98, 31, 59, -3, -16, -1 +}; +#define SUM_AFSK24_TX_HI_Q 0 + Added: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_afsk2400_8.h =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_afsk2400_8.h (rev 0) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_afsk2400_8.h 2008-04-11 21:12:04 UTC (rev 304) @@ -0,0 +1,72 @@ +/* + * THIS FILE IS GENERATED AUTOMATICALLY BY ./gentbl, DO NOT EDIT! + */ + + +/* + * small cosine table in U8 format + */ +#define OFFSCOSTABBITS 6 +#define OFFSCOSTABSIZE (1<<OFFSCOSTABBITS) + +static unsigned char offscostab[OFFSCOSTABSIZE] = { + 255, 254, 252, 249, 245, 240, 233, 226, + 217, 208, 198, 187, 176, 164, 152, 140, + 128, 115, 103, 91, 79, 68, 57, 47, + 38, 29, 22, 15, 10, 6, 3, 1, + 1, 1, 3, 6, 10, 15, 22, 29, + 38, 47, 57, 68, 79, 91, 103, 115, + 127, 140, 152, 164, 176, 187, 198, 208, + 217, 226, 233, 240, 245, 249, 252, 254 +}; + +#define OFFSCOS(x) offscostab[((x)>>10)&0x3f] + + +/* + * more accurate cosine table + */ + +static const short costab[64] = { + 32767, 32609, 32137, 31356, 30272, 28897, 27244, 25329, + 23169, 20787, 18204, 15446, 12539, 9511, 6392, 3211, + 0, -3211, -6392, -9511, -12539, -15446, -18204, -20787, + -23169, -25329, -27244, -28897, -30272, -31356, -32137, -32609, + -32767, -32609, -32137, -31356, -30272, -28897, -27244, -25329, + -23169, -20787, -18204, -15446, -12539, -9511, -6392, -3211, + 0, 3211, 6392, 9511, 12539, 15446, 18204, 20787, + 23169, 25329, 27244, 28897, 30272, 31356, 32137, 32609 +}; + +#define COS(x) costab[((x)>>10)&0x3f] +#define SIN(x) COS((x)+0xc000) + + +/* + * afsk2400 specific tables (tcm3105 clk 8000000.000000Hz) + */ +#define AFSK24_TX_FREQ_LO 2165 +#define AFSK24_TX_FREQ_HI 3970 +#define AFSK24_BITPLL_INC 9830 +#define AFSK24_SAMPLERATE 16000 + +static const int afsk24_tx_lo_i[] = { + 10, 11, -4, -51, -86, -49, 47, 118, 97, 17, -37, -35, -11, 0 +}; +#define SUM_AFSK24_TX_LO_I 27 + +static const int afsk24_tx_lo_q[] = { + 0, 12, 35, 34, -22, -100, -115, -40, 55, 87, 48, 2, -11, -10 +}; +#define SUM_AFSK24_TX_LO_Q -25 + +static const int afsk24_tx_hi_i[] = { + 10, 0, -35, -2, 89, 6, -124, -10, 111, 9, -61, -4, 16, 1 +}; +#define SUM_AFSK24_TX_HI_I 6 + +static const int afsk24_tx_hi_q[] = { + 0, 16, 0, -61, -4, 112, 8, -124, -10, 88, 7, -35, -2, 10 +}; +#define SUM_AFSK24_TX_HI_Q 5 + Added: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_afsk2666.h =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_afsk2666.h (rev 0) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_afsk2666.h 2008-04-11 21:12:04 UTC (rev 304) @@ -0,0 +1,75 @@ +/* + * THIS FILE IS GENERATED AUTOMATICALLY BY ./gentbl, DO NOT EDIT! + */ + + +/* + * small cosine table in U8 format + */ +#define OFFSCOSTABBITS 6 +#define OFFSCOSTABSIZE (1<<OFFSCOSTABBITS) + +static unsigned char offscostab[OFFSCOSTABSIZE] = { + 255, 254, 252, 249, 245, 240, 233, 226, + 217, 208, 198, 187, 176, 164, 152, 140, + 128, 115, 103, 91, 79, 68, 57, 47, + 38, 29, 22, 15, 10, 6, 3, 1, + 1, 1, 3, 6, 10, 15, 22, 29, + 38, 47, 57, 68, 79, 91, 103, 115, + 127, 140, 152, 164, 176, 187, 198, 208, + 217, 226, 233, 240, 245, 249, 252, 254 +}; + +#define OFFSCOS(x) offscostab[((x)>>10)&0x3f] + + +/* + * more accurate cosine table + */ + +static const short costab[64] = { + 32767, 32609, 32137, 31356, 30272, 28897, 27244, 25329, + 23169, 20787, 18204, 15446, 12539, 9511, 6392, 3211, + 0, -3211, -6392, -9511, -12539, -15446, -18204, -20787, + -23169, -25329, -27244, -28897, -30272, -31356, -32137, -32609, + -32767, -32609, -32137, -31356, -30272, -28897, -27244, -25329, + -23169, -20787, -18204, -15446, -12539, -9511, -6392, -3211, + 0, 3211, 6392, 9511, 12539, 15446, 18204, 20787, + 23169, 25329, 27244, 28897, 30272, 31356, 32137, 32609 +}; + +#define COS(x) costab[((x)>>10)&0x3f] +#define SIN(x) COS((x)+0xc000) + + +/* + * afsk2666 specific tables + */ +#define AFSK26_DEMCORRLEN 12 +#define AFSK26_SAMPLERATE 16000 + +static const unsigned int afsk26_carfreq[2] = { 0x2000, 0x3555 }; + + +static const struct { + int i[12]; + int q[12]; +} afsk26_dem_tables[2][2] = { + { + {{ 1, 7, -18, -73, -100, -47, 47, 100, 73, 18, -7, -1 }, { 0, 17, 43, 30, -41, -115, -115, -41, 30, 43, 17, 0 }}, +#define AFSK26_DEM_SUM_I_0_0 0 +#define AFSK26_DEM_SUM_Q_0_0 -132 + {{ 1, -7, -46, -10, 100, 76, -75, -100, 10, 46, 7, -1 }, { 1, 17, -6, -79, -41, 99, 99, -41, -79, -6, 17, 1 }} +#define AFSK26_DEM_SUM_I_0_1 1 +#define AFSK26_DEM_SUM_Q_0_1 -18 + }, + { + {{ 8, 22, 0, -67, -118, -89, 0, 67, 63, 22, 0, 0 }, { 0, 22, 63, 67, 0, -89, -118, -67, 0, 22, 8, 0 }}, +#define AFSK26_DEM_SUM_I_1_0 -92 +#define AFSK26_DEM_SUM_Q_1_0 -92 + {{ 8, 8, -54, -67, 59, 122, 0, -91, -31, 22, 7, 0 }, { 0, 30, 31, -67, -102, 32, 118, 24, -54, -22, 4, 0 }} +#define AFSK26_DEM_SUM_I_1_1 -17 +#define AFSK26_DEM_SUM_Q_1_1 -6 + } +}; + Added: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_fsk9600.h =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_fsk9600.h (rev 0) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_fsk9600.h 2008-04-11 21:12:04 UTC (rev 304) @@ -0,0 +1,302 @@ +/* + * THIS FILE IS GENERATED AUTOMATICALLY BY ./gentbl, DO NOT EDIT! + */ + + +/* + * fsk9600 specific tables + */ +static unsigned char fsk96_txfilt_4[] = { + 37, 37, 35, 36, 39, 40, 38, 38, + 53, 53, 51, 52, 55, 56, 54, 54, + 210, 210, 208, 209, 212, 213, 211, 211, + 226, 226, 224, 225, 228, 229, 227, 227, + 23, 23, 22, 22, 26, 26, 24, 24, + 39, 39, 38, 38, 42, 42, 40, 40, + 196, 196, 195, 195, 199, 199, 197, 197, + 212, 212, 211, 211, 215, 215, 213, 213, + 43, 43, 42, 42, 46, 46, 44, 44, + 59, 59, 58, 58, 62, 62, 60, 60, + 216, 216, 215, 215, 219, 219, 217, 217, + 232, 232, 231, 231, 235, 235, 233, 233, + 29, 29, 28, 28, 32, 32, 30, 30, + 45, 45, 44, 44, 48, 48, 46, 46, + 202, 202, 201, 201, 205, 205, 203, 203, + 218, 218, 217, 217, 221, 221, 219, 219, + 36, 36, 34, 34, 38, 38, 37, 37, + 52, 52, 50, 50, 54, 54, 53, 53, + 209, 209, 207, 207, 211, 211, 210, 210, + 225, 225, 223, 223, 227, 227, 226, 226, + 22, 22, 20, 20, 24, 24, 23, 23, + 38, 38, 36, 36, 40, 40, 39, 39, + 195, 195, 193, 193, 197, 197, 196, 196, + 211, 211, 209, 209, 213, 213, 212, 212, + 42, 42, 40, 40, 44, 44, 43, 43, + 58, 58, 56, 56, 60, 60, 59, 59, + 215, 215, 213, 213, 217, 217, 216, 216, + 231, 231, 229, 229, 233, 233, 232, 232, + 28, 28, 26, 27, 30, 31, 29, 29, + 44, 44, 42, 43, 46, 47, 45, 45, + 201, 201, 199, 200, 203, 204, 202, 202, + 217, 217, 215, 216, 219, 220, 218, 218, + 37, 37, 37, 37, 29, 29, 29, 30, + 108, 108, 108, 108, 100, 100, 100, 100, + 169, 169, 169, 170, 161, 161, 162, 162, + 240, 240, 240, 240, 232, 232, 232, 232, + 19, 19, 19, 20, 11, 11, 12, 12, + 90, 90, 90, 90, 82, 82, 82, 82, + 151, 151, 152, 152, 143, 143, 144, 144, + 222, 222, 222, 222, 214, 214, 215, 215, + 41, 41, 41, 41, 33, 33, 33, 34, + 112, 112, 112, 112, 104, 104, 104, 104, + 173, 173, 173, 174, 165, 165, 166, 166, + 244, 244, 244, 244, 236, 236, 236, 236, + 23, 23, 23, 24, 15, 15, 16, 16, + 94, 94, 94, 94, 86, 86, 86, 86, + 155, 155, 156, 156, 147, 147, 148, 148, + 226, 226, 226, 226, 218, 218, 219, 219, + 36, 36, 37, 37, 29, 29, 29, 29, + 107, 107, 108, 108, 99, 99, 100, 100, + 169, 169, 169, 169, 161, 161, 161, 161, + 239, 239, 240, 240, 231, 232, 232, 232, + 19, 19, 19, 19, 11, 11, 11, 11, + 89, 89, 90, 90, 81, 82, 82, 82, + 151, 151, 151, 151, 143, 143, 143, 143, + 221, 222, 222, 222, 214, 214, 214, 214, + 40, 40, 41, 41, 33, 33, 33, 33, + 111, 111, 112, 112, 103, 103, 104, 104, + 173, 173, 173, 173, 165, 165, 165, 165, + 243, 243, 244, 244, 235, 236, 236, 236, + 23, 23, 23, 23, 15, 15, 15, 15, + 93, 93, 94, 94, 85, 86, 86, 86, + 155, 155, 155, 155, 147, 147, 147, 147, + 225, 226, 226, 226, 218, 218, 218, 218, + 37, 36, 41, 40, 19, 19, 23, 23, + 169, 169, 173, 173, 151, 151, 155, 155, + 108, 107, 112, 111, 90, 89, 94, 93, + 240, 239, 244, 243, 222, 221, 226, 225, + 29, 29, 33, 33, 11, 11, 15, 15, + 161, 161, 165, 165, 143, 143, 147, 147, + 100, 99, 104, 103, 82, 81, 86, 85, + 232, 231, 236, 235, 214, 214, 218, 218, + 37, 37, 41, 41, 19, 19, 23, 23, + 169, 169, 173, 173, 152, 151, 156, 155, + 108, 108, 112, 112, 90, 90, 94, 94, + 240, 240, 244, 244, 222, 222, 226, 226, + 29, 29, 33, 33, 12, 11, 16, 15, + 162, 161, 166, 165, 144, 143, 148, 147, + 100, 100, 104, 104, 82, 82, 86, 86, + 232, 232, 236, 236, 215, 214, 219, 218, + 37, 36, 41, 40, 19, 19, 23, 23, + 169, 169, 173, 173, 151, 151, 155, 155, + 108, 107, 112, 111, 90, 89, 94, 93, + 240, 239, 244, 243, 222, 222, 226, 226, + 29, 29, 33, 33, 11, 11, 15, 15, + 161, 161, 165, 165, 143, 143, 147, 147, + 100, 99, 104, 103, 82, 82, 86, 86, + 232, 232, 236, 236, 214, 214, 218, 218, + 37, 37, 41, 41, 20, 19, 24, 23, + 170, 169, 174, 173, 152, 151, 156, 155, + 108, 108, 112, 112, 90, 90, 94, 94, + 240, 240, 244, 244, 222, 222, 226, 226, + 30, 29, 34, 33, 12, 11, 16, 15, + 162, 161, 166, 165, 144, 143, 148, 147, + 100, 100, 104, 104, 82, 82, 86, 86, + 232, 232, 236, 236, 215, 214, 219, 218, + 37, 36, 43, 42, 23, 22, 29, 28, + 210, 209, 216, 215, 196, 195, 202, 201, + 53, 52, 59, 58, 39, 38, 45, 44, + 226, 225, 232, 231, 212, 211, 218, 217, + 39, 38, 46, 44, 26, 24, 32, 30, + 212, 211, 219, 217, 199, 197, 205, 203, + 55, 54, 62, 60, 42, 40, 48, 46, + 228, 227, 235, 233, 215, 213, 221, 219, + 35, 34, 42, 40, 22, 20, 28, 26, + 208, 207, 215, 213, 195, 193, 201, 199, + 51, 50, 58, 56, 38, 36, 44, 42, + 224, 223, 231, 229, 211, 209, 217, 215, + 38, 37, 44, 43, 24, 23, 30, 29, + 211, 210, 217, 216, 197, 196, 203, 202, + 54, 53, 60, 59, 40, 39, 46, 45, + 227, 226, 233, 232, 213, 212, 219, 218, + 37, 36, 43, 42, 23, 22, 29, 28, + 210, 209, 216, 215, 196, 195, 202, 201, + 53, 52, 59, 58, 39, 38, 45, 44, + 226, 225, 232, 231, 212, 211, 218, 217, + 40, 38, 46, 44, 26, 24, 32, 31, + 213, 211, 219, 217, 199, 197, 205, 204, + 56, 54, 62, 60, 42, 40, 48, 47, + 229, 227, 235, 233, 215, 213, 221, 220, + 36, 34, 42, 40, 22, 20, 28, 27, + 209, 207, 215, 213, 195, 193, 201, 200, + 52, 50, 58, 56, 38, 36, 44, 43, + 225, 223, 231, 229, 211, 209, 217, 216, + 38, 37, 44, 43, 24, 23, 30, 29, + 211, 210, 217, 216, 197, 196, 203, 202, + 54, 53, 60, 59, 40, 39, 46, 45, + 227, 226, 233, 232, 213, 212, 219, 218 +}; + +static unsigned char fsk96_txfilt_5[] = { + 39, 40, 38, 38, 42, 43, 41, 41, + 51, 51, 50, 50, 54, 54, 53, 53, + 209, 209, 207, 208, 212, 212, 210, 211, + 221, 221, 219, 219, 224, 224, 222, 222, + 28, 28, 27, 27, 31, 31, 30, 30, + 40, 40, 38, 39, 43, 43, 41, 42, + 198, 198, 196, 196, 201, 201, 199, 199, + 209, 210, 208, 208, 212, 213, 211, 211, + 45, 45, 44, 44, 48, 48, 47, 47, + 57, 57, 56, 56, 60, 60, 59, 59, + 215, 215, 213, 213, 218, 218, 216, 216, + 227, 227, 225, 225, 230, 230, 228, 228, + 34, 34, 32, 33, 37, 37, 35, 36, + 46, 46, 44, 44, 49, 49, 47, 47, + 203, 204, 202, 202, 206, 207, 205, 205, + 215, 215, 214, 214, 218, 218, 217, 217, + 38, 38, 37, 37, 41, 41, 40, 40, + 50, 50, 48, 49, 53, 53, 51, 52, + 208, 208, 206, 206, 211, 211, 209, 209, + 219, 220, 218, 218, 222, 223, 221, 221, + 27, 27, 25, 25, 30, 30, 28, 28, + 39, 39, 37, 37, 42, 42, 40, 40, + 196, 196, 195, 195, 199, 199, 198, 198, + 208, 208, 207, 207, 211, 211, 210, 210, + 44, 44, 42, 43, 47, 47, 45, 46, + 56, 56, 54, 54, 59, 59, 57, 57, + 213, 214, 212, 212, 216, 217, 215, 215, + 225, 225, 224, 224, 228, 228, 227, 227, + 33, 33, 31, 31, 36, 36, 34, 34, + 44, 45, 43, 43, 47, 48, 46, 46, + 202, 202, 201, 201, 205, 205, 204, 204, + 214, 214, 212, 213, 217, 217, 215, 216, + 39, 40, 39, 39, 35, 35, 35, 35, + 91, 91, 90, 90, 86, 87, 86, 86, + 183, 183, 182, 182, 178, 179, 178, 178, + 234, 234, 234, 234, 230, 230, 229, 230, + 21, 22, 21, 21, 17, 17, 17, 17, + 73, 73, 72, 72, 68, 69, 68, 68, + 165, 165, 164, 164, 161, 161, 160, 160, + 216, 216, 216, 216, 212, 212, 211, 212, + 44, 44, 44, 44, 40, 40, 40, 40, + 95, 96, 95, 95, 91, 91, 91, 91, + 187, 188, 187, 187, 183, 183, 183, 183, + 239, 239, 238, 239, 235, 235, 234, 234, + 26, 26, 26, 26, 22, 22, 22, 22, + 77, 78, 77, 77, 73, 73, 73, 73, + 170, 170, 169, 169, 165, 165, 165, 165, + 221, 221, 220, 221, 217, 217, 216, 216, + 39, 39, 38, 38, 34, 35, 34, 34, + 90, 90, 90, 90, 86, 86, 85, 85, + 182, 182, 182, 182, 178, 178, 177, 178, + 233, 233, 233, 233, 229, 229, 229, 229, + 21, 21, 20, 20, 16, 17, 16, 16, + 72, 72, 72, 72, 68, 68, 67, 68, + 164, 164, 164, 164, 160, 160, 159, 160, + 215, 215, 215, 215, 211, 211, 211, 211, + 43, 44, 43, 43, 39, 39, 39, 39, + 95, 95, 94, 94, 91, 91, 90, 90, + 187, 187, 186, 187, 183, 183, 182, 182, + 238, 238, 238, 238, 234, 234, 233, 234, + 25, 26, 25, 25, 21, 21, 21, 21, + 77, 77, 76, 77, 73, 73, 72, 72, + 169, 169, 168, 169, 165, 165, 164, 164, + 220, 220, 220, 220, 216, 216, 215, 216, + 39, 39, 41, 41, 26, 26, 28, 28, + 139, 139, 141, 141, 126, 125, 128, 128, + 139, 139, 141, 141, 126, 125, 128, 127, + 238, 238, 240, 240, 225, 225, 227, 227, + 26, 26, 28, 28, 13, 13, 15, 15, + 126, 125, 128, 128, 112, 112, 115, 114, + 126, 125, 128, 127, 112, 112, 115, 114, + 225, 225, 227, 227, 212, 212, 214, 214, + 41, 41, 44, 43, 28, 28, 30, 30, + 141, 141, 143, 143, 128, 128, 130, 130, + 141, 141, 143, 143, 128, 127, 130, 130, + 240, 240, 242, 242, 227, 227, 229, 229, + 28, 28, 30, 30, 15, 15, 17, 17, + 128, 128, 130, 130, 115, 114, 117, 116, + 128, 127, 130, 130, 115, 114, 117, 116, + 227, 227, 229, 229, 214, 214, 216, 216, + 39, 39, 41, 41, 26, 26, 28, 28, + 139, 138, 141, 140, 125, 125, 128, 127, + 139, 138, 141, 140, 125, 125, 127, 127, + 238, 238, 240, 240, 225, 225, 227, 227, + 26, 26, 28, 28, 13, 13, 15, 15, + 125, 125, 128, 127, 112, 112, 114, 114, + 125, 125, 127, 127, 112, 112, 114, 114, + 225, 225, 227, 227, 212, 211, 214, 214, + 41, 41, 43, 43, 28, 28, 30, 30, + 141, 140, 143, 143, 128, 127, 130, 129, + 141, 140, 143, 143, 127, 127, 130, 129, + 240, 240, 242, 242, 227, 227, 229, 229, + 28, 28, 30, 30, 15, 15, 17, 17, + 128, 127, 130, 129, 114, 114, 116, 116, + 127, 127, 130, 129, 114, 114, 116, 116, + 227, 227, 229, 229, 214, 214, 216, 216, + 39, 39, 44, 43, 21, 21, 26, 25, + 183, 182, 187, 187, 165, 164, 170, 169, + 91, 90, 95, 95, 73, 72, 77, 77, + 234, 233, 239, 238, 216, 215, 221, 220, + 35, 34, 40, 39, 17, 16, 22, 21, + 178, 178, 183, 183, 161, 160, 165, 165, + 86, 86, 91, 91, 68, 68, 73, 73, + 230, 229, 235, 234, 212, 211, 217, 216, + 39, 38, 44, 43, 21, 20, 26, 25, + 182, 182, 187, 186, 164, 164, 169, 168, + 90, 90, 95, 94, 72, 72, 77, 76, + 234, 233, 238, 238, 216, 215, 220, 220, + 35, 34, 40, 39, 17, 16, 22, 21, + 178, 177, 183, 182, 160, 159, 165, 164, + 86, 85, 91, 90, 68, 67, 73, 72, + 229, 229, 234, 233, 211, 211, 216, 215, + 40, 39, 44, 44, 22, 21, 26, 26, + 183, 182, 188, 187, 165, 164, 170, 169, + 91, 90, 96, 95, 73, 72, 78, 77, + 234, 233, 239, 238, 216, 215, 221, 220, + 35, 35, 40, 39, 17, 17, 22, 21, + 179, 178, 183, 183, 161, 160, 165, 165, + 87, 86, 91, 91, 69, 68, 73, 73, + 230, 229, 235, 234, 212, 211, 217, 216, + 39, 38, 44, 43, 21, 20, 26, 25, + 182, 182, 187, 187, 164, 164, 169, 169, + 90, 90, 95, 94, 72, 72, 77, 77, + 234, 233, 239, 238, 216, 215, 221, 220, + 35, 34, 40, 39, 17, 16, 22, 21, + 178, 178, 183, 182, 160, 160, 165, 164, + 86, 85, 91, 90, 68, 68, 73, 72, + 230, 229, 234, 234, 212, 211, 216, 216, + 39, 38, 45, 44, 28, 27, 34, 33, + 209, 208, 215, 213, 198, 196, 203, 202, + 51, 50, 57, 56, 40, 39, 46, 44, + 221, 219, 227, 225, 209, 208, 215, 214, + 42, 41, 48, 47, 31, 30, 37, 36, + 212, 211, 218, 216, 201, 199, 206, 205, + 54, 53, 60, 59, 43, 42, 49, 47, + 224, 222, 230, 228, 212, 211, 218, 217, + 38, 37, 44, 42, 27, 25, 32, 31, + 207, 206, 213, 212, 196, 195, 202, 201, + 50, 48, 56, 54, 38, 37, 44, 43, + 219, 218, 225, 224, 208, 207, 214, 212, + 41, 40, 47, 45, 30, 28, 35, 34, + 210, 209, 216, 215, 199, 198, 205, 204, + 53, 51, 59, 57, 41, 40, 47, 46, + 222, 221, 228, 227, 211, 210, 217, 215, + 40, 38, 45, 44, 28, 27, 34, 33, + 209, 208, 215, 214, 198, 196, 204, 202, + 51, 50, 57, 56, 40, 39, 46, 45, + 221, 220, 227, 225, 210, 208, 215, 214, + 43, 41, 48, 47, 31, 30, 37, 36, + 212, 211, 218, 217, 201, 199, 207, 205, + 54, 53, 60, 59, 43, 42, 49, 48, + 224, 223, 230, 228, 213, 211, 218, 217, + 38, 37, 44, 43, 27, 25, 33, 31, + 208, 206, 213, 212, 196, 195, 202, 201, + 50, 49, 56, 54, 39, 37, 44, 43, + 219, 218, 225, 224, 208, 207, 214, 213, + 41, 40, 47, 46, 30, 28, 36, 34, + 211, 209, 216, 215, 199, 198, 205, 204, + 53, 52, 59, 57, 42, 40, 47, 46, + 222, 221, 228, 227, 211, 210, 217, 216 +}; + Added: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_hapn4800.h =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_hapn4800.h (rev 0) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_hapn4800.h 2008-04-11 21:12:04 UTC (rev 304) @@ -0,0 +1,93 @@ +/* + * THIS FILE IS GENERATED AUTOMATICALLY BY ./gentbl, DO NOT EDIT! + */ + + +/* + * hapn4800 specific tables + */ + +static unsigned char hapn48_txfilt_8[] = { + 127, 127, 92, 91, 151, 150, 115, 114, + 141, 140, 105, 104, 164, 163, 128, 128, + 128, 128, 63, 63, 193, 194, 129, 129, + 126, 126, 61, 62, 192, 192, 127, 127, + 128, 129, 37, 38, 224, 226, 134, 135, + 120, 121, 29, 31, 217, 218, 126, 127, + 128, 132, 19, 24, 239, 243, 130, 135, + 120, 125, 12, 16, 231, 236, 123, 127, + 127, 135, 16, 24, 236, 243, 125, 132, + 123, 130, 12, 19, 231, 239, 120, 128, + 127, 135, 31, 38, 218, 226, 121, 129, + 126, 134, 29, 37, 217, 224, 120, 128, + 127, 129, 62, 63, 192, 194, 126, 128, + 127, 129, 61, 63, 192, 193, 126, 128, + 128, 114, 104, 91, 163, 150, 140, 127, + 128, 115, 105, 92, 164, 151, 141, 127 +}; + +static unsigned char hapn48_txfilt_10[] = { + 127, 127, 94, 94, 146, 146, 113, 112, + 143, 142, 109, 109, 161, 161, 128, 128, + 128, 127, 72, 72, 182, 182, 126, 126, + 129, 129, 73, 73, 183, 183, 128, 127, + 127, 128, 49, 50, 211, 212, 133, 133, + 122, 122, 43, 44, 205, 206, 127, 128, + 127, 130, 30, 33, 231, 233, 133, 136, + 119, 122, 22, 24, 222, 225, 125, 128, + 127, 133, 18, 23, 240, 245, 130, 135, + 120, 125, 10, 15, 232, 237, 122, 128, + 128, 135, 15, 23, 237, 245, 125, 133, + 122, 130, 10, 18, 232, 240, 120, 127, + 128, 136, 24, 33, 225, 233, 122, 130, + 125, 133, 22, 30, 222, 231, 119, 127, + 128, 133, 44, 50, 206, 212, 122, 128, + 127, 133, 43, 49, 205, 211, 122, 127, + 127, 126, 73, 72, 183, 182, 129, 127, + 128, 126, 73, 72, 183, 182, 129, 128, + 128, 112, 109, 94, 161, 146, 142, 127, + 128, 113, 109, 94, 161, 146, 143, 127 +}; + +static unsigned char hapn48_txfilt_pm8[] = { + 12, 6, 242, 237, 18, 12, 248, 243, + 12, 7, 243, 237, 18, 13, 249, 243, + 12, 18, 243, 248, 7, 12, 237, 243, + 12, 18, 243, 248, 7, 12, 237, 243, + 12, 39, 225, 252, 3, 30, 216, 243, + 12, 39, 225, 252, 3, 30, 216, 243, + 11, 70, 193, 252, 3, 62, 185, 244, + 11, 70, 193, 252, 3, 62, 185, 244, + 11, 109, 152, 250, 5, 103, 146, 244, + 11, 109, 152, 250, 5, 103, 146, 244, + 9, 150, 107, 248, 7, 148, 105, 246, + 9, 150, 107, 248, 7, 148, 105, 246, + 8, 189, 66, 248, 7, 189, 66, 247, + 8, 189, 66, 248, 7, 189, 66, 247, + 7, 221, 34, 248, 7, 221, 34, 248, + 7, 221, 34, 248, 7, 221, 34, 248 +}; + +static unsigned char hapn48_txfilt_pm10[] = { + 12, 12, 8, 8, 243, 243, 238, 238, + 17, 17, 12, 12, 247, 247, 243, 243, + 8, 8, 12, 13, 238, 239, 243, 243, + 12, 12, 16, 17, 242, 243, 247, 247, + 8, 8, 28, 28, 227, 227, 247, 247, + 8, 8, 28, 28, 227, 227, 247, 247, + 9, 8, 50, 50, 207, 206, 248, 248, + 7, 7, 49, 48, 205, 205, 247, 246, + 10, 9, 79, 78, 179, 178, 249, 248, + 7, 6, 77, 76, 177, 176, 246, 245, + 11, 8, 113, 110, 147, 144, 249, 246, + 9, 6, 111, 108, 145, 142, 247, 244, + 12, 7, 148, 143, 114, 109, 250, 245, + 10, 5, 146, 141, 112, 107, 248, 243, + 12, 5, 181, 174, 82, 74, 251, 244, + 11, 4, 181, 173, 81, 74, 250, 243, + 12, 3, 210, 201, 54, 45, 252, 243, + 12, 3, 210, 201, 54, 45, 252, 243, + 12, 4, 231, 223, 32, 24, 251, 243, + 12, 4, 231, 223, 32, 24, 251, 243 +}; + Added: trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_psk4800.h =================================================================== --- trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_psk4800.h (rev 0) +++ trunk/kernel/linux-open2x-2.4.26_FW2-3/drivers/net/hamradio/soundmodem/sm_tbl_psk4800.h 2008-04-11 21:12:04 UTC (rev 304) @@ -0,0 +1,373 @@ +/* + * THIS FILE IS GENERATED AUTOMATICALLY BY ./gentbl, DO NOT EDIT! + */ + + +/* + * psk4800 specific tables + */ +#define PSK48_TXF_OVERSAMPLING 5 +#define PSK48_TXF_NUMSAMPLES 16 + +#define PSK48_SAMPLERATE 8000 +#define PSK48_CAR_FREQ 2000 +#define PSK48_PSK_LEN 5 +#define PSK48_RXF_LEN 64 +#define PSK48_PHASEINC (0x10000*PSK48_CAR_FREQ/PSK48_SAMPLERATE) +#define PSK48_SPHASEINC (0x10000/(2*PSK48_PSK_LEN)) + +static const short psk48_tx_table[PSK48_TXF_OVERSAMPLING*PSK48_TXF_NUMSAMPLES*8*2] = { + -12, -8, 0, 8, 12, 8, 0, -8, + 0, -8, -12, -8, 0, 8, 12, 8, + -20, -14, 0, 14, 20, 14, 0, -14, + 0, -14, -20, -14, 0, 14, 20, 14, + -45, -32, 0, 32, 45, 32, 0, -32, + 0, -32, -45, -32, 0, 32, 45, 32, + -92, -65, 0, 65, 92, 65, 0, -65, + 0, -65, -92, -65, 0, 65, 92, 65, + -172, -122, 0, 122, 172, 122, 0, -122, + 0, -122, -172, -122, 0, 122, 172, 122, + -307, -217, 0, 217, 307, 217, 0, -217, + 0, -217, -307, -217, 0, 217, 307, 217, + -564, -399, 0, 399, 564, 399, 0, -399, + 0, -399, -564, -399, 0, 399, 564, 399, + -1322, -935, 0, 935, 1322, 935, 0, -935, + 0, -935, -1322, -935, 0, 935, 1322, 935, + 12256, 8666, 0, -8666, -12256, -8666, 0, 8666, + 0, 8666, 12256, 8666, 0, -8666, -12256, -8666, + 1066, 754, 0, -754, -1066, -754, 0, 754, + 0, 754, 1066, 754, 0, -754, -1066, -754, + 495, 350, 0, -350, -495, -350, 0, 350, + 0, 350, 495, 350, 0, -350, -495, -350, + 273, 193, 0, -193, -273, -193, 0, 193, + 0, 193, 273, 193, 0, -193, -273, -193, + 153, 108, 0, -108, -153, -108, 0, 108, + 0, 108, 153, 108, 0, -108, -153, -108, + 81, 57, 0, -57, -81, -57, 0, 57, + 0, 57, 81, 57, 0, -57, -81, -57, + 38, 27, 0, -27, -38, -27, 0, 27, + 0, 27, 38, 27, 0, -27, -38, -27, + 17, 12, 0, -12, -17, -12, 0, 12, + 0, 12, 17, 12, 0, -12, -17, -12, + -20, -14, 0, 14, 20, 14, 0, -14, + 0, -14, -20, -14, 0, 14, 20, 14, + -38, -27, 0, 27, 38, 27, 0, -27, + 0, -27, -38, -27, 0, 27, 38, 27, + -85, -60, 0, 60, 85, 60, 0, -60, + 0, -60, -85, -60, 0, 60, 85, 60, + -170, -120, 0, 120, 170, 120, 0, -120, + 0, -120, -170, -120, 0, 120, 170, 120, + -314, -222, 0, 222, 314, 222, 0, -222, + 0, -222, -314, -222, 0, 222, 314, 222, + -557, -394, 0, 394, 557, 394, 0, -394, + 0, -394, -557, -394, 0, 394, 557, 394, + -1048, -741, 0, 741, 1048, 741, 0, -741, + 0, -741, -1048, -741, 0, 741, 1048, 741, + -2783, -1968, 0, 1968, 2783, 1968, 0, -1968, + 0, -1968, -2783, -1968, 0, 1968, 2783, 1968, + 6591, 4660, 0, -4660, -6591, -4660, 0, 4660, + 0, 4660, 6591, 4660, 0, -4660, -6591, -4660, + 1434, 1014, 0, -1014, -1434, -1014, 0, 1014, + 0, 1014, 1434, 1014, 0, -1014, -1434, -1014, + 707, 500, 0, -500, -707, -500, 0, 500, + 0, 500, 707, 500, 0, -500, -707, -500, + 395, 279, 0, -279, -395, -279, 0, 279, + 0, 279, 395, 279, 0, -279, -395, -279, + 219, 155, 0, -155, -219, -155, 0, 155, + 0, 155, 219, 155, 0, -155, -219, -155, + 114, 80, 0, -80, -114, -80, 0, 80, + 0, 80, 114, 80, 0, -80, -114, -80, + 53, 37, 0, -37, -53, -37, 0, 37, + 0, 37, 53, 37, 0, -37, -53, -37, + 25, 17, 0, -17, -25, -17, 0, 17, + 0, 17, 25, 17, 0, -17, -25, -17, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 25, 17, 0, -17, -25, -17, 0, 17, + 0, 17, 25, 17, 0, -17, -25, -17, + 53, 37, 0, -37, -53, -37, 0, 37, + 0, 37, 53, 37, 0, -37, -53, -37, + 114, 80, 0, -80, -114, -80, 0, 80, + 0, 80, 114, 80, 0, -80, -114, -80, + 219, 155, 0, -155, -219, -155, 0, 155, + 0, 155, 219, 155, 0, -155, -219, -155, + 395, 279, 0, -279, -395, -279, 0, 279, + 0, 279, 395, 279, 0, -279, -395, -279, + 707, 500, 0, -500, -707, -500, 0, 500, + 0, 500, 707, 500, 0, -500, -707, -500, + 1434, 1014, 0, -1014, -1434, -1014, 0, 1014, + 0, 1014, 1434, 1014, 0, -1014, -1434, -1014, + 6591, 4660, 0, -4660, -6591, -4660, 0, 4660, + 0, 4660, 6591, 4660, 0, -4660, -6591, -4660, + -2783, -1968, 0, 1968, 2783, 1968, 0, -1968, + 0, -1968, -2783, -1968, 0, 1968, 2783, 1968, + -1048, -741, 0, 741, 1048, 741, 0, -741, + 0, -741, -1048, -741, 0, 741, 1048, 741, + -557, -394, 0, 394, 557, 394, 0, -394, + 0, -394, -557, -394, 0, 394, 557, 394, + -314, -222, 0, 222, 314, 222, 0, -222, + 0, -222, -314, -222, 0, 222, 314, 222, + -170, -120, 0, 120, 170, 120, 0, -120, + 0, -120, -170, -120, 0, 120, 170, 120, + -85, -60, 0, 60, 85, 60, 0, -60, + 0, -60, -85, -60, 0, 60, 85, 60, + -38, -27, 0, 27, 38, 27, 0, -27, + 0, -27, -38, -27, 0, 27, 38, 27, + -20, -14, 0, 14, 20, 14, 0, -14, + 0, -14, -20, -14, 0, 14, 20, 14, + 17, 12, 0, -12, -17, -12, 0, 12, + 0, 12, 17, 12, 0, -12, -17, -12, + 38, 27, 0, -27, -38, -27, 0, 27, + 0, 27, 38, 27, 0, -27, -38, -27, + 81, 57, 0, -57, -81, -57, 0, 57, + 0, 57, 81, 57, 0, -57, -81, -57, + 153, 108, 0, -108, -153, -108, 0, 108, + 0, 108, 153, 108, 0, -108, -153, -108, + 273, 193, 0, -193, -273, -193, 0, 193, + 0, 193, 273, 193, 0, -193, -273, -193, + 495, 350, 0, -350, -495, -350, 0, 350, + 0, 350, 495, 350, 0, -350, -495, -350, + 1066, 754, 0, -754, -1066, -754, 0, 754, + 0, 754, 1066, 754, 0, -754, -1066, -754, + 12256, 8666, 0, -8666, -12256, -8666, 0, 8666, + 0, 8666, 12256, 8666, 0, -8666, -12256, -8666, + -1322, -935, 0, 935, 1322, 935, 0, -935, + 0, -935, -1322, -935, 0, 935, 1322, 935, + -564, -399, 0, 399, 564, 399, 0, -399, + 0, -399, -564, -399, 0, 399, 564, 399, + -307, -217, 0, 217, 307, 217, 0, -217, + 0, -217, -307, -217, 0, 217, 307, 217, + -172, -122, 0, 122, 172, 122, 0, -122, + 0, -122, -172, -122, 0, 122, 172, 122, + -92, -65, 0, 65, 92, 65, 0, -65, + 0, -65, -92, -65, 0, 65, 92, 65, + -45, -32, 0, 32, 45, 32, 0, -32, + 0, -32, -45, -32, 0, 32, 45, 32, + -20, -14, 0, 14, 20, 14, 0, -14, + 0, -14, -20, -14, 0, 14, 20, 14, + -12, -8, 0, 8, 12, 8, 0, -8, + 0, -8, -12, -8, 0, 8, 12, 8 +}; + +static const short psk48_rx_coeff[PSK48_RXF_LEN] = { + -7, 11, 28, 35, 24, -6, -48, -79, + -76, -22, 68, 157, 186, 114, -53, -250, + -370, -315, -58, 318, 636, 694, 371, -281, + -1014, -1444, -1200, -86, 1793, 4033, 6035, 7215, + 7215, 6035, 4033, 1793, -86, -1200, -1444, -1014, + -281, 371, 694, 636, 318, -58, -315, -370, + -250, -53, 114, 186, 157, 68, -22, -76, + -79, -48, -6, 24, 35, 28, 11, -7 +}; + + +/* + * more accurate cosine table + */ + +static const short costab[256] = { + 32767, 32757, 32727, 32678, 32609, 32520, 32412, 32284, + 32137, 31970, 31785, 31580, 31356, 31113, 30851, 30571, + 30272, 29955, 29621, 29268, 28897, 28510, 28105, 27683, + 27244, 26789, 26318, 25831, 25329, 24811, 24278, 23731, + 23169, 22594, 22004, 21402, 20787, 20159, 19519, 18867, + 18204, 17530, 16845, 16150, 15446, 14732, 14009, 13278, + 12539, 11792, 11038, 10278, 9511, 8739, 7961, 7179, + 6392, 5601, 4807, 4011, 3211, 2410, 1607, 804, + 0, -804, -1607, -2410, -3211, -4011, -4807, -5601, + -6392, -7179, -7961, -8739, -9511, -10278, -11038, -11792, + -12539, -13278, -14009, -14732, -15446, -16150, -16845, -17530, + -18204, -18867, -19519, -20159, -20787, -21402, -22004, -22594, + -23169, -23731, -24278, -24811, -25329, -25831, -26318, -26789, + -27244, -27683, -28105, -28510, -28897, -29268, -29621, -29955, + -30272, -30571, -30851, -31113, -31356, -31580, -31785, -31970, + -32137, -32284, -32412, -32520, -32609, -32678, -32727, -32757, + -32767, -32757, -32727, -32678, -32609, -32520, -32412, -32284, + -32137, -31970, -31785, -31580, -31356, -31113, -30851, -30571, + -30272, -29955, -29621, -29268, -28897, -28510, -28105, -27683, + -27244, -26789, -26318, -25831, -25329, -24811, -24278, -23731, + -23169, -22594, -22004, -21402, -20787, -20159, -19519, -18867, + -18204, -17530, -16845, -16150, -15446, -14732, -14009, -13278, + -12539, -11792, -11038, -10278, -9511, -8739, -7961, -7179, + -6392, -5601, -4807, -4011, -3211, -2410, -1607, -804, + 0, 804, 1607, 2410, 3211, 4011, 4807, 5601, + 6392, 7179, 7961, 8739, 9511, 10278, 11038, 11792, + 12539, 13278, 14009, 14732, 15446, 16150, 16845, 17530, + 18204, 18867, 19519, 20159, 20787, 21402, 22004, 22594, + 23169, 23731, 24278, 24811, 25329, 25831, 26318, 26789, + 27244, 27683, 28105, 28510, 28897, 29268, 29621, 29955, + 30272, 30571, 30851, 31113, 31356, 31580, 31785, 31970, + 32137, 32284, 32412, 32520, 32609, 32678, 32727, 32757 +}; + +#define COS(x) costab[((x)>>8)&0xff] +#define SIN(x) COS((x)+0xc000) + + +/* + * arctan table (indexed by i/q; should really be indexed by i/(i+q) + */ +#define ATAN_TABLEN 1024 + +static const unsigned short atan_tab[ATAN_TABLEN+2] = { + 0, 10, 20, 30, 40, 50, 61, 71, + 81, 91, 101, 112, 122, 132, 142, 152, + 162, 173, 183, 193, 203, 213, 224, 234, + 244, 254, 264, 274, 285, 295, 305, 315, + 325, 336, 346, 356, 366, 376, 386, 397, + 407, 417, 427, 437, 447, 458, 468, 478, + 488, 498, 508, 519, 529, 539, 549, 559, + 569, 579, 590, 600, 610, 620, 630, 640, + 651, 661, 671, 681, 691, 701, 711, 722, + 732, 742, 752, 762, 772, 782, 792, 803, + 813, 823, 833, 843, 853, 863, 873, 884, + 894, 904, 914, 924, 934, 944, 954, 964, + 974, 985, 995, 1005, 1015, 1025, 1035, 1045, + 1055, 1065, 1075, 1085, 1096, 1106, 1116, 1126, + 1136, 1146, 1156, 1166, 1176, 1186, 1196, 1206, + 1216, 1226, 1236, 1246, 1256, 1266, 1277, 1287, + 1297, 1307, 1317, 1327, 1337, 1347, 1357, 1367, + 1377, 1387, 1397, 1407, 1417, 1427, 1437, 1447, + 1457, 1467, 1477, 1487, 1497, 1507, 1517, 1527, + 1537, 1547, 1556, 1566, 1576, 1586, 1596, 1606, + 1616, 1626, 1636, 1646, 1656, 1666, 1676, 1686, + 1696, 1706, 1715, 1725, 1735, 1745, 1755, 1765, + 1775, 1785, 1795, 1805, 1814, 1824, 1834, 1844, + 1854, 1864, 1874, 1884, 1893, 1903, 1913, 1923, + 1933, 1943, 1952, 1962, 1972, 1982, 1992, 2002, + 2011, 2021, 2031, 2041, 2051, 2060, 2070, 2080, + 2090, 2100, 2109, 2119, 2129, 2139, 2148, 2158, + 2168, 2178, 2187, 2197, 2207, 2217, 2226, 2236, + 2246, 2255, 2265, 2275, 2285, 2294, 2304, 2314, + 2323, 2333, 2343, 2352, 2362, 2372, 2381, 2391, + 2401, 2410, 2420, 2430, 2439, 2449, 2459, 2468, + 2478, 2488, 2497, 2507, 2516, 2526, 2536, 2545, + 2555, 2564, 2574, 2583, 2593, 2603, 2612, 2622, + 2631, 2641, 2650, 2660, 2669, 2679, 2688, 2698, + 2708, 2717, 2727, 2736, 2746, 2755, 2765, 2774, + 2784, 2793, 2802, 2812, 2821, 2831, 2840, 2850, + 2859, 2869, 2878, 2887, 2897, 2906, 2916, 2925, + 2935, 2944, 2953, 2963, 2972, 2981, 2991, 3000, + 3010, 3019, 3028, 3038, 3047, 3056, 3066, 3075, + 3084, 3094, 3103, 3112, 3122, 3131, 3140, 3149, + 3159, 3168, 3177, 3187, 3196, 3205, 3214, 3224, + 3233, 3242, 3251, 3260, 3270, 3279, 3288, 3297, + 3307, 3316, 3325, 3334, 3343, 3352, 3362, 3371, + 3380, 3389, 3398, 3407, 3416, 3426, 3435, 3444, + 3453, 3462, 3471, 3480, 3489, 3498, 3508, 3517, + 3526, 3535, 3544, 3553, 3562, 3571, 3580, 3589, + 3598, 3607, 3616, 3625, 3634, 3643, 3652, 3661, + 3670, 3679, 3688, 3697, 3706, 3715, 3724, 3733, + 3742, 3751, 3759, 3768, 3777, 3786, 3795, 3804, + 3813, 3822, 3831, 3839, 3848, 3857, 3866, 3875, + 3884, 3893, 3901, 3910, 3919, 3928, 3937, 3945, + 3954, 3963, 3972, 3981, 3989, 3998, 4007, 4016, + 4024, 4033, 4042, 4051, 4059, 4068, 4077, 4085, + 4094, 4103, 4112, 4120, 4129, 4138, 4146, 4155, + 4164, 4172, 4181, 4189, 4198, 4207, 4215, 4224, + 4233, 4241, 4250, 4258, 4267, 4275, 4284, 4293, + 4301, 4310, 4318, 4327, 4335, 4344, 4352, 4361, + 4369, 4378, 4386, 4395, 4403, 4412, 4420, 4429, + 4437, 4446, 4454, 4462, 4471, 4479, 4488, 4496, + 4505, 4513, 4521, 4530, 4538, 4546, 4555, 4563, + 4572, 4580, 4588, 4597, 4605, 4613, 4622, 4630, + 4638, 4646, 4655, 4663, 4671, 4680, 4688, 4696, + 4704, 4713, 4721, 4729, 4737, 4745, 4754, 4762, + 4770, 4778, 4787, 4795, 4803, 4811, 4819, 4827, + 4836, 4844, 4852, 4860, 4868, 4876, 4884, 4892, + 4901, 4909, 4917, 4925, 4933, 4941, 4949, 4957, + 4965, 4973, 4981, 4989, 4997, 5005, 5013, 5021, + 5029, 5037, 5045, 5053, 5061, 5069, 5077, 5085, + 5093, 5101, 5109, 5117, 5125, 5133, 5141, 5148, + 5156, 5164, 5172, 5180, 5188, 5196, 5204, 5211, + 5219, 5227, 5235, 5243, 5251, 5258, 5266, 5274, + 5282, 5290, 5297, 5305, 5313, 5321, 5328, 5336, + 5344, 5352, 5359, 5367, 5375, 5383, 5390, 5398, + 5406, 5413, 5421, 5429, 5436, 5444, 5452, 5459, + 5467, 5475, 5482, 5490, 5497, 5505, 5513, 5520, + 5528, 5535, 5543, 5550, 5558, 5566, 5573, 5581, + 5588, 5596, 5603, 5611, 5618, 5626, 5633, 5641, + 5648, 5656, 5663, 5671, 5678, 5686, 5693, 5700, + 5708, 5715, 5723, 5730, 5738, 5745, 5752, 5760, + 5767, 5774, 5782, 5789, 5797, 5804, 5811, 5819, + 5826, 5833, 5841, 5848, 5855, 5862, 5870, 5877, + 5884, 5892, 5899, 5906, 5913, 5921, 5928, 5935, + 5942, 5949, 5957, 5964, 5971, 5978, 5985, 5993, + 6000, 6007, 6014, 6021, 6028, 6036, 6043, 6050, + 6057, 6064, 6071, 6078, 6085, 6093, 6100, 6107, + 6114, 6121, 6128, 6135, 6142, 6149, 6156, 6163, + 6170, 6177, 6184, 6191, 6198, 6205, 6212, 6219, + 6226, 6233, 6240, 6247, 6254, 6261, 6268, 6275, + 6282, 6288, 6295, 6302, 6309, 6316, 6323, 6330, + 6337, 6344, 6350, 6357, 6364, 6371, 6378, 6385, + 6391, 6398, 6405, 6412, 6419, 6425, 6432, 6439, + 6446, 6453, 6459, 6466, 6473, 6480, 6486, 6493, + 6500, 6506, 6513, 6520, 6527, 6533, 6540, 6547, + 6553, 6560, 6567, 6573, 6580, 6586, 6593, 6600, + 6606, 6613, 6620, 6626, 6633, 6639, 6646, 6653, + 6659, 6666, 6672, 6679, 6685, 6692, 6698, 6705, + 6711, 6718, 6724, 6731, 6737, 6744, 6750, 6757, + 6763, 6770, 6776, 6783, 6789, 6796, 6802, 6809, + 6815, 6821, 6828, 6834, 6841, 6847, 6853, 6860, + 6866, 6873, 6879, 6885, 6892, 6898, 6904, 6911, + 6917, 6923, 6930, 6936, 6942, 6949, 6955, 6961, + 6967, 6974, 6980, 6986, 6992, 6999, 7005, 7011, + 7017, 7024, 7030, 7036, 7042, 7048, 7055, 7061, + 7067, 7073, 7079, 7086, 7092, 7098, 7104, 7110, + 7116, 7122, 7129, 7135, 7141, 7147, 7153, 7159, + 7165, 7171, 7177, 7183, 7190, 7196, 7202, 7208, + 7214, 7220, 7226, 7232, 7238, 7244, 7250, 7256, + 7262, 7268, 7274, 7280, 7286, 7292, 7298, 7304, + 7310, 7316, 7322, 7328, 7333, 7339, 7345, 7351, + 7357, 7363, 7369, 7375, 7381, 7387, 7392, 7398, + 7404, 7410, 7416, 7422, 7428, 7433, 7439, 7445, + 7451, 7457, 7462, 7468, 7474, 7480, 7486, 7491, + 7497, 7503, 7509, 7514, 7520, 7526, 7532, 7537, + 7543, 7549, 7555, 7560, 7566, 7572, 7577, 7583, + 7589, 7594, 7600, 7606, 7611, 7617, 7623, 7628, + 7634, 7640, 7645, 7651, 7657, 7662, 7668, 7673, + 7679, 7685, 7690, 7696, 7701, 7707, 7712, 7718, + 7724, 7729, 7735, 7740, 7746, 7751, 7757, 7762, + 7768, 7773, 7779, 7784, 7790, 7795, 7801, 7806, + 7812, 7817, 7823, 7828, 7833, 7839, 7844, 7850, + 7855, 7861, 7866, 7871, 7877, 7882, 7888, 7893, + 7898, 7904, 7909, 7914, 7920, 7925, 7931, 7936, + 7941, 7947, 7952, 7957, 7963, 7968, 7973, 7978, + 7984, 7989, 7994, 8000, 8005, 8010, 8015, 8021, + 8026, 8031, 8036, 8042, 8047, 8052, 8057, 8063, + 8068, 8073, 8078, 8083, 8089, 8094, 8099, 8104, + 8109, 8115, 8120, 8125, 8130, 8135, 8140, 8145, + 8151, 8156, 8161, 8166, 8171, 8176, 8181, 8186, + 8192, 8192 +}; + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <djw...@us...> - 2008-04-02 20:57:36
|
Revision: 303 http://open2x.svn.sourceforge.net/open2x/?rev=303&view=rev Author: djwillis Date: 2008-04-01 13:09:47 -0700 (Tue, 01 Apr 2008) Log Message: ----------- Add file that seems to be missing from the 1.2.9 tree. Not sure why. Added Paths: ----------- trunk/libs/SDL-1.2.9/src/video/gp2x/SDL_gp2xkeys.h Added: trunk/libs/SDL-1.2.9/src/video/gp2x/SDL_gp2xkeys.h =================================================================== --- trunk/libs/SDL-1.2.9/src/video/gp2x/SDL_gp2xkeys.h (rev 0) +++ trunk/libs/SDL-1.2.9/src/video/gp2x/SDL_gp2xkeys.h 2008-04-01 20:09:47 UTC (rev 303) @@ -0,0 +1,170 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2004 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + Sam Lantinga + sl...@li... +*/ + +#ifdef SAVE_RCSID +static char rcsid = + "@(#) $Id: $"; +#endif + +#ifndef _SDL_gp2xkeys_h +#define _SDL_gp2xkeys_h + + +/* Scancodes for the Linux console + - Bits taken with thanks from SVGAlib 1.4.0 +*/ + +#define SCANCODE_ESCAPE 1 + +#define SCANCODE_1 2 +#define SCANCODE_2 3 +#define SCANCODE_3 4 +#define SCANCODE_4 5 +#define SCANCODE_5 6 +#define SCANCODE_6 7 +#define SCANCODE_7 8 +#define SCANCODE_8 9 +#define SCANCODE_9 10 +#define SCANCODE_0 11 + +#define SCANCODE_MINUS 12 +#define SCANCODE_EQUAL 13 + +#define SCANCODE_BACKSPACE 14 +#define SCANCODE_TAB 15 + +#define SCANCODE_Q 16 +#define SCANCODE_W 17 +#define SCANCODE_E 18 +#define SCANCODE_R 19 +#define SCANCODE_T 20 +#define SCANCODE_Y 21 +#define SCANCODE_U 22 +#define SCANCODE_I 23 +#define SCANCODE_O 24 +#define SCANCODE_P 25 +#define SCANCODE_BRACKET_LEFT 26 +#define SCANCODE_BRACKET_RIGHT 27 + +#define SCANCODE_ENTER 28 + +#define SCANCODE_LEFTCONTROL 29 + +#define SCANCODE_A 30 +#define SCANCODE_S 31 +#define SCANCODE_D 32 +#define SCANCODE_F 33 +#define SCANCODE_G 34 +#define SCANCODE_H 35 +#define SCANCODE_J 36 +#define SCANCODE_K 37 +#define SCANCODE_L 38 +#define SCANCODE_SEMICOLON 39 +#define SCANCODE_APOSTROPHE 40 +#define SCANCODE_GRAVE 41 + +#define SCANCODE_LEFTSHIFT 42 +#define SCANCODE_BACKSLASH 43 + +#define SCANCODE_Z 44 +#define SCANCODE_X 45 +#define SCANCODE_C 46 +#define SCANCODE_V 47 +#define SCANCODE_B 48 +#define SCANCODE_N 49 +#define SCANCODE_M 50 +#define SCANCODE_COMMA 51 +#define SCANCODE_PERIOD 52 +#define SCANCODE_SLASH 53 + +#define SCANCODE_RIGHTSHIFT 54 +#define SCANCODE_KEYPADMULTIPLY 55 + +#define SCANCODE_LEFTALT 56 +#define SCANCODE_SPACE 57 +#define SCANCODE_CAPSLOCK 58 + +#define SCANCODE_F1 59 +#define SCANCODE_F2 60 +#define SCANCODE_F3 61 +#define SCANCODE_F4 62 +#define SCANCODE_F5 63 +#define SCANCODE_F6 64 +#define SCANCODE_F7 65 +#define SCANCODE_F8 66 +#define SCANCODE_F9 67 +#define SCANCODE_F10 68 + +#define SCANCODE_NUMLOCK 69 +#define SCANCODE_SCROLLLOCK 70 + +#define SCANCODE_KEYPAD7 71 +#define SCANCODE_CURSORUPLEFT 71 +#define SCANCODE_KEYPAD8 72 +#define SCANCODE_CURSORUP 72 +#define SCANCODE_KEYPAD9 73 +#define SCANCODE_CURSORUPRIGHT 73 +#define SCANCODE_KEYPADMINUS 74 +#define SCANCODE_KEYPAD4 75 +#define SCANCODE_CURSORLEFT 75 +#define SCANCODE_KEYPAD5 76 +#define SCANCODE_KEYPAD6 77 +#define SCANCODE_CURSORRIGHT 77 +#define SCANCODE_KEYPADPLUS 78 +#define SCANCODE_KEYPAD1 79 +#define SCANCODE_CURSORDOWNLEFT 79 +#define SCANCODE_KEYPAD2 80 +#define SCANCODE_CURSORDOWN 80 +#define SCANCODE_KEYPAD3 81 +#define SCANCODE_CURSORDOWNRIGHT 81 +#define SCANCODE_KEYPAD0 82 +#define SCANCODE_KEYPADPERIOD 83 + +#define SCANCODE_LESS 86 + +#define SCANCODE_F11 87 +#define SCANCODE_F12 88 + +#define SCANCODE_KEYPADENTER 96 +#define SCANCODE_RIGHTCONTROL 97 +#define SCANCODE_CONTROL 97 +#define SCANCODE_KEYPADDIVIDE 98 +#define SCANCODE_PRINTSCREEN 99 +#define SCANCODE_RIGHTALT 100 +#define SCANCODE_BREAK 101 /* Beware: is 119 */ +#define SCANCODE_BREAK_ALTERNATIVE 119 /* on some keyboards! */ + +#define SCANCODE_HOME 102 +#define SCANCODE_CURSORBLOCKUP 103 /* Cursor key block */ +#define SCANCODE_PAGEUP 104 +#define SCANCODE_CURSORBLOCKLEFT 105 /* Cursor key block */ +#define SCANCODE_CURSORBLOCKRIGHT 106 /* Cursor key block */ +#define SCANCODE_END 107 +#define SCANCODE_CURSORBLOCKDOWN 108 /* Cursor key block */ +#define SCANCODE_PAGEDOWN 109 +#define SCANCODE_INSERT 110 +#define SCANCODE_REMOVE 111 + +#define SCANCODE_RIGHTWIN 126 +#define SCANCODE_LEFTWIN 125 + +#endif // _SDL_gp2xkeys_h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <djw...@us...> - 2008-03-30 20:12:58
|
Revision: 302 http://open2x.svn.sourceforge.net/open2x/?rev=302&view=rev Author: djwillis Date: 2008-03-30 13:13:02 -0700 (Sun, 30 Mar 2008) Log Message: ----------- More cleanup and start to support the Wintek LCD on the F200. Modified Paths: -------------- trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/board/mmsp2dtk/mmsp2dtk.c trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/board/mmsp2dtk/sound/sound_logo.c trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/board/mmsp2dtk/video/logo.c trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/common/cmd_fat.c trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/common/cmd_nand.c trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/common/main.c Modified: trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/board/mmsp2dtk/mmsp2dtk.c =================================================================== --- trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/board/mmsp2dtk/mmsp2dtk.c 2008-03-30 19:37:44 UTC (rev 301) +++ trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/board/mmsp2dtk/mmsp2dtk.c 2008-03-30 20:13:02 UTC (rev 302) @@ -10,6 +10,10 @@ * DIGNSYS Inc. < www.dignsys.com > * Kane Ahn < hb...@di... > * + * (C) Copyright 2005-2008 + * Open2x Project + * John Willis + * * See file CREDITS for list of people who contributed to this * project. * @@ -153,6 +157,17 @@ #define writeb(b,addr) (*(volatile unsigned char *) (addr) = (b)) +#if WINTEK_LCD +#define CS_HIGH(gpio) (gpio->GPIOOUT['H'-'A'] = gpio->GPIOOUT['H'-'A'] | (1<<4) ) +#define CS_LOW(gpio) (gpio->GPIOOUT['H'-'A'] = gpio->GPIOOUT['H'-'A'] & (~(1<<4)) ) + +#define SCL_HIGH(gpio) (gpio->GPIOOUT['M'-'A'] = gpio->GPIOOUT['M'-'A'] | (1<<4) ) +#define SCL_LOW(gpio) (gpio->GPIOOUT['M'-'A'] = gpio->GPIOOUT['M'-'A'] & (~(1<<4)) ) + +#define SDA_HIGH(gpio) (gpio->GPIOOUT['M'-'A'] = gpio->GPIOOUT['M'-'A'] | (1<<3) ) +#define SDA_LOW(gpio) (gpio->GPIOOUT['M'-'A'] = gpio->GPIOOUT['M'-'A'] & (~(1<<3)) ) +#endif + #define DEBUG_MMSP2DTK 0 #if DEBUG_MMSP2DTK #define DPRINTF(args...) printf(args) Modified: trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/board/mmsp2dtk/sound/sound_logo.c =================================================================== --- trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/board/mmsp2dtk/sound/sound_logo.c 2008-03-30 19:37:44 UTC (rev 301) +++ trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/board/mmsp2dtk/sound/sound_logo.c 2008-03-30 20:13:02 UTC (rev 302) @@ -102,6 +102,16 @@ U32 filesize,memaddr; int ret; +#ifdef CONFIG_GPF200 + if(flag) + { + nand_read_func(0x1000000, 0x80000,0xB0000); + return; + } + + flag=0; +#endif + ret = nand_read_jffs2_func(PA_SOUND_DMA_BASE1, WAV_BASE, 0x40000); memcpy(&waveheader ,PA_SOUND_DMA_BASE1 ,sizeof(waveheader)); @@ -117,6 +127,7 @@ printf("BytesPerSample:%d\n", waveheader.BytesPerSample); printf("BitsPerSample:%d\n", waveheader.BitsPerSample); printf("data_size:%x\n", waveheader.data_size); + //nand_read_func(0x1000000, 0x80000,0xB0000); return; } Modified: trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/board/mmsp2dtk/video/logo.c =================================================================== --- trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/board/mmsp2dtk/video/logo.c 2008-03-30 19:37:44 UTC (rev 301) +++ trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/board/mmsp2dtk/video/logo.c 2008-03-30 20:13:02 UTC (rev 302) @@ -637,8 +637,13 @@ ,CTRUE,CFALSE,CTRUE); #endif - DPC_UTIL_HVSYNC_GPX320240(DPC_RGB_666, LCD_WIDTH,LCD_HEIGHT,30, 20, 38, CFALSE,4, 4, 15,CFALSE - ,CTRUE,CFALSE,CTRUE); +#if WINTEK_LCD + DPC_UTIL_HVSYNC_GPX320240(DPC_RGB_666, LCD_WIDTH,LCD_HEIGHT,2, 4, 4, CFALSE,2, 1, 3,CFALSE + ,CFALSE,CFALSE,CFALSE); +#else + DPC_UTIL_HVSYNC_GPX320240(DPC_RGB_666, LCD_WIDTH,LCD_HEIGHT,30, 20, 38, CFALSE,4, 4, 15,CFALSE + ,CTRUE,CFALSE,CTRUE); +#endif MLC_RGB_SetBPP(MLC_RGB_16BPP); MLC_RGB_SetColorKey(0xff, 0xff, 0xff); Modified: trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/common/cmd_fat.c =================================================================== --- trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/common/cmd_fat.c 2008-03-30 19:37:44 UTC (rev 301) +++ trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/common/cmd_fat.c 2008-03-30 20:13:02 UTC (rev 302) @@ -67,48 +67,59 @@ } -int do_fat_fsload (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +int do_fat_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { long size; unsigned long offset; unsigned long count; char buf [12]; - block_dev_desc_t *dev_desc=NULL; - int dev=0; - int part=1; + block_dev_desc_t *dev_desc = NULL; + int dev = 0; + int part = 1; char *ep; - if (argc < 5) { + if(argc < 5) + { printf ("usage: fatload <interface> <dev[:part]> <addr> <filename> [bytes]\n"); return (0); } dev = (int)simple_strtoul (argv[2], &ep, 16); - dev_desc=get_dev(argv[1],dev); - if (dev_desc==NULL) { + dev_desc = get_dev(argv[1], dev); + + if(dev_desc == NULL) + { puts ("\n** Invalid boot device **\n"); return 1; } - if (*ep) { - if (*ep != ':') { + if(*ep) + { + if (*ep != ':') + { puts ("\n** Invalid boot device, use `dev[:part]' **\n"); return 1; } part = (int)simple_strtoul(++ep, NULL, 16); } - if (fat_register_device(dev_desc,part)!=0) { + + if(fat_register_device(dev_desc, part)!=0) + { printf ("\n** Unable to use %s %d:%d for fatload **\n",argv[1],dev,part); return 1; } - offset = simple_strtoul (argv[3], NULL, 16); - if (argc == 6) - count = simple_strtoul (argv[5], NULL, 16); - else - count = 0; - size = file_fat_read (argv[4], (unsigned char *) offset, count); - if(size==-1) { + offset = simple_strtoul(argv[3], NULL, 16); + + if (argc == 6) count = simple_strtoul (argv[5], NULL, 16); + else count = 0; + + size = file_fat_read(argv[4], (unsigned char*)offset, count); + + if(size == -1) + { printf("\n** Unable to read \"%s\" from %s %d:%d **\n",argv[4],argv[1],dev,part); - } else { + } + else + { printf ("\n%ld bytes read\n", size); sprintf(buf, "%lX", size); @@ -127,43 +138,46 @@ " to address 'addr' from dos filesystem\n" ); -int do_fat_ls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +int do_fat_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { char *filename = "/"; int ret; - int dev=0; - int part=1; + int dev = 0; + int part = 1; char *ep; block_dev_desc_t *dev_desc=NULL; - if (argc < 3) { + if(argc < 3) + { printf ("usage: fatls <interface> <dev[:part]> [directory]\n"); return (0); } dev = (int)simple_strtoul (argv[2], &ep, 16); dev_desc=get_dev(argv[1],dev); - if (dev_desc==NULL) { + if(dev_desc == NULL) + { puts ("\n** Invalid boot device **\n"); return 1; } - if (*ep) { - if (*ep != ':') { + if(*ep) + { + if (*ep != ':') + { puts ("\n** Invalid boot device, use `dev[:part]' **\n"); return 1; } part = (int)simple_strtoul(++ep, NULL, 16); } - if (fat_register_device(dev_desc,part)!=0) { + if(fat_register_device(dev_desc,part)!=0) + { printf ("\n** Unable to use %s %d:%d for fatls **\n",argv[1],dev,part); return 1; } - if (argc == 4) - ret = file_fat_ls (argv[3]); - else - ret = file_fat_ls (filename); + if(argc == 4) ret = file_fat_ls(argv[3]); + else ret = file_fat_ls(filename); - if(ret!=0) - printf("No Fat FS detected\n"); + if(ret!=0) printf("No Fat FS detected\n"); + return (ret); } Modified: trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/common/cmd_nand.c =================================================================== --- trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/common/cmd_nand.c 2008-03-30 19:37:44 UTC (rev 301) +++ trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/common/cmd_nand.c 2008-03-30 20:13:02 UTC (rev 302) @@ -730,7 +730,8 @@ /* Lower the CLE line */ NAND_CTL_CLRCLE(nandptr); #ifdef NAND_NO_RB - if(command == NAND_CMD_RESET){ + if(command == NAND_CMD_RESET) + { u_char ret_val; NanD_Command(nand, NAND_CMD_STATUS); do{ @@ -840,7 +841,8 @@ dprintf("NanD_IdentChip 0\n"); NAND_ENABLE_CE(nand); /* set pin low */ /* Reset the chip */ - if (NanD_Command(nand, NAND_CMD_RESET)) { + if (NanD_Command(nand, NAND_CMD_RESET)) + { #ifdef NAND_DEBUG printf("NanD_Command (reset) for %d,%d returned true\n", floor, chip); @@ -848,14 +850,17 @@ NAND_DISABLE_CE(nand); /* set pin high */ return 0; } - #if 1 + +#if 1 NanD_WaitReady(nand, 0); NAND_DISABLE_CE(0); - NAND_ENABLE_CE(nand); /* set pin low */ - #endif + NAND_ENABLE_CE(nand); /* set pin low */ +#endif + dprintf("NanD_IdentChip 1\n"); /* Read the NAND chip ID: 1. Send ReadID command */ - if (NanD_Command(nand, NAND_CMD_READID)) { + if (NanD_Command(nand, NAND_CMD_READID)) + { #ifdef NAND_DEBUG printf("NanD_Command (ReadID) for %d,%d returned true\n", floor, chip); Modified: trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/common/main.c =================================================================== --- trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/common/main.c 2008-03-30 19:37:44 UTC (rev 301) +++ trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/common/main.c 2008-03-30 20:13:02 UTC (rev 302) @@ -401,9 +401,9 @@ # endif /* CONFIG_BOOT_RETRY_TIME */ #ifdef CONFIG_BOOTCOUNT_LIMIT - if (bootlimit && (bootcount > bootlimit)) { - printf ("Warning: Bootlimit (%u) exceeded. Using altbootcmd.\n", - (unsigned)bootlimit); + if (bootlimit && (bootcount > bootlimit)) + { + printf ("Warning: Bootlimit (%u) exceeded. Using altbootcmd.\n", (unsigned)bootlimit); s = getenv ("altbootcmd"); } else @@ -601,7 +601,8 @@ debug ("### main_loop: bootcmd=\"%s\"\n", s ? s : "<UNDEFINED>"); - if (bootdelay >= 0 && s && !abortboot (bootdelay)) { + if(bootdelay >= 0 && s && !abortboot (bootdelay)) + { # ifdef CONFIG_AUTOBOOT_KEYED int prev = disable_ctrlc(1); /* disable Control C checking */ # endif @@ -609,8 +610,7 @@ # ifndef CFG_HUSH_PARSER run_command (s, 0); # else - parse_string_outer(s, FLAG_PARSE_SEMICOLON | - FLAG_EXIT_FROM_LOOP); + parse_string_outer(s, FLAG_PARSE_SEMICOLON | FLAG_EXIT_FROM_LOOP); # endif # ifdef CONFIG_AUTOBOOT_KEYED @@ -619,14 +619,15 @@ } # ifdef CONFIG_MENUKEY - if (menukey == CONFIG_MENUKEY) { + if (menukey == CONFIG_MENUKEY) + { s = getenv("menucmd"); - if (s) { + if (s) + { # ifndef CFG_HUSH_PARSER run_command (s, bd, 0); # else - parse_string_outer(s, FLAG_PARSE_SEMICOLON | - FLAG_EXIT_FROM_LOOP); + parse_string_outer(s, FLAG_PARSE_SEMICOLON | FLAG_EXIT_FROM_LOOP); # endif } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <djw...@us...> - 2008-03-30 19:37:40
|
Revision: 301 http://open2x.svn.sourceforge.net/open2x/?rev=301&view=rev Author: djwillis Date: 2008-03-30 12:37:44 -0700 (Sun, 30 Mar 2008) Log Message: ----------- Small cleanups, stuff that was in my local tree and not in SVN etc. - Also start to think about adding F200 support (the different LCD is the biggest issue). Modified Paths: -------------- trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/README.Open2x trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/board/mmsp2dtk/sd.c Modified: trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/README.Open2x =================================================================== --- trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/README.Open2x 2008-03-30 12:31:51 UTC (rev 300) +++ trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/README.Open2x 2008-03-30 19:37:44 UTC (rev 301) @@ -1,6 +1,9 @@ Open2x Bootloader (U-Boot). --------------------------- +"DO NOT FLASH THESE FILES TO AN F200 UNLESS YOU WANT A BRICK!" +"F200 SUPPORT IS IN THE WORKS BUT NOT DONE YET" + Please refer to http://wiki.open2x.org/open2x/wiki/index.php?title=Bootloader before you do ANYTHING with these files. Modified: trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/board/mmsp2dtk/sd.c =================================================================== --- trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/board/mmsp2dtk/sd.c 2008-03-30 12:31:51 UTC (rev 300) +++ trunk/bootloader/u-boot-open2x-1.0.0_FW2-3/board/mmsp2dtk/sd.c 2008-03-30 19:37:44 UTC (rev 301) @@ -58,20 +58,20 @@ //[*]----------------------------------------------------------------------------------------------------[*] #define rSDICON (*(volatile unsigned short* )0xC0001500) /* SDI Control Register */ #define rSDIPRE (*(volatile unsigned short* )0xC0001502) /* SDI Prescaler Register */ -#define rSDICARG (*(volatile unsigned int* )0xC0001504) /* SDI Command Argument Register */ +#define rSDICARG (*(volatile unsigned int* )0xC0001504) /* SDI Command Argument Register */ #define rSDICCON (*(volatile unsigned short* )0xC0001508) /* SDI Command Control Register */ #define rSDICSTA (*(volatile unsigned short* )0xC000150A) /* SDI Command Status Register */ -#define rSDIRSP0 (*(volatile unsigned int* )0xC000150C) /* SDI Response Register 0 */ -#define rSDIRSP1 (*(volatile unsigned int* )0xC0001510) /* SDI Response Register 1 */ -#define rSDIRSP2 (*(volatile unsigned int* )0xC0001514) /* SDI Response Register 2 */ -#define rSDIRSP3 (*(volatile unsigned int* )0xC0001518) /* SDI Response Register 3 */ +#define rSDIRSP0 (*(volatile unsigned int* )0xC000150C) /* SDI Response Register 0 */ +#define rSDIRSP1 (*(volatile unsigned int* )0xC0001510) /* SDI Response Register 1 */ +#define rSDIRSP2 (*(volatile unsigned int* )0xC0001514) /* SDI Response Register 2 */ +#define rSDIRSP3 (*(volatile unsigned int* )0xC0001518) /* SDI Response Register 3 */ #define rSDIBSIZE (*(volatile unsigned short* )0xC000151E) /* SDI Block Size Register */ -#define rSDIDCON (*(volatile unsigned int* )0xC0001520) /* SDI Data Control Register */ -#define rSDIDCNT (*(volatile unsigned int* )0xC0001524) /* SDI Data Remain Counter Register */ +#define rSDIDCON (*(volatile unsigned int* )0xC0001520) /* SDI Data Control Register */ +#define rSDIDCNT (*(volatile unsigned int* )0xC0001524) /* SDI Data Remain Counter Register */ #define rSDIDSTA (*(volatile unsigned short* )0xC0001528) /* SDI Data Status Register */ #define rSDIFSTA (*(volatile unsigned short* )0xC000152A) /* SDI FIFO Status Register */ -#define rSDIDAT (*(volatile unsigned char* )0xC000152C) /* SDI Data Register */ -#define rSDIIMSK (*(volatile unsigned int* )0xC0001530) /* SDI Interrupt Mask Register 0 */ +#define rSDIDAT (*(volatile unsigned char* )0xC000152C) /* SDI Data Register */ +#define rSDIIMSK (*(volatile unsigned int* )0xC0001530) /* SDI Interrupt Mask Register 0 */ #define rSDIDTIMERL (*(volatile unsigned short* )0xC0001536) /* SDI Data Timer Register */ #define rSDIDTIMERH (*(volatile unsigned short* )0xC0001538) /* SDI Data Timer Register */ #define rSDISFTL (*(volatile unsigned short* )0xC000153A) /* SDI Shift Regisrt Low */ @@ -79,7 +79,7 @@ //[*]----------------------------------------------------------------------------------------------------[*] #define SDIDCON_DATA_SIZE_WORD (2 << 22) /* SDIO Interrupt period is ... */ #define SDIDCON_PRD (1 << 21) /* SDIO Interrupt period is ... */ - /* when last data block is transferred. */ +/* when last data block is transferred. */ #define SDIDCON_PRD_2 (0 << 21) /* 0: exact 2 cycle */ #define SDIDCON_PRD_N (1 << 21) /* 1: more cycle */ #define SDIDCON_TARSP (1 << 20) /* when data transmit start ... */ @@ -104,7 +104,73 @@ #define SDIDCON_BUSY FInsrt(0x1, fSDIDCON_DatMode) /* only busy check */ #define SDIDCON_RX FInsrt(0x2, fSDIDCON_DatMode) /* Data receive */ #define SDIDCON_TX FInsrt(0x3, fSDIDCON_DatMode) /* Data transmit */ -#define SDIDCON_BNUM FMsk(Fld(12,0)) /* Block Number(0~4095) */ +#define SDIDCON_BNUM FMsk(Fld(12,0)) /* Block Number(0~4095) */ + +#define RES_LEN_SHORT 6 +#define RES_LEN_LONG 17 + + +typedef struct { + unsigned char mid; /* [127:120] Manufacturer ID */ + unsigned short oid; /* [119:104] OEM/Application ID */ + unsigned char pnm[7]; /* [103: 56] Product Name + '\0' (MMCSD) */ + unsigned char pnm_sd[6]; /* [103: 64] Product Name + '\0' (SD) */ + unsigned char prv; /* [ 55: 48] Product Version (MMCSD) */ + /* [ 63: 56] Product Version (SD) */ + unsigned long psn; /* [ 47: 16] Product Serial Number (MMCSD) */ + /* [ 55: 24] Product Serial Number (SD) */ + unsigned char mdt; /* [ 15: 8] Manufacturing date (MMCSD) */ + unsigned short mdt_sd; /* [ 19: 8] Manufacturing date (SD) */ + /* [ 7: 1] CRC (rwe) */ +} CID_regs; + +typedef struct { + unsigned char csd; /* [127:126] CSD structure */ + unsigned char spec_vers; /* [125:122] Spec version (MMCSD) */ + struct { + unsigned char man; /* [118:115] time mantissa */ + unsigned char exp; /* [114:113] time exponent */ + } taac; /* [119:112] Data read access-time-1 */ + unsigned char nsac; /* [111:104] Data read access-time-2 in CLK cycle */ + struct { + unsigned char man; /* [103:100] rate mantissa */ + unsigned char exp; /* [ 99: 97] rate exponent */ + } tran_speed; /* [103: 96] Max. data transfer rate */ + unsigned short ccc; /* [ 95: 84] Card command classes */ + unsigned char read_len; /* [ 83: 80] Max. read data block length */ + unsigned char read_part; /* [ 79: 79] Partial blocks for read allowed */ + unsigned char write_mis; /* [ 78: 78] write block misalignment */ + unsigned char read_mis; /* [ 77: 77] read block misalignment */ + unsigned char dsr; /* [ 76: 76] DSR implemented */ + unsigned long c_size; /* [ 73: 62] Device size (SDHC: [ 69: 48] )*/ + + unsigned char vcc_r_min; /* [ 61: 59] Max. read current at Vcc min */ + unsigned char vcc_r_max; /* [ 58: 56] Max. read current at Vcc max */ + unsigned char vcc_w_min; /* [ 55: 53] Max. write current at Vcc min */ + unsigned char vcc_w_max; /* [ 52: 50] Max. write current at Vcc max */ + unsigned char c_size_mult; /* [ 49: 47] Device size multiplier */ + unsigned char er_blk_en; /* [ 46: 46] Erase single block enable (SD) */ + unsigned char er_size; /* [ 46: 42] Erase sector size (MMCSD) */ + /* [ 45: 39] Erase sector size (SD) */ + unsigned char er_grp_size; /* [ 41: 37] Erase group size (MMCSD) */ + unsigned char wp_grp_size; /* [ 36: 32] Write protect group size (MMCSD)*/ + /* [ 38: 32] Write Protect group size (SD) */ + unsigned char wp_grp_en; /* [ 31: 31] Write protect group enable */ + unsigned char dflt_ecc; /* [ 30: 29] Manufacturer default ECC (MMCSD) */ + unsigned char r2w_factor; /* [ 28: 26] Write speed factor */ + unsigned char write_len; /* [ 25: 22] Max. write data block length */ + unsigned char write_part; /* [ 21: 21] Partial blocks for write allowed */ + /* [ 20: 17] Reserved */ + /* [ 16: 16] Content protection application */ + unsigned char ffmt_grp; /* [ 15: 15] File format group (rw) */ + unsigned char copy; /* [ 14: 14] Copy flag (OTP) (rw) */ + unsigned char perm_wp; /* [ 13: 13] Permanent write protection (rw) */ + unsigned char tmp_wp; /* [ 12: 12] temporary write protection (rwe) */ + unsigned char ffmt; /* [ 11: 10] file format (rw) */ + unsigned char ecc; /* [ 9: 8] ECC (MMCSD) (rwe) */ + /* [ 7: 1] CRC (rwe) */ +} CSD_regs; + //[*]----------------------------------------------------------------------------------------------------[*] extern int fat_register_device(block_dev_desc_t *dev_desc, int part_no); //[*]----------------------------------------------------------------------------------------------------[*] @@ -117,56 +183,10 @@ //[*]----------------------------------------------------------------------------------------------------[*] int isMMC; // 1:MMC, 0:SD int RCA=0; // Relative card address -unsigned int CardSize=0; // SD capacity in byte +unsigned int CardSize=0; // SD capacity in byte +unsigned char sdhc; + //[*]----------------------------------------------------------------------------------------------------[*] -// CSD register, rwe == read/write/erase -typedef struct -{ - unsigned char csd; /* CSD structure */ - unsigned char spec_vers; /* Spec version, MMC only */ - struct - { - unsigned char man; /* time mantissa */ - unsigned char exp; /* time exponent */ - } taac; /* Data read access-time-1 */ - unsigned char nsac; /* Data read access-time-2 in CLK cycle */ - struct - { - unsigned char man; /* rate mantissa */ - unsigned char exp; /* rate exponent */ - } tran_speed; /* Max. data transfer rate */ - unsigned short ccc; /* Card command classes */ - unsigned char read_len; /* Max. read data block length */ - unsigned char read_part; /* Partial blocks for read allowed */ - unsigned char write_mis; /* write block misalignment */ - unsigned char read_mis; /* read block misalignment */ - unsigned char dsr; /* DSR implemented */ - unsigned short c_size; /* Device size */ - unsigned char vcc_r_min; /* Max. read current at Vcc min */ - unsigned char vcc_r_max; /* Max. read current at Vcc max */ - unsigned char vcc_w_min; /* Max. write current at Vcc min */ - unsigned char vcc_w_max; /* Max. write current at Vcc max */ - unsigned char c_size_mult; /* Device size multiplier */ - unsigned char er_size; /* Erase sector size, MMC only */ - unsigned char er_grp_size; /* Erase group size, MMC only */ - unsigned char wp_grp_size; /* Write protect group size */ - unsigned char wp_grp_en; /* Write protect group enable */ - unsigned char dflt_ecc; /* Manufacturer default ECC, MMC only */ - unsigned char r2w_factor; /* Write speed factor */ - unsigned char write_len; /* Max. write data block length */ - unsigned char write_part; /* Partial blocks for write allowed */ - unsigned char ffmt_grp; /* File format group, rw */ - unsigned char copy; /* Copy flag (OTP), rw */ - unsigned char perm_wp; /* Permanent write protection, rw */ - unsigned char tmp_wp; /* temporary write protection, rwe */ - unsigned char ffmt; /* file format, rw */ - unsigned char ecc; /* ECC, rwe, MMC only */ - - /* SD only */ - unsigned char er_blk_en; /* Erase single block enable, SD only */ - unsigned char er_sec_size; /* Erase sector size, SD only */ -} CSD_regs; -//[*]----------------------------------------------------------------------------------------------------[*] int Chk_CMDend(int cmd, int be_resp) { int volatile finish0; @@ -188,30 +208,31 @@ while( !( ((finish0&0x200)==0x200) | ((finish0&0x400)==0x400) )) // Check cmd/rsp end finish0=rSDICSTA; - if((cmd==1) | (cmd==9) | (cmd==41)) // CRC no check, CMD9 is a long Resp. command. + if((cmd==1) | (cmd==9) | (cmd==41) ) // CRC no check, CMD9 is a long Resp. command. { if( (finish0&0xf00) != 0xa00 ) // Check error { - rSDICSTA = finish0; // Clear error state + rSDICSTA = finish0; // Clear error state if(((finish0&0x400)==0x400)) - return 0; // Timeout error + return 0; // Timeout error } - rSDICSTA = finish0; // Clear cmd & rsp end state + rSDICSTA = finish0; // Clear cmd & rsp end state } - else // CRC check + else // CRC check { - if( (finish0&0x1f00) != 0xa00 ) // Check error + + if( (finish0&0x1f00) != 0xa00 ) // Check error { - //printf("CMD%d:rSDICSTA=0x%x,rSDIRSP0=0x%x\n",cmd, rSDICSTA, rSDIRSP0); - rSDICSTA = finish0; // Clear error state - + rSDICSTA = finish0; // Clear error state if(((finish0&0x400)==0x400)) - return 0; // Timeout error + return 0; // Timeout error } rSDICSTA=finish0; } return 1; } + + } //[*]----------------------------------------------------------------------------------------------------[*] int Chk_DATend(void) @@ -223,12 +244,12 @@ { // Chek timeout or data end finish = rSDIDSTA; - //printf("DATA:finish=0x%x\n", finish); + } if( (finish&0xfc) != 0x10 ) { - printf("DATA:finish=0x%x\n", finish); // Something wrong !! - rSDIDSTA = 0xec; // Clear error state + printf("DATA:finish=0x%x\n", finish); // Something wrong !! + rSDIDSTA = 0xec; // Clear error state return 0; } return 1; @@ -262,13 +283,41 @@ // rSDICSTA=0x800; // Clear cmd_end(no rsp) } //[*]----------------------------------------------------------------------------------------------------[*] +unsigned char CMD8(void) +{ + int retry=10; + +retry_CMD8: + rSDICARG = 0xAA | (1<<8); + rSDICCON = (0x1<<9) | (0x1<<8) | 0x48; // short_rsp, wait_resp, start, CMD8 + + //-- Check end of CMD8 + if(!Chk_CMDend(8, 1)) + { + if(retry--){ + CMD0(); + goto retry_CMD8; + } + } + else + { + if( (rSDIRSP0 & 0xff) == 0xAA ) + { + printf("SD VER 2.0 \n"); + return 1; + } + } + return 0; /* none card & ver1.0 */ +} +//[*]----------------------------------------------------------------------------------------------------[*] int CMD55(void) { //--Make ACMD //rSDICARG=RCA<<16; //CMD7(RCA,stuff bit) rSDICARG = (RCA<<16) & 0xffff0000; // CMD7(RCA,stuff bit) rSDICCON=(0x1<<9)|(0x1<<8)|0x77; //sht_resp, wait_resp, start, CMD55 - + + //-- Check end of CMD55 if(!Chk_CMDend(55, 1)) return 0; @@ -277,19 +326,164 @@ return 1; } //[*]----------------------------------------------------------------------------------------------------[*] -CSD_regs csd; -//[*]----------------------------------------------------------------------------------------------------[*] int CMD9(void)//SEND_CSD { + int retry=10; +retry_CMD9: + if(isMMC) RCA=1; + rSDICARG = (RCA<<16) & 0xffff0000; // CMD7(RCA,stuff bit) rSDICCON = (0x1<<10) | (0x1<<9) | (0x1<<8) | 0x49; // long_resp, wait_resp, start, CMD9 - - if(!Chk_CMDend(9, 1)) - return 0; + if(!Chk_CMDend(9, 1)) + { + if(retry--) goto retry_CMD9; + else return 0; + } + + udelay(20000); return 1; } //[*]----------------------------------------------------------------------------------------------------[*] +void SetResToBuf(unsigned char *p) +{ + unsigned long tmp; + + tmp = (rSDIRSP0 >> 24) | ( (rSDIRSP0 >> 8) & 0xff00 ) | ( (rSDIRSP0 & 0xff00) << 8 ) | ( (rSDIRSP0 & 0xff) << 24); + memcpy(p ,&tmp ,sizeof(tmp)); + tmp = (rSDIRSP1 >> 24) | ( (rSDIRSP1 >> 8) & 0xff00 ) | ( (rSDIRSP1 & 0xff00) << 8 ) | ( (rSDIRSP1 & 0xff) << 24); + memcpy(p + (1 * sizeof(tmp)) ,&tmp ,sizeof(tmp)); + tmp = (rSDIRSP2 >> 24) | ( (rSDIRSP2 >> 8) & 0xff00 ) | ( (rSDIRSP2 & 0xff00) << 8 ) | ( (rSDIRSP2 & 0xff) << 24); + memcpy(p + (2 * sizeof(tmp)) ,&tmp ,sizeof(tmp)); + tmp = (rSDIRSP3 >> 24) | ( (rSDIRSP3 >> 8) & 0xff00 ) | ( (rSDIRSP3 & 0xff00) << 8 ) | ( (rSDIRSP3 & 0xff) << 24); + memcpy(p + (3 * sizeof(tmp)) ,&tmp ,sizeof(tmp)); +} +//[*]----------------------------------------------------------------------------------------------------[*] +void str2cid( CID_regs *regs, unsigned char *buff) +{ + int i; + regs->mid = buff[0]; + regs->oid = (buff[1] << 8) | (buff[2]); + + if(!isMMC) { + for(i=0; i < 5; i++) + regs->pnm_sd[i] = buff[3+i]; + regs->pnm_sd[5] = '\0'; + regs->prv = buff[8]; + regs->psn = (buff[9] << 24) | (buff[10] << 16) |(buff[11] << 8) | buff[12]; + regs->mdt_sd = (buff[13] << 8) | buff[14]; + } /* SD Only*/ + else { + for(i=0; i < 6; i++) + regs->pnm[i] = buff[3+i]; + regs->pnm[6] = '\0'; + regs->prv = buff[9]; + regs->psn = (buff[10] << 24) | (buff[11] << 16) |(buff[12] << 8) | buff[13]; + regs->mdt = buff[14]; + } /* MMC Only*/ +} +//[*]----------------------------------------------------------------------------------------------------[*] +int str2csd( CSD_regs *regs, unsigned char *buff, unsigned char verSD) +{ + int ret; + regs->csd = (buff[0] & 0xc0) >> 6; + + if (regs->csd > 2) + return -1; + + if(verSD) + { + if(regs->csd != 1) goto NOT_SDHC; + /* CSD version 2.0; consists mostly of fixed values, + * which host must override and not bother parsing out. + * FIXME: we should parse CSD correctly for HC MMC cards */ + (regs->taac).man = 1; + (regs->taac).exp = 6; + regs->nsac = 0; + (regs->tran_speed).man = (buff[3] & 0x78) >> 3; + (regs->tran_speed).exp = (buff[3]) & 0x07; + regs->ccc = (buff[4] << 4) | ((buff[5] & 0xf0) >> 4); + regs->read_len = 9; + regs->read_part = 0; + regs->write_mis = 0; + regs->read_mis = 0; + regs->dsr = (buff[6] & 0x10) ? 1 : 0; + regs->c_size = ((buff[7] & 0x3f) << 16) | (buff[8] << 8) | buff[9]; + regs->vcc_r_min = 7; + regs->vcc_r_max = 6; + regs->vcc_w_min = 7; + regs->vcc_w_max = 6; + regs->c_size_mult = 10 - 2; + regs->er_blk_en = 1; + regs->er_size = 0x7f; + regs->wp_grp_size = 0; + regs->wp_grp_en = 0; + regs->r2w_factor = 2; + regs->write_len = 9; + regs->write_part = 0; + regs->ffmt_grp = 0; + regs->copy = (buff[14] & 0x40) ? 1 : 0; + regs->perm_wp = (buff[14] & 0x20) ? 1 : 0; + regs->tmp_wp = (buff[14] & 0x10) ? 1 : 0; + regs->ffmt = 0; + + ret = 1; + } + else + { +NOT_SDHC: + if(isMMC) /* MMC */ + regs->spec_vers = (buff[0] & 0x3c) >> 2; + (regs->taac).man = (buff[1] & 0x78) >> 3; + (regs->taac).exp = (buff[1]) & 0x07; + regs->nsac = buff[2]; + (regs->tran_speed).man = (buff[3] & 0x78) >> 3; + (regs->tran_speed).exp = (buff[3]) & 0x07; + regs->ccc = (buff[4] << 4) | ((buff[5] & 0xf0) >> 4); + regs->read_len = (buff[5] & 0x0f); + regs->read_part = (buff[6] & 0x80) ? 1 : 0; + regs->write_mis = (buff[6] & 0x40) ? 1 : 0; + regs->read_mis = (buff[6] & 0x20) ? 1 : 0; + regs->dsr = (buff[6] & 0x10) ? 1 : 0; + regs->c_size = ((buff[6] & 0x03) << 10) | (buff[7] << 2) | ((buff[8] & 0xc0) >> 6); + regs->vcc_r_min = (buff[8] & 0x38) >> 3; + regs->vcc_r_max = (buff[8] & 0x07); + regs->vcc_w_min = (buff[9] & 0xe0) >> 5; + regs->vcc_w_max = (buff[9] & 0x1c) >> 2; + regs->c_size_mult = ((buff[9] & 0x03) << 1) | ((buff[10] & 0x80) >> 7); + if(!isMMC) { + regs->er_blk_en = (buff[10] & 0x40) ? 1: 0; + regs->er_size = ((buff[10] & 0x3f) | (buff[11] & 0x80)) >> 7; + regs->wp_grp_size= (buff[11] & 0x7f); + } /* SD */ + else { + regs->er_size = (buff[10] & 0x7c) >> 2; + regs->er_grp_size= ((buff[10] & 0x03) << 3) |((buff[11] & 0xe0) >> 5); + regs->wp_grp_size= (buff[11] & 0x1f); + } /* MMC */ + regs->wp_grp_en = (buff[12] & 0x80) ? 1 : 0; + if(isMMC) /* MMC */ + regs->dflt_ecc = (buff[12] & 0x60) >> 5; + regs->r2w_factor = (buff[12] & 0x1c) >> 2; + regs->write_len = ((buff[12] & 0x03) << 2) | ((buff[13] & 0xc0) >> 6); + regs->write_part = (buff[13] & 0x20) ? 1 : 0; + regs->ffmt_grp = (buff[14] & 0x80) ? 1 : 0; + regs->copy = (buff[14] & 0x40) ? 1 : 0; + regs->perm_wp = (buff[14] & 0x20) ? 1 : 0; + regs->tmp_wp = (buff[14] & 0x10) ? 1 : 0; + regs->ffmt = (buff[14] & 0x0c) >> 2; + if(isMMC) /* MMC */ + regs->ecc = (buff[14] & 0x03); + + ret=0; + } + + return ret; /* unknown CSD version */ +} + + + +//[*]----------------------------------------------------------------------------------------------------[*] int Chk_MMC_OCR(void) { int i; @@ -297,76 +491,63 @@ //-- Negotiate operating condition for MMC, it makes card ready state for(i=0;i<15;i++) { - rSDICARG=0xffc000; //CMD1(OCR:2.6V~3.6V) + rSDICARG=0xffc000; //CMD1(OCR:2.6V~3.6V) rSDICCON=(0x1<<9)|(0x1<<8)|0x41; //sht_resp, wait_resp, start, CMD1 //-- Check end of CMD1 if(Chk_CMDend(1, 1) & (rSDIRSP0==0x80ffc000)) { //rSDICSTA=0xa00; // Clear cmd_end(with rsp) - return 1; // Success + return 1; // Success } } - //rSDICSTA=0xa00; // Clear cmd_end(with rsp) - return 0; // Fail + //rSDICSTA=0xa00; // Clear cmd_end(with rsp) + return 0; // Fail } //[*]----------------------------------------------------------------------------------------------------[*] -int Chk_SD_OCR(void) +int Chk_SD_OCR(unsigned char* bVer) { int i=0; + int CntVer=0; + unsigned long respChk; + if(*bVer) respChk = 0xc0ff8000; + else respChk = 0x80ff8000; + //-- Negotiate operating condition for SD, it makes card ready state -// for(i=0;i<15;i++) - for(i=0;i<150;i++) - { -// printf("SD i : %d\t", i); - CMD55(); // Make ACMD + for(i=0;i<150;i++) + { + CMD55(); // Make ACMD - rSDICARG = 0x00ff8000; // ACMD41(OCR:2.7V~3.6V) + if(*bVer) rSDICARG = 0xff8000 | (1<<30); // ACMD41(OCR:2.7V~3.6V) + else rSDICARG = 0xff8000; + rSDICCON = (0x1<<9) | (0x1<<8) | 0x69; // sht_resp, wait_resp, start, ACMD41 - //-- Check end of ACMD41 - if(Chk_CMDend(41, 1) & (rSDIRSP0==0x80ff8000)) + Chk_CMDend(41, 1); + if(rSDIRSP0==respChk) + { + udelay(20000); // Wait Card power up status + return 1; // Success + } + else { - //rSDICSTA=0xa00; // Clear cmd_end(with rsp) - return 1; // Success - } - udelay(20000); // Wait Card power up status + if(*bVer) + { + if(rSDIRSP0 == 0x80ff8000) CntVer++; + else CntVer=0; + } + + if(CntVer==5) + { + *bVer = 0; + udelay(20000); + return 1; + } + udelay(20000); + } } - //rSDICSTA=0xa00; // Clear cmd_end(with rsp) - return 0; // Fail - - - /* - struct mmcsd_cmd cmd; -retry_sd_ocr: - // CMD55, make ACMD - slot->rca = 0; - cmd.cmd = MMCSD_CMD55; - cmd.arg = (slot->rca << 16) & 0xffff0000; - cmd.res_type = MMCSD_RES_TYPE_R1; - cmd.res_flag = 0; - cmd.t_res = MMCSD_TIME_NCR_MAX; - cmd.t_fin = MMCSD_TIME_NRC_MIN; - slot->send_cmd(slot, &cmd); - - // ACMD41, SEND_OP_COND - cmd.cmd = MMCSD_ACMD41; - slot->ocr = MMCSD_VDD_27_36; - cmd.arg = slot->ocr; - cmd.res_type = MMCSD_RES_TYPE_R1; - cmd.res_flag = MMCSD_RES_FLAG_NOCRC; - cmd.t_res = MMCSD_TIME_NCR_MAX; - cmd.t_fin = MMCSD_TIME_NRC_MIN; - slot->send_cmd(slot, &cmd); - - if(SDIRSP0 == 0x80ff8000) { - mdelay(10); // wait card power up status - return 1; //success - } else - goto retry_sd_ocr; - return 0; // fail - */ + return 0; // Fail } //[*]----------------------------------------------------------------------------------------------------[*] int CardBusWidth = 0; @@ -375,13 +556,13 @@ { SET_BUS: CMD55(); // Make ACMD - //-- CMD6 implement + //-- CMD6 implement rSDICARG = CardBusWidth<<1; //Width 0: 1bit, 1: 4bit rSDICCON=(0x1<<9)|(0x1<<8)|0x46; //sht_resp, wait_resp, start, CMD55 - if(!Chk_CMDend(6, 1)) // ACMD6 + if(!Chk_CMDend(6, 1)) // ACMD6 goto SET_BUS; - //rSDICSTA=0xa00; // Clear cmd_end(with rsp) + //rSDICSTA=0xa00; // Clear cmd_end(with rsp) } //[*]----------------------------------------------------------------------------------------------------[*] void Card_sel_desel(char sel_desel) @@ -405,8 +586,8 @@ else { RECMDD7: - rSDICARG=0<<16; //CMD7(RCA,stuff bit) - rSDICCON=(0x1<<8)|0x47; //no_resp, start, CMD7 + rSDICARG=0<<16; //CMD7(RCA,stuff bit) + rSDICCON=(0x1<<8)|0x47; //no_resp, start, CMD7 //-- Check end of CMD7 if(!Chk_CMDend(7, 0)) @@ -421,32 +602,26 @@ //[*]----------------------------------------------------------------------------------------------------[*] ulong mmc_bread(int dev_num, ulong blknr, ulong blkcnt, ulong *dst) { -// int mmc_block_size = MMC_BLOCK_SIZE; -// ulong src = blknr * mmc_block_size + CFG_MMC_BASE; - if(blkcnt==0) { printf("Why block_cnt == 0?? \n"); return 0; } -// mmc_read(src, (uchar *)dst, blkcnt*mmc_block_size); -// printf("mmc_bread LBA=%d, Count=%d\n",blknr,blkcnt); + + SD_Read((uchar *)dst, blknr, blkcnt); -// printf("mmc_bread end\n"); return blkcnt; } //[*]----------------------------------------------------------------------------------------------------[*] int mmc_write(uchar *src, ulong dst, int size) { printf("\nmmc_write should not be called !!!!\n"); - //SD_Write( return 0; } //[*]----------------------------------------------------------------------------------------------------[*] int mmc_read(ulong src, uchar *dst, int size) { printf("\nmmc_read should not be called !!!!\n"); - //SD_Write( return 0; } //[*]----------------------------------------------------------------------------------------------------[*] @@ -482,8 +657,11 @@ unsigned int SD_card_init(void) { int i; - unsigned long pclk; - + unsigned char bVerSD; + unsigned long pclk,tmpRes,blkSizeCnt; + unsigned char resVal[RES_LEN_LONG]; + CSD_regs csd; + if(mmc_init_once == 1) return 1; // already done !! rSDIDCON = 0; @@ -501,73 +679,70 @@ rSDIDTIMERH = 0x001f; pclk = get_PCLK(); - //printf("\nSystem Frequency is %dHz\n",pclk); - - //rSDIPRE = pclk/(INICLK)-1; // 400KHz rSDIPRE = MMCSD_PCLK/(2*MMCSD_INICLK) -1; - //printf("\nInit. Frequency is %dHz\n",(pclk/(rSDIPRE+1))); - - rSDICON = (1<<4) | (1<<1) | 1; // Type A, clk enable (For Little Endian by Salamander) - - //rSDIFSTA = rSDIFSTA|(1<<16); // FIFO reset - rSDICON = rSDICON | (1<<1); // FIFO reset - rSDIBSIZE = 0x200; // 512byte(128word) + rSDICON = (1<<4) | (1<<1) | 1; // Type A, clk enable (For Little Endian by Salamander) + rSDICON = rSDICON | (1<<1); // FIFO reset + rSDIBSIZE = 0x200; // 512byte(128word) /* Set timeout count */ rSDIDTIMERL = 0xffff; rSDIDTIMERH = 0x001f; - for(i=0;i<0x1000;i++) // Wait 74SDCLK for MMC card + for(i=0;i<0x1000;i++) // Wait 74SDCLK for MMC card ; - - CMD0(); // Goto idel state - - //-- Check MMC card OCR - if(Chk_MMC_OCR()) + CMD0(); // Goto idel state(RESET) + bVerSD=CMD8(); // check SD VERSION + if(Chk_SD_OCR(&bVerSD)) { - printf("\nMMC found.\n"); - isMMC=1; - goto RECMD2; - } - - //printf("MMC check end!!\n"); - - //-- Check SD card OCR - if(Chk_SD_OCR()) - { isMMC=0; printf("\nSD found : "); } else { printf("\nSD Initialize fail..\n\n"); - return 0; + if(Chk_MMC_OCR()) + { + printf("\nMMC found.\n"); + isMMC=1; + } + else + return 0; } - + RECMD2: - //-- Check attaced cards, it makes card identification state + /* ALL_SEND_CID */ rSDICARG=0x0; // CMD2(stuff bit) rSDICCON=(0x1<<10)|(0x1<<9)|(0x1<<8)|0x42; //lng_resp, wait_resp, start, CMD2 - - //-- Check end of CMD2 if(!Chk_CMDend(2, 1)) goto RECMD2; - //rSDICSTA=0xa00; // Clear cmd_end(with rsp) - //printf("\nEnd id\n"); - - RECMD3: //--Send RCA - rSDICARG = 0; // CMD3(MMC:Set RCA, SD:Ask RCA-->SBZ) - //rSDICARG = isMMC<<16; // CMD3(MMC:Set RCA, SD:Ask RCA-->SBZ) - rSDICCON = (0x1<<9)|(0x1<<8)|0x43; // sht_resp, wait_resp, start, CMD3 + rSDICARG = 0; + rSDICCON = (0x1<<9)|(0x1<<8)|0x43; + Chk_CMDend(3, 1); - //-- Check end of CMD3 - if(!Chk_CMDend(3, 1)) + tmpRes = rSDIRSP0; + if(!(tmpRes & 0x600)) + { + printf("CMD3( Read CSD) error \n"); goto RECMD3; - - //rSDICSTA = 0xa00; // Clear cmd_end(with rsp) + } + + RCA = tmpRes >> 16; + if(!CMD9()){ + printf("CMD9( Read CSD) error \n"); + goto RECMD3; + } + SetResToBuf(resVal); + sdhc=str2csd(&csd,resVal,bVerSD); + if(sdhc < 0 ) { + printf("Not support SD VERSION !!!\n"); + return sdhc; + } + + if(sdhc) blkSizeCnt = (1 + csd.c_size) * (0x01 << (csd.c_size_mult + 2)); + //--Publish RCA if(isMMC) { @@ -577,29 +752,34 @@ } else { - RCA = ( rSDIRSP0 & 0xffff0000 )>>16; - //rSDICARG = (RCA<<16) & 0xffff0000; // CMD7(RCA,stuff bit) - - //printf("RCA=0x%x\n",RCA); -// rSDIPRE=pclk/(SDCLK); // Salamander pclk=66Mhz, prescaler = 2, SD_CLK = 22Mhz - //rSDIPRE=3; // test 16Mhz - //printf("SD Frequency is %dMHz\n",(pclk/(rSDIPRE+1))/1000000); rSDIPRE = MMCSD_PCLK/(2*MMCSD_SD_NORCLK) -1; - //rSDIPRE = pclk/(SDCLK+2); // Salamander pclk=66Mhz, prescaler = 2, SD_CLK = 22Mhz -#if 0 /* org */ - printf("SD Frequency is %dMHz\n",(pclk/(rSDIPRE+1))/1000000); -#else /* shkim patch */ printf("SD Frequency is %dMHz\n",(MMCSD_PCLK/(rSDIPRE+1))/(2*1000000)); -#endif } - //--State(stand-by) check - if( rSDIRSP0 & (0x1e00!=0x600) ) // CURRENT_STATE check - goto RECMD3; - //printf("\nIn stand-by\n"); + udelay(20000); +RECMD13: + /* check card-state. if card-state != StandBy, return BUSY */ + rSDICARG = (RCA << 16) & 0xffff0000; + rSDICCON = (0x1<<9)|(0x1<<8)|0x4d; + if(!Chk_CMDend(13, 1)) + { + printf( "CMD13 failed \n"); + goto RECMD13; + }else{ + tmpRes = rSDIRSP0; + if (tmpRes & (0x100000 | 0x80000)) { + printf( "CMD13 failed ecc\n"); + goto RECMD13; + } + if (!(tmpRes & 0x600)) { + printf( "CMD13 failed Busy\n"); + goto RECMD13; + } + udelay(20000); + } + Card_sel_desel(1); // Select - if(!isMMC) { CardBusWidth=1; @@ -610,16 +790,27 @@ CardBusWidth=0; SetBus(); // For MMC } + + udelay(50000); +#if 0 + if( (csd.read_len > 9) || (csd.write_len > 9) ) + { +RECMD16: + rSDICARG = 512; + rSDICCON = (0x1<<9) | (0x1<<8) | 0x50; // short_rsp, wait_resp, start, CMD8 + + if(!Chk_CMDend(16, 1)){ + printf("CMD16 failed\n"); + goto RECMD16; + } + + if(sdhc) blkSizeCnt <<= csd.read_len - 9; + + csd.read_len = 9; + csd.write_len = 9; + } +#endif -/* - Card_sel_desel(0); // DeSelect for IDLE - - if(!CMD9()) - printf("Get CSD fail!!!\n"); - - Card_sel_desel(1); // Select -*/ - { /* fill in device description */ mmc_dev.if_type = IF_TYPE_MMC; @@ -628,16 +819,8 @@ mmc_dev.type = 0; /* FIXME fill in the correct size (is set to 32MByte) */ mmc_dev.blksz = 512; - //mmc_dev.lba = 0x10000; mmc_dev.lba = CardSize / 512; mmc_dev.part_type = PART_TYPE_DOS; - /* - sprintf(mmc_dev.vendor,"Man %02x%02x%02x Snr %02x%02x%02x", - cid->id[0], cid->id[1], cid->id[2], - cid->sn[0], cid->sn[1], cid->sn[2]); - sprintf(mmc_dev.product,"%s",cid->name); - sprintf(mmc_dev.revision,"%x %x",cid->hwrev, cid->fwrev); - */ sprintf(mmc_dev.vendor,"Man aESOP1 Snr 123456"); sprintf(mmc_dev.product,"%s","SDxxxMB"); @@ -666,84 +849,62 @@ kk = 0; rSDICON = rSDICON | (1<<1); // FIFO reset - -// rSDIDCON=(2<<22)|(1<<19)|(1<<17)|(CardBusWidth<<16)|(1<<14)|(2<<12)|(ulSectors<<0); //Salamander rSDIDCON = (1<<19) | (1<<17) | (CardBusWidth<<16) | (2<<12) | (ulSectors<<0); + if(!sdhc) + rSDICARG=ulLBA*512; // CMD17/18(addr) + else + rSDICARG=ulLBA; - //Word Rx, Rx after cmd, blk, 4bit bus, Rx start, blk num, data start, data transmit mode - - rSDICARG=ulLBA*512; // CMD17/18(addr) -// printf("rSDICARG :%x,ulLBA %x, ulLBA*512 %x\n", rSDICARG, ulLBA, ulLBA*512); - //rSDICARG=0x0; // CMD17/18(addr) - RERDCMD: -// printf("RERCMD!!\n"); - if(ulSectors<2) // SINGLE_READ + if(ulSectors<2) // SINGLE_READ { - //printf("SINGLE\n"); - rSDICCON = (0x1<<9)|(0x1<<8)|0x51; // sht_resp, wait_resp, dat, start, CMD17 - if(!Chk_CMDend(17, 1)) //-- Check end of CMD17 + rSDICCON = (0x1<<9)|(0x1<<8)|0x51; // sht_resp, wait_resp, dat, start, CMD17 + if(!Chk_CMDend(17, 1)) //-- Check end of CMD17 goto RERDCMD; } - else // MULTI_READ + else { - //printf("MULTI\n"); - rSDICCON = (0x1<<9)|(0x1<<8)|0x52; // sht_resp, wait_resp, dat, start, CMD18 - if(!Chk_CMDend(18, 1)) //-- Check end of CMD18 + rSDICCON = (0x1<<9)|(0x1<<8)|0x52; // sht_resp, wait_resp, dat, start, CMD18 + if(!Chk_CMDend(18, 1)) //-- Check end of CMD18 goto RERDCMD; } - //rSDICSTA=0xa00; // Clear cmd_end(with rsp) + //rSDICSTA=0xa00; // Clear cmd_end(with rsp) -// state = rSDICSTA; -// rSDICSTA = state; // Clear cmd_end(with rsp) -// printf("\n Read CMD end\n"); - total_word = 128*ulSectors*4; while(rd_cnt < total_word) { -// for(kk=0; kk<1; kk++) ; state = rSDIDSTA; - if((state&0x20)==0x20) // Check timeout + if((state&0x20)==0x20) // Check timeout { - rSDIDSTA=(0x1<<0x5); // Clear timeout flag - //printf("\n[Time Out !!!] %d, state=%x status=%x\n",rd_cnt,state,rSDIFSTA); - //while(1); + rSDIDSTA=(0x1<<0x5); // Clear timeout flag break; } status = rSDIFSTA; - if( (status&0x1000) == 0x1000 ) // Is Rx data? + if( (status&0x1000) == 0x1000 ) // Is Rx data? { *Rx_buffer1++=rSDIDAT; - //printf("%02x ",Rx_buffer1[rd_cnt]); rd_cnt++; -// printf("%02x ", rd_cnt); -// if(rd_cnt%8==0) printf("\n"); + } } - //printf("\n After Read loop %d %d\n",rd_cnt, kk); - - //-- Check end of DATA - //printf("\n[Start Chk_DATend !!!]\n"); if(!Chk_DATend()) printf("dat error\n"); - rSDIDSTA = 0x10; // Clear data Tx/Rx end + rSDIDSTA = 0x10; // Clear data Tx/Rx end - //printf("\n[End Chk_DATend !!!]\n"); - if(ulSectors>1) { RERCMD12: //--Stop cmd(CMD12) - rSDICARG=0x0; //CMD12(stuff bit) + rSDICARG=0x0; //CMD12(stuff bit) rSDICCON=(0x1<<9)|(0x1<<8)|0x4c; //sht_resp, wait_resp, start, CMD12 //-- Check end of CMD12 if(!Chk_CMDend(12, 1)) goto RERCMD12; - //rSDICSTA=0xa00; // Clear cmd_end(with rsp) + //rSDICSTA=0xa00; // Clear cmd_end(with rsp) } } //[*]----------------------------------------------------------------------------------------------------[*] @@ -753,19 +914,12 @@ unsigned int *Tx_buffer1; //128[word]*16[blk]=8192[byte] Tx_buffer1 = (unsigned int *)(pucdata); - wt_cnt=0; - printf("### HERE WRITE\n"); - - //rSDIFSTA = rSDIFSTA|(1<<16); // FIFO reset - rSDICON = rSDICON | (1<<1); // FIFO reset - + rSDICON = rSDICON | (1<<1); // FIFO reset rSDIDCON = (2<<22)|(1<<20)|(1<<17)|(CardBusWidth<<16)|(1<<14)|(3<<12)|(ulSectors<<0); - //Word Tx, Tx after rsp, blk, 4bit bus, Tx start, blk num + rSDICARG = ulLBA*512; // CMD24/25(addr) - rSDICARG = ulLBA*512; // CMD24/25(addr) - REWTCMD: if(ulSectors<2) // SINGLE_WRITE { @@ -789,7 +943,6 @@ { rSDIDAT = *Tx_buffer1++; wt_cnt++; -// printf("Block No.=%d, wt_cnt=%d\n",block,wt_cnt); } } @@ -806,7 +959,6 @@ REWCMD12: rSDIDCON = (1<<18)|(1<<17)|(0<<16)|(1<<14)|(1<<12)|(ulLBA<<0); - rSDICARG = 0x0; //CMD12(stuff bit) rSDICCON = (0x1<<9)|(0x1<<8)|0x4c; //sht_resp, wait_resp, start, CMD12 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <or...@us...> - 2008-03-30 12:31:51
|
Revision: 300 http://open2x.svn.sourceforge.net/open2x/?rev=300&view=rev Author: orkie Date: 2008-03-30 05:31:51 -0700 (Sun, 30 Mar 2008) Log Message: ----------- Added libexpat to the build procedure since some stuff (like the SDL Modified Paths: -------------- trunk/libs-new/Makefile Added Paths: ----------- trunk/libs-new/libexpat/ trunk/libs-new/libexpat/2.0.1.mk trunk/libs-new/libexpat/Makefile.mk trunk/libs-new/libexpat/expat-2.0.1/ trunk/libs-new/libexpat/expat-2.0.1/COPYING trunk/libs-new/libexpat/expat-2.0.1/Changes trunk/libs-new/libexpat/expat-2.0.1/MANIFEST trunk/libs-new/libexpat/expat-2.0.1/Makefile.in trunk/libs-new/libexpat/expat-2.0.1/README trunk/libs-new/libexpat/expat-2.0.1/amiga/ trunk/libs-new/libexpat/expat-2.0.1/amiga/Makefile trunk/libs-new/libexpat/expat-2.0.1/amiga/README.txt trunk/libs-new/libexpat/expat-2.0.1/amiga/expat.xml trunk/libs-new/libexpat/expat-2.0.1/amiga/expat_lib.c trunk/libs-new/libexpat/expat-2.0.1/amiga/expat_vectors.c trunk/libs-new/libexpat/expat-2.0.1/amiga/include/ trunk/libs-new/libexpat/expat-2.0.1/amiga/include/inline4/ trunk/libs-new/libexpat/expat-2.0.1/amiga/include/inline4/expat.h trunk/libs-new/libexpat/expat-2.0.1/amiga/include/interfaces/ trunk/libs-new/libexpat/expat-2.0.1/amiga/include/interfaces/expat.h trunk/libs-new/libexpat/expat-2.0.1/amiga/include/libraries/ trunk/libs-new/libexpat/expat-2.0.1/amiga/include/libraries/expat.h trunk/libs-new/libexpat/expat-2.0.1/amiga/include/proto/ trunk/libs-new/libexpat/expat-2.0.1/amiga/include/proto/expat.h trunk/libs-new/libexpat/expat-2.0.1/amiga/launch.c trunk/libs-new/libexpat/expat-2.0.1/amiga/stdlib.c trunk/libs-new/libexpat/expat-2.0.1/bcb5/ trunk/libs-new/libexpat/expat-2.0.1/bcb5/README.txt trunk/libs-new/libexpat/expat-2.0.1/bcb5/all_projects.bpg trunk/libs-new/libexpat/expat-2.0.1/bcb5/elements.bpf trunk/libs-new/libexpat/expat-2.0.1/bcb5/elements.bpr trunk/libs-new/libexpat/expat-2.0.1/bcb5/elements.mak trunk/libs-new/libexpat/expat-2.0.1/bcb5/expat.bpf trunk/libs-new/libexpat/expat-2.0.1/bcb5/expat.bpr trunk/libs-new/libexpat/expat-2.0.1/bcb5/expat.mak trunk/libs-new/libexpat/expat-2.0.1/bcb5/expat_static.bpf trunk/libs-new/libexpat/expat-2.0.1/bcb5/expat_static.bpr trunk/libs-new/libexpat/expat-2.0.1/bcb5/expat_static.mak trunk/libs-new/libexpat/expat-2.0.1/bcb5/expatw.bpf trunk/libs-new/libexpat/expat-2.0.1/bcb5/expatw.bpr trunk/libs-new/libexpat/expat-2.0.1/bcb5/expatw.mak trunk/libs-new/libexpat/expat-2.0.1/bcb5/expatw_static.bpf trunk/libs-new/libexpat/expat-2.0.1/bcb5/expatw_static.bpr trunk/libs-new/libexpat/expat-2.0.1/bcb5/expatw_static.mak trunk/libs-new/libexpat/expat-2.0.1/bcb5/libexpat_mtd.def trunk/libs-new/libexpat/expat-2.0.1/bcb5/libexpatw_mtd.def trunk/libs-new/libexpat/expat-2.0.1/bcb5/makefile.mak trunk/libs-new/libexpat/expat-2.0.1/bcb5/outline.bpf trunk/libs-new/libexpat/expat-2.0.1/bcb5/outline.bpr trunk/libs-new/libexpat/expat-2.0.1/bcb5/outline.mak trunk/libs-new/libexpat/expat-2.0.1/bcb5/setup.bat trunk/libs-new/libexpat/expat-2.0.1/bcb5/xmlwf.bpf trunk/libs-new/libexpat/expat-2.0.1/bcb5/xmlwf.bpr trunk/libs-new/libexpat/expat-2.0.1/bcb5/xmlwf.mak trunk/libs-new/libexpat/expat-2.0.1/configure trunk/libs-new/libexpat/expat-2.0.1/configure.in trunk/libs-new/libexpat/expat-2.0.1/conftools/ trunk/libs-new/libexpat/expat-2.0.1/conftools/PrintPath trunk/libs-new/libexpat/expat-2.0.1/conftools/ac_c_bigendian_cross.m4 trunk/libs-new/libexpat/expat-2.0.1/conftools/config.guess trunk/libs-new/libexpat/expat-2.0.1/conftools/config.sub trunk/libs-new/libexpat/expat-2.0.1/conftools/expat.m4 trunk/libs-new/libexpat/expat-2.0.1/conftools/get-version.sh trunk/libs-new/libexpat/expat-2.0.1/conftools/install-sh trunk/libs-new/libexpat/expat-2.0.1/conftools/libtool.m4 trunk/libs-new/libexpat/expat-2.0.1/conftools/ltmain.sh trunk/libs-new/libexpat/expat-2.0.1/conftools/mkinstalldirs trunk/libs-new/libexpat/expat-2.0.1/doc/ trunk/libs-new/libexpat/expat-2.0.1/doc/expat.png trunk/libs-new/libexpat/expat-2.0.1/doc/reference.html trunk/libs-new/libexpat/expat-2.0.1/doc/style.css trunk/libs-new/libexpat/expat-2.0.1/doc/valid-xhtml10.png trunk/libs-new/libexpat/expat-2.0.1/doc/xmlwf.1 trunk/libs-new/libexpat/expat-2.0.1/doc/xmlwf.sgml trunk/libs-new/libexpat/expat-2.0.1/examples/ trunk/libs-new/libexpat/expat-2.0.1/examples/elements.c trunk/libs-new/libexpat/expat-2.0.1/examples/elements.dsp trunk/libs-new/libexpat/expat-2.0.1/examples/outline.c trunk/libs-new/libexpat/expat-2.0.1/examples/outline.dsp trunk/libs-new/libexpat/expat-2.0.1/expat.dsw trunk/libs-new/libexpat/expat-2.0.1/expat_config.h.in trunk/libs-new/libexpat/expat-2.0.1/lib/ trunk/libs-new/libexpat/expat-2.0.1/lib/Makefile.MPW trunk/libs-new/libexpat/expat-2.0.1/lib/amigaconfig.h trunk/libs-new/libexpat/expat-2.0.1/lib/ascii.h trunk/libs-new/libexpat/expat-2.0.1/lib/asciitab.h trunk/libs-new/libexpat/expat-2.0.1/lib/expat.dsp trunk/libs-new/libexpat/expat-2.0.1/lib/expat.h trunk/libs-new/libexpat/expat-2.0.1/lib/expat_external.h trunk/libs-new/libexpat/expat-2.0.1/lib/expat_static.dsp trunk/libs-new/libexpat/expat-2.0.1/lib/expatw.dsp trunk/libs-new/libexpat/expat-2.0.1/lib/expatw_static.dsp trunk/libs-new/libexpat/expat-2.0.1/lib/iasciitab.h trunk/libs-new/libexpat/expat-2.0.1/lib/internal.h trunk/libs-new/libexpat/expat-2.0.1/lib/latin1tab.h trunk/libs-new/libexpat/expat-2.0.1/lib/libexpat.def trunk/libs-new/libexpat/expat-2.0.1/lib/libexpatw.def trunk/libs-new/libexpat/expat-2.0.1/lib/macconfig.h trunk/libs-new/libexpat/expat-2.0.1/lib/nametab.h trunk/libs-new/libexpat/expat-2.0.1/lib/utf8tab.h trunk/libs-new/libexpat/expat-2.0.1/lib/winconfig.h trunk/libs-new/libexpat/expat-2.0.1/lib/xmlparse.c trunk/libs-new/libexpat/expat-2.0.1/lib/xmlrole.c trunk/libs-new/libexpat/expat-2.0.1/lib/xmlrole.h trunk/libs-new/libexpat/expat-2.0.1/lib/xmltok.c trunk/libs-new/libexpat/expat-2.0.1/lib/xmltok.h trunk/libs-new/libexpat/expat-2.0.1/lib/xmltok_impl.c trunk/libs-new/libexpat/expat-2.0.1/lib/xmltok_impl.h trunk/libs-new/libexpat/expat-2.0.1/lib/xmltok_ns.c trunk/libs-new/libexpat/expat-2.0.1/tests/ trunk/libs-new/libexpat/expat-2.0.1/tests/README.txt trunk/libs-new/libexpat/expat-2.0.1/tests/benchmark/ trunk/libs-new/libexpat/expat-2.0.1/tests/benchmark/README.txt trunk/libs-new/libexpat/expat-2.0.1/tests/benchmark/benchmark.c trunk/libs-new/libexpat/expat-2.0.1/tests/benchmark/benchmark.dsp trunk/libs-new/libexpat/expat-2.0.1/tests/benchmark/benchmark.dsw trunk/libs-new/libexpat/expat-2.0.1/tests/chardata.c trunk/libs-new/libexpat/expat-2.0.1/tests/chardata.h trunk/libs-new/libexpat/expat-2.0.1/tests/minicheck.c trunk/libs-new/libexpat/expat-2.0.1/tests/minicheck.h trunk/libs-new/libexpat/expat-2.0.1/tests/runtests.c trunk/libs-new/libexpat/expat-2.0.1/tests/runtestspp.cpp trunk/libs-new/libexpat/expat-2.0.1/tests/xmltest.sh trunk/libs-new/libexpat/expat-2.0.1/vms/ trunk/libs-new/libexpat/expat-2.0.1/vms/README.vms trunk/libs-new/libexpat/expat-2.0.1/vms/descrip.mms trunk/libs-new/libexpat/expat-2.0.1/vms/expat_config.h trunk/libs-new/libexpat/expat-2.0.1/win32/ trunk/libs-new/libexpat/expat-2.0.1/win32/MANIFEST.txt trunk/libs-new/libexpat/expat-2.0.1/win32/README.txt trunk/libs-new/libexpat/expat-2.0.1/win32/expat.iss trunk/libs-new/libexpat/expat-2.0.1/xmlwf/ trunk/libs-new/libexpat/expat-2.0.1/xmlwf/codepage.c trunk/libs-new/libexpat/expat-2.0.1/xmlwf/codepage.h trunk/libs-new/libexpat/expat-2.0.1/xmlwf/ct.c trunk/libs-new/libexpat/expat-2.0.1/xmlwf/filemap.h trunk/libs-new/libexpat/expat-2.0.1/xmlwf/readfilemap.c trunk/libs-new/libexpat/expat-2.0.1/xmlwf/unixfilemap.c trunk/libs-new/libexpat/expat-2.0.1/xmlwf/win32filemap.c trunk/libs-new/libexpat/expat-2.0.1/xmlwf/xmlfile.c trunk/libs-new/libexpat/expat-2.0.1/xmlwf/xmlfile.h trunk/libs-new/libexpat/expat-2.0.1/xmlwf/xmlmime.c trunk/libs-new/libexpat/expat-2.0.1/xmlwf/xmlmime.h trunk/libs-new/libexpat/expat-2.0.1/xmlwf/xmltchar.h trunk/libs-new/libexpat/expat-2.0.1/xmlwf/xmlurl.h trunk/libs-new/libexpat/expat-2.0.1/xmlwf/xmlwf.c trunk/libs-new/libexpat/expat-2.0.1/xmlwf/xmlwf.dsp trunk/libs-new/libexpat/expat-2.0.1/xmlwf/xmlwin32url.cxx Modified: trunk/libs-new/Makefile =================================================================== --- trunk/libs-new/Makefile 2008-03-27 15:12:39 UTC (rev 299) +++ trunk/libs-new/Makefile 2008-03-30 12:31:51 UTC (rev 300) @@ -2,10 +2,10 @@ ifeq ($(strip $(BUILD_BUILDROOT)),y) include .config else -TARGETS+=o2x-zlib TARGET_BZIP2 = y TARGET_FREETYPE = y TARGET_IMLIB2 = y +TARGET_LIBEXPAT = y TARGET_LIBICONV = y TARGET_LIBID3TAG = y TARGET_LIBJPEG = y Added: trunk/libs-new/libexpat/2.0.1.mk =================================================================== --- trunk/libs-new/libexpat/2.0.1.mk (rev 0) +++ trunk/libs-new/libexpat/2.0.1.mk 2008-03-30 12:31:51 UTC (rev 300) @@ -0,0 +1,16 @@ +LIBEXPAT_DIR := libexpat/expat-2.0.1 + +o2x-libexpat: + @-echo "Build libexpat" + (cd $(LIBEXPAT_DIR); rm -rf config.cache; \ + ./autogen.sh; \ + $(FLAGS) ./configure --prefix=$(PREFIX)\ + --target=$(TARGET)\ + --host=$(HOST)\ + --build=$(BUILD)\ + --enable-shared\ + --enable-static\ + ) + $(FLAGS) make -C $(LIBEXPAT_DIR) + $(FLAGS) make -C $(LIBEXPAT_DIR) install + #$(FLAGS) make -C $(LIBEXPAT_DIR) clean Added: trunk/libs-new/libexpat/Makefile.mk =================================================================== --- trunk/libs-new/libexpat/Makefile.mk (rev 0) +++ trunk/libs-new/libexpat/Makefile.mk 2008-03-30 12:31:51 UTC (rev 300) @@ -0,0 +1,5 @@ +ifeq ($(strip $(TARGET_LIBEXPAT)),y) +TARGETS+=o2x-libexpat +endif + +include libexpat/2.0.1.mk \ No newline at end of file Added: trunk/libs-new/libexpat/expat-2.0.1/COPYING =================================================================== --- trunk/libs-new/libexpat/expat-2.0.1/COPYING (rev 0) +++ trunk/libs-new/libexpat/expat-2.0.1/COPYING 2008-03-30 12:31:51 UTC (rev 300) @@ -0,0 +1,22 @@ +Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd + and Clark Cooper +Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Property changes on: trunk/libs-new/libexpat/expat-2.0.1/COPYING ___________________________________________________________________ Name: svn:executable + * Added: trunk/libs-new/libexpat/expat-2.0.1/Changes =================================================================== --- trunk/libs-new/libexpat/expat-2.0.1/Changes (rev 0) +++ trunk/libs-new/libexpat/expat-2.0.1/Changes 2008-03-30 12:31:51 UTC (rev 300) @@ -0,0 +1,169 @@ +Release 2.0.1 Tue June 5 2007 + - Fixed bugs #1515266, 1515600: The character data handler's calling + of XML_StopParser() was not handled properly; if the parser was + stopped and the handler set to NULL, the parser would segfault. + - Fixed bug #1690883: Expat failed on EBCDIC systems as it assumed + some character constants to be ASCII encoded. + - Minor cleanups of the test harness. + - Fixed xmlwf bug #1513566: "out of memory" error on file size zero. + - Fixed outline.c bug #1543233: missing a final XML_ParserFree() call. + - Fixes and improvements for Windows platform: + bugs #1409451, #1476160, 1548182, 1602769, 1717322. + - Build fixes for various platforms: + HP-UX, Tru64, Solaris 9: patch #1437840, bug #1196180. + All Unix: #1554618 (refreshed config.sub/config.guess). + #1490371, #1613457: support both, DESTDIR and INSTALL_ROOT, + without relying on GNU-Make specific features. + #1647805: Patched configure.in to work better with Intel compiler. + - Fixes to Makefile.in to have make check work correctly: + bugs #1408143, #1535603, #1536684. + - Added Open Watcom support: patch #1523242. + +Release 2.0.0 Wed Jan 11 2006 + - We no longer use the "check" library for C unit testing; we + always use the (partial) internal implementation of the API. + - Report XML_NS setting via XML_GetFeatureList(). + - Fixed headers for use from C++. + - XML_GetCurrentLineNumber() and XML_GetCurrentColumnNumber() + now return unsigned integers. + - Added XML_LARGE_SIZE switch to enable 64-bit integers for + byte indexes and line/column numbers. + - Updated to use libtool 1.5.22 (the most recent). + - Added support for AmigaOS. + - Some mostly minor bug fixes. SF issues include: 1006708, + 1021776, 1023646, 1114960, 1156398, 1221160, 1271642. + +Release 1.95.8 Fri Jul 23 2004 + - Major new feature: suspend/resume. Handlers can now request + that a parse be suspended for later resumption or aborted + altogether. See "Temporarily Stopping Parsing" in the + documentation for more details. + - Some mostly minor bug fixes, but compilation should no + longer generate warnings on most platforms. SF issues + include: 827319, 840173, 846309, 888329, 896188, 923913, + 928113, 961698, 985192. + +Release 1.95.7 Mon Oct 20 2003 + - Fixed enum XML_Status issue (reported on SourceForge many + times), so compilers that are properly picky will be happy. + - Introduced an XMLCALL macro to control the calling + convention used by the Expat API; this macro should be used + to annotate prototypes and definitions of callback + implementations in code compiled with a calling convention + other than the default convention for the host platform. + - Improved ability to build without the configure-generated + expat_config.h header. This is useful for applications + which embed Expat rather than linking in the library. + - Fixed a variety of bugs: see SF issues 458907, 609603, + 676844, 679754, 692878, 692964, 695401, 699323, 699487, + 820946. + - Improved hash table lookups. + - Added more regression tests and improved documentation. + +Release 1.95.6 Tue Jan 28 2003 + - Added XML_FreeContentModel(). + - Added XML_MemMalloc(), XML_MemRealloc(), XML_MemFree(). + - Fixed a variety of bugs: see SF issues 615606, 616863, + 618199, 653180, 673791. + - Enhanced the regression test suite. + - Man page improvements: includes SF issue 632146. + +Release 1.95.5 Fri Sep 6 2002 + - Added XML_UseForeignDTD() for improved SAX2 support. + - Added XML_GetFeatureList(). + - Defined XML_Bool type and the values XML_TRUE and XML_FALSE. + - Use an incomplete struct instead of a void* for the parser + (may not retain). + - Fixed UTF-8 decoding bug that caused legal UTF-8 to be rejected. + - Finally fixed bug where default handler would report DTD + events that were already handled by another handler. + Initial patch contributed by Darryl Miles. + - Removed unnecessary DllMain() function that caused static + linking into a DLL to be difficult. + - Added VC++ projects for building static libraries. + - Reduced line-length for all source code and headers to be + no longer than 80 characters, to help with AS/400 support. + - Reduced memory copying during parsing (SF patch #600964). + - Fixed a variety of bugs: see SF issues 580793, 434664, + 483514, 580503, 581069, 584041, 584183, 584832, 585537, + 596555, 596678, 598352, 598944, 599715, 600479, 600971. + +Release 1.95.4 Fri Jul 12 2002 + - Added support for VMS, contributed by Craig Berry. See + vms/README.vms for more information. + - Added Mac OS (classic) support, with a makefile for MPW, + contributed by Thomas Wegner and Daryle Walker. + - Added Borland C++ Builder 5 / BCC 5.5 support, contributed + by Patrick McConnell (SF patch #538032). + - Fixed a variety of bugs: see SF issues 441449, 563184, + 564342, 566334, 566901, 569461, 570263, 575168, 579196. + - Made skippedEntityHandler conform to SAX2 (see source comment) + - Re-implemented WFC: Entity Declared from XML 1.0 spec and + added a new error "entity declared in parameter entity": + see SF bug report 569461 and SF patch 578161 + - Re-implemented section 5.1 from XML 1.0 spec: + see SF bug report 570263 and SF patch 578161 + +Release 1.95.3 Mon Jun 3 2002 + - Added a project to the MSVC workspace to create a wchar_t + version of the library; the DLLs are named libexpatw.dll. + - Changed the name of the Windows DLLs from expat.dll to + libexpat.dll; this fixes SF bug #432456. + - Added the XML_ParserReset() API function. + - Fixed XML_SetReturnNSTriplet() to work for element names. + - Made the XML_UNICODE builds usable (thanks, Karl!). + - Allow xmlwf to read from standard input. + - Install a man page for xmlwf on Unix systems. + - Fixed many bugs; see SF bug reports 231864, 461380, 464837, + 466885, 469226, 477667, 484419, 487840, 494749, 496505, + 547350. Other bugs which we can't test as easily may also + have been fixed, especially in the area of build support. + +Release 1.95.2 Fri Jul 27 2001 + - More changes to make MSVC happy with the build; add a single + workspace to support both the library and xmlwf application. + - Added a Windows installer for Windows users; includes + xmlwf.exe. + - Added compile-time constants that can be used to determine the + Expat version + - Removed a lot of GNU-specific dependencies to aide portability + among the various Unix flavors. + - Fix the UTF-8 BOM bug. + - Cleaned up warning messages for several compilers. + - Added the -Wall, -Wstrict-prototypes options for GCC. + +Release 1.95.1 Sun Oct 22 15:11:36 EDT 2000 + - Changes to get expat to build under Microsoft compiler + - Removed all aborts and instead return an UNEXPECTED_STATE error. + - Fixed a bug where a stray '%' in an entity value would cause an + abort. + - Defined XML_SetEndNamespaceDeclHandler. Thanks to Darryl Miles for + finding this oversight. + - Changed default patterns in lib/Makefile.in to fit non-GNU makes + Thanks to ro...@un... for reporting and providing an + account to test on. + - The reference had the wrong label for XML_SetStartNamespaceDecl. + Reported by an anonymous user. + +Release 1.95.0 Fri Sep 29 2000 + - XML_ParserCreate_MM + Allows you to set a memory management suite to replace the + standard malloc,realloc, and free. + - XML_SetReturnNSTriplet + If you turn this feature on when namespace processing is in + effect, then qualified, prefixed element and attribute names + are returned as "uri|name|prefix" where '|' is whatever + separator character is used in namespace processing. + - Merged in features from perl-expat + o XML_SetElementDeclHandler + o XML_SetAttlistDeclHandler + o XML_SetXmlDeclHandler + o XML_SetEntityDeclHandler + o StartDoctypeDeclHandler takes 3 additional parameters: + sysid, pubid, has_internal_subset + o Many paired handler setters (like XML_SetElementHandler) + now have corresponding individual handler setters + o XML_GetInputContext for getting the input context of + the current parse position. + - Added reference material + - Packaged into a distribution that builds a sharable library Property changes on: trunk/libs-new/libexpat/expat-2.0.1/Changes ___________________________________________________________________ Name: svn:executable + * Added: trunk/libs-new/libexpat/expat-2.0.1/MANIFEST =================================================================== --- trunk/libs-new/libexpat/expat-2.0.1/MANIFEST (rev 0) +++ trunk/libs-new/libexpat/expat-2.0.1/MANIFEST 2008-03-30 12:31:51 UTC (rev 300) @@ -0,0 +1,128 @@ +amiga/stdlib.c +amiga/launch.c +amiga/expat_vectors.c +amiga/expat_lib.c +amiga/expat.xml +amiga/README.txt +amiga/Makefile +amiga/include/proto/expat.h +amiga/include/libraries/expat.h +amiga/include/interfaces/expat.h +amiga/include/inline4/expat.h +bcb5/README.txt +bcb5/all_projects.bpg +bcb5/elements.bpf +bcb5/elements.bpr +bcb5/elements.mak +bcb5/expat.bpf +bcb5/expat.bpr +bcb5/expat.mak +bcb5/expat_static.bpf +bcb5/expat_static.bpr +bcb5/expat_static.mak +bcb5/expatw.bpf +bcb5/expatw.bpr +bcb5/expatw.mak +bcb5/expatw_static.bpf +bcb5/expatw_static.bpr +bcb5/expatw_static.mak +bcb5/libexpat_mtd.def +bcb5/libexpatw_mtd.def +bcb5/makefile.mak +bcb5/outline.bpf +bcb5/outline.bpr +bcb5/outline.mak +bcb5/setup.bat +bcb5/xmlwf.bpf +bcb5/xmlwf.bpr +bcb5/xmlwf.mak +doc/expat.png +doc/reference.html +doc/style.css +doc/valid-xhtml10.png +doc/xmlwf.1 +doc/xmlwf.sgml +COPYING +Changes +MANIFEST +Makefile.in +README +configure +configure.in +expat_config.h.in +expat.dsw +conftools/PrintPath +conftools/ac_c_bigendian_cross.m4 +conftools/config.guess +conftools/config.sub +conftools/expat.m4 +conftools/get-version.sh +conftools/install-sh +conftools/libtool.m4 +conftools/ltmain.sh +conftools/mkinstalldirs +examples/elements.c +examples/elements.dsp +examples/outline.c +examples/outline.dsp +lib/Makefile.MPW +lib/amigaconfig.h +lib/ascii.h +lib/asciitab.h +lib/expat.dsp +lib/expat.h +lib/expat_external.h +lib/expat_static.dsp +lib/expatw.dsp +lib/expatw_static.dsp +lib/iasciitab.h +lib/internal.h +lib/latin1tab.h +lib/libexpat.def +lib/libexpatw.def +lib/macconfig.h +lib/nametab.h +lib/utf8tab.h +lib/winconfig.h +lib/xmlparse.c +lib/xmlrole.c +lib/xmlrole.h +lib/xmltok.c +lib/xmltok.h +lib/xmltok_impl.c +lib/xmltok_impl.h +lib/xmltok_ns.c +tests/benchmark/README.txt +tests/benchmark/benchmark.c +tests/benchmark/benchmark.dsp +tests/benchmark/benchmark.dsw +tests/README.txt +tests/chardata.c +tests/chardata.h +tests/minicheck.c +tests/minicheck.h +tests/runtests.c +tests/runtestspp.cpp +tests/xmltest.sh +vms/README.vms +vms/descrip.mms +vms/expat_config.h +win32/MANIFEST.txt +win32/README.txt +win32/expat.iss +xmlwf/codepage.c +xmlwf/codepage.h +xmlwf/ct.c +xmlwf/filemap.h +xmlwf/readfilemap.c +xmlwf/unixfilemap.c +xmlwf/win32filemap.c +xmlwf/xmlfile.c +xmlwf/xmlfile.h +xmlwf/xmlmime.c +xmlwf/xmlmime.h +xmlwf/xmltchar.h +xmlwf/xmlurl.h +xmlwf/xmlwf.c +xmlwf/xmlwf.dsp +xmlwf/xmlwin32url.cxx Property changes on: trunk/libs-new/libexpat/expat-2.0.1/MANIFEST ___________________________________________________________________ Name: svn:executable + * Added: trunk/libs-new/libexpat/expat-2.0.1/Makefile.in =================================================================== --- trunk/libs-new/libexpat/expat-2.0.1/Makefile.in (rev 0) +++ trunk/libs-new/libexpat/expat-2.0.1/Makefile.in 2008-03-30 12:31:51 UTC (rev 300) @@ -0,0 +1,187 @@ +################################################################ +# Process this file with top-level configure script to produce Makefile +# +# Copyright 2000 Clark Cooper +# +# This file is part of EXPAT. +# +# EXPAT is free software; you can redistribute it and/or modify it +# under the terms of the License (based on the MIT/X license) contained +# in the file COPYING that comes with this distribution. +# +# EXPAT IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +# SOFTWARE OR THE USE OR OTHER DEALINGS IN EXPAT. +# + +SHELL = @SHELL@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ + +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +libdir = @libdir@ +includedir = @includedir@ +man1dir = @mandir@/man1 + +top_builddir = . + + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ +mkinstalldirs = $(SHELL) $(top_srcdir)/conftools/mkinstalldirs + +MANFILE = $(srcdir)/doc/xmlwf.1 +APIHEADER = $(srcdir)/lib/expat.h $(srcdir)/lib/expat_external.h +LIBRARY = libexpat.la + +DESTDIR = $(INSTALL_ROOT) + +default: buildlib xmlwf/xmlwf + +buildlib: $(LIBRARY) + +all: $(LIBRARY) xmlwf/xmlwf examples/elements examples/outline + +clean: + cd lib && rm -f $(LIBRARY) *.o *.lo && rm -rf .libs _libs + cd xmlwf && rm -f xmlwf *.o *.lo && rm -rf .libs _libs + cd examples && rm -f elements outline *.o *.lo && rm -rf .libs _libs + cd tests && rm -rf .libs runtests runtests.o runtestspp runtestspp.o + cd tests && rm -f chardata.o minicheck.o + rm -rf .libs libexpat.la + rm -f examples/core tests/core xmlwf/core + +clobber: clean + +distclean: clean + rm -f expat_config.h config.status config.log config.cache libtool + rm -f Makefile + +extraclean: distclean + rm -f expat_config.h.in configure + rm -f conftools/ltconfig conftools/ltmain.sh conftools/libtool.m4 + +check: tests/runtests tests/runtestspp + tests/runtests + tests/runtestspp + +install: xmlwf/xmlwf installlib + $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(DESTDIR)$(bindir)/xmlwf + $(INSTALL_DATA) $(MANFILE) $(DESTDIR)$(man1dir) + +installlib: $(LIBRARY) $(APIHEADER) + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) + $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY) + for FN in $(APIHEADER) ; do $(INSTALL_DATA) $$FN $(DESTDIR)$(includedir) ; done + +uninstall: uninstalllib + $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(bindir)/xmlwf + rm -f $(DESTDIR)$(man1dir)/xmlwf.1 + +uninstalllib: + $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(LIBRARY) + rm -f $(DESTDIR)$(includedir)/expat.h + rm -f $(DESTDIR)$(includedir)/expat_external.h + +# for VPATH builds (invoked by configure) +mkdir-init: + @for d in lib xmlwf examples tests ; do \ + (mkdir $$d 2> /dev/null || test 1) ; \ + done + +CC = @CC@ +CXX = @CXX@ +LIBTOOL = @LIBTOOL@ + +INCLUDES = -I$(srcdir)/lib -I. +LDFLAGS = @LDFLAGS@ +CPPFLAGS = @CPPFLAGS@ -DHAVE_EXPAT_CONFIG_H +CFLAGS = @CFLAGS@ +CXXFLAGS = @CXXFLAGS@ +VSNFLAG = -version-info @LIBCURRENT@:@LIBREVISION@:@LIBAGE@ + +### autoconf this? +LTFLAGS = --silent + +COMPILE = $(CC) $(INCLUDES) $(CFLAGS) $(DEFS) $(CPPFLAGS) +CXXCOMPILE = $(CXX) $(INCLUDES) $(CXXFLAGS) $(DEFS) $(CPPFLAGS) +LTCOMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) +LINK_LIB = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -no-undefined $(VSNFLAG) -rpath $(libdir) $(LDFLAGS) -o $@ +LINK_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LDFLAGS) -o $@ +LINK_CXX_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CXXCOMPILE) $(LDFLAGS) -o $@ + +LIB_OBJS = lib/xmlparse.lo lib/xmltok.lo lib/xmlrole.lo +$(LIBRARY): $(LIB_OBJS) + $(LINK_LIB) $(LIB_OBJS) + +lib/xmlparse.lo: lib/xmlparse.c lib/expat.h lib/xmlrole.h lib/xmltok.h \ + $(top_builddir)/expat_config.h lib/expat_external.h lib/internal.h + +lib/xmlrole.lo: lib/xmlrole.c lib/ascii.h lib/xmlrole.h \ + $(top_builddir)/expat_config.h lib/expat_external.h lib/internal.h + +lib/xmltok.lo: lib/xmltok.c lib/xmltok_impl.c lib/xmltok_ns.c \ + lib/ascii.h lib/asciitab.h lib/iasciitab.h lib/latin1tab.h \ + lib/nametab.h lib/utf8tab.h lib/xmltok.h lib/xmltok_impl.h \ + $(top_builddir)/expat_config.h lib/expat_external.h lib/internal.h + + +XMLWF_OBJS = xmlwf/xmlwf.o xmlwf/xmlfile.o xmlwf/codepage.o xmlwf/@FILEMAP@.o +xmlwf/xmlwf.o: xmlwf/xmlwf.c +xmlwf/xmlfile.o: xmlwf/xmlfile.c +xmlwf/codepage.o: xmlwf/codepage.c +xmlwf/@FILEMAP@.o: xmlwf/@FILEMAP@.c +xmlwf/xmlwf: $(XMLWF_OBJS) $(LIBRARY) + $(LINK_EXE) $(XMLWF_OBJS) $(LIBRARY) + +examples/elements.o: examples/elements.c +examples/elements: examples/elements.o $(LIBRARY) + $(LINK_EXE) $< $(LIBRARY) + +examples/outline.o: examples/outline.c +examples/outline: examples/outline.o $(LIBRARY) + $(LINK_EXE) $< $(LIBRARY) + +tests/chardata.o: tests/chardata.c tests/chardata.h +tests/minicheck.o: tests/minicheck.c tests/minicheck.h +tests/runtests.o: tests/runtests.c tests/chardata.h +tests/runtests: tests/runtests.o tests/chardata.o tests/minicheck.o $(LIBRARY) + $(LINK_EXE) tests/runtests.o tests/chardata.o tests/minicheck.o $(LIBRARY) +tests/runtestspp.o: tests/runtestspp.cpp tests/runtests.c tests/chardata.h +tests/runtestspp: tests/runtestspp.o tests/chardata.o tests/minicheck.o $(LIBRARY) + $(LINK_CXX_EXE) tests/runtestspp.o tests/chardata.o tests/minicheck.o $(LIBRARY) + +tests/xmlts.zip: + wget --output-document=tests/xmlts.zip \ + http://www.w3.org/XML/Test/xmlts20020606.zip + +tests/XML-Test-Suite: tests/xmlts.zip + cd tests && unzip -q xmlts.zip + +run-xmltest: xmlwf/xmlwf tests/XML-Test-Suite + tests/xmltest.sh + +.SUFFIXES: .c .cpp .lo .o + +.cpp.o: + $(CXXCOMPILE) -o $@ -c $< +.c.o: + $(COMPILE) -o $@ -c $< +.c.lo: + $(LTCOMPILE) -o $@ -c $< + +.PHONY: buildlib all \ + clean distclean extraclean maintainer-clean \ + dist distdir \ + install uninstall Property changes on: trunk/libs-new/libexpat/expat-2.0.1/Makefile.in ___________________________________________________________________ Name: svn:executable + * Added: trunk/libs-new/libexpat/expat-2.0.1/README =================================================================== --- trunk/libs-new/libexpat/expat-2.0.1/README (rev 0) +++ trunk/libs-new/libexpat/expat-2.0.1/README 2008-03-30 12:31:51 UTC (rev 300) @@ -0,0 +1,137 @@ + + Expat, Release 2.0.1 + +This is Expat, a C library for parsing XML, written by James Clark. +Expat is a stream-oriented XML parser. This means that you register +handlers with the parser before starting the parse. These handlers +are called when the parser discovers the associated structures in the +document being parsed. A start tag is an example of the kind of +structures for which you may register handlers. + +Windows users should use the expat_win32bin package, which includes +both precompiled libraries and executables, and source code for +developers. + +Expat is free software. You may copy, distribute, and modify it under +the terms of the License contained in the file COPYING distributed +with this package. This license is the same as the MIT/X Consortium +license. + +Versions of Expat that have an odd minor version (the middle number in +the release above), are development releases and should be considered +as beta software. Releases with even minor version numbers are +intended to be production grade software. + +If you are building Expat from a check-out from the CVS repository, +you need to run a script that generates the configure script using the +GNU autoconf and libtool tools. To do this, you need to have +autoconf 2.52 or newer and libtool 1.4 or newer (1.5 or newer preferred). +Run the script like this: + + ./buildconf.sh + +Once this has been done, follow the same instructions as for building +from a source distribution. + +To build Expat from a source distribution, you first run the +configuration shell script in the top level distribution directory: + + ./configure + +There are many options which you may provide to configure (which you +can discover by running configure with the --help option). But the +one of most interest is the one that sets the installation directory. +By default, the configure script will set things up to install +libexpat into /usr/local/lib, expat.h into /usr/local/include, and +xmlwf into /usr/local/bin. If, for example, you'd prefer to install +into /home/me/mystuff/lib, /home/me/mystuff/include, and +/home/me/mystuff/bin, you can tell configure about that with: + + ./configure --prefix=/home/me/mystuff + +Another interesting option is to enable 64-bit integer support for +line and column numbers and the over-all byte index: + + ./configure CPPFLAGS=-DXML_LARGE_SIZE + +However, such a modification would be a breaking change to the ABI +and is therefore not recommended for general use - e.g. as part of +a Linux distribution - but rather for builds with special requirements. + +After running the configure script, the "make" command will build +things and "make install" will install things into their proper +location. Have a look at the "Makefile" to learn about additional +"make" options. Note that you need to have write permission into +the directories into which things will be installed. + +If you are interested in building Expat to provide document +information in UTF-16 rather than the default UTF-8, follow these +instructions (after having run "make distclean"): + + 1. For UTF-16 output as unsigned short (and version/error + strings as char), run: + + ./configure CPPFLAGS=-DXML_UNICODE + + For UTF-16 output as wchar_t (incl. version/error strings), + run: + + ./configure CFLAGS="-g -O2 -fshort-wchar" \ + CPPFLAGS=-DXML_UNICODE_WCHAR_T + + 2. Edit the MakeFile, changing: + + LIBRARY = libexpat.la + + to: + + LIBRARY = libexpatw.la + + (Note the additional "w" in the library name.) + + 3. Run "make buildlib" (which builds the library only). + Or, to save step 2, run "make buildlib LIBRARY=libexpatw.la". + + 4. Run "make installlib" (which installs the library only). + Or, if step 2 was omitted, run "make installlib LIBRARY=libexpatw.la". + +Using DESTDIR or INSTALL_ROOT is enabled, with INSTALL_ROOT being the default +value for DESTDIR, and the rest of the make file using only DESTDIR. +It works as follows: + $ make install DESTDIR=/path/to/image +overrides the in-makefile set DESTDIR, while both + $ INSTALL_ROOT=/path/to/image make install + $ make install INSTALL_ROOT=/path/to/image +use DESTDIR=$(INSTALL_ROOT), even if DESTDIR eventually is defined in the +environment, because variable-setting priority is +1) commandline +2) in-makefile +3) environment + +Note for Solaris users: The "ar" command is usually located in +"/usr/ccs/bin", which is not in the default PATH. You will need to +add this to your path for the "make" command, and probably also switch +to GNU make (the "make" found in /usr/ccs/bin does not seem to work +properly -- appearantly it does not understand .PHONY directives). If +you're using ksh or bash, use this command to build: + + PATH=/usr/ccs/bin:$PATH make + +When using Expat with a project using autoconf for configuration, you +can use the probing macro in conftools/expat.m4 to determine how to +include Expat. See the comments at the top of that file for more +information. + +A reference manual is available in the file doc/reference.html in this +distribution. + +The homepage for this project is http://www.libexpat.org/. There +are links there to connect you to the bug reports page. If you need +to report a bug when you don't have access to a browser, you may also +send a bug report by email to exp...@ma.... + +Discussion related to the direction of future expat development takes +place on exp...@ma.... Archives of this list and +other Expat-related lists may be found at: + + http://mail.libexpat.org/mailman/listinfo/ Property changes on: trunk/libs-new/libexpat/expat-2.0.1/README ___________________________________________________________________ Name: svn:executable + * Added: trunk/libs-new/libexpat/expat-2.0.1/amiga/Makefile =================================================================== --- trunk/libs-new/libexpat/expat-2.0.1/amiga/Makefile (rev 0) +++ trunk/libs-new/libexpat/expat-2.0.1/amiga/Makefile 2008-03-30 12:31:51 UTC (rev 300) @@ -0,0 +1,187 @@ +# +# Makefile for AmigaOS +# + +.PHONY: help all staticlib sharedlib check clean install + +vpath %.c ../lib ../examples ../xmlwf ../tests +vpath %.h ../lib ../tests + + +# +# Set these for SDK installation. +# +tooldir = SDK:Local/C +staticlibdir = SDK:Local/clib2/lib +staticincludedir = SDK:Local/clib2/include +sharedlibdir = SDK:Local/Libs +sharedincludedir = SDK:Local/common/include + + +ifeq ($(MAKECMDGOALS), staticlib) + DESTDIR = lib +else + DESTDIR = libs +endif + +STATICLIB = $(DESTDIR)/libexpat.a +SHAREDLIB = $(DESTDIR)/expat.library + +XMLWF = $(DESTDIR)/xmlwf +ELEMENTS = $(DESTDIR)/elements +OUTLINE = $(DESTDIR)/outline +RUNTESTS = $(DESTDIR)/runtests +BENCHMARK = $(DESTDIR)/benchmark + + +help: + @echo "Requires:" + @echo " AmigaOS 4.0" + @echo " SDK 51.22" + @echo " clib2 1.202" + @echo "" + @echo "Targets:" + @echo " all - make expat libraries, xmlwf, examples and run test suite" + @echo " install - install expat libraries and tools into SDK" + +all: + -makedir force lib libs + $(MAKE) staticlib + $(MAKE) sharedlib + +staticlib: $(STATICLIB) $(XMLWF) $(ELEMENTS) $(OUTLINE) $(RUNTESTS) $(BENCHMARK) check + @echo done + +sharedlib: $(SHAREDLIB) $(XMLWF) $(ELEMENTS) $(OUTLINE) $(RUNTESTS) $(BENCHMARK) check + @echo done + +check: + $(RUNTESTS) + +clean: + -delete lib/#?.o quiet + -delete libs/#?.o quiet + +install: + copy libs/xmlwf $(tooldir) quiet + copy /lib/expat.h /lib/expat_external.h $(staticincludedir) quiet + copy lib/libexpat.a $(staticlibdir) quiet + copy libs/expat.library $(sharedlibdir) quiet + copy include $(sharedincludedir) quiet all + + +CC = gcc +LIBTOOL = ar +STRIP = strip + +LDFLAGS = +LIBS = +CFLAGS = -DNDEBUG -O2 +LTFLAGS = -crs +STRIPFLAGS = -R.comment +LAUNCH = + +ifeq ($(MAKECMDGOALS), staticlib) + CFLAGS += -mcrt=clib2 + LDFLAGS += -mcrt=clib2 + LIBS += $(STATICLIB) + INCLUDES = -I../lib +endif + +ifeq ($(MAKECMDGOALS), sharedlib) + CFLAGS += -mcrt=newlib -D__USE_INLINE__ + LDFLAGS += -mcrt=newlib + INCLUDES = -I. -Iinclude -Iinclude/libraries -I../lib + LAUNCH = $(DESTDIR)/launch.o +endif + + +COMPILE = $(CC) $(CFLAGS) $(INCLUDES) -c + +LINK = $(CC) $(LDFLAGS) -o $@ + + +$(STATICLIB): $(DESTDIR)/xmlparse.o $(DESTDIR)/xmltok.o $(DESTDIR)/xmlrole.o + $(LIBTOOL) $(LTFLAGS) $@ $^ + +$(DESTDIR)/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \ + expat_external.h internal.h amigaconfig.h + $(COMPILE) $< -o $@ + +$(DESTDIR)/xmlrole.o: xmlrole.c ascii.h xmlrole.h expat_external.h \ + internal.h amigaconfig.h + $(COMPILE) $< -o $@ + +$(DESTDIR)/xmltok.o: xmltok.c xmltok_impl.c xmltok_ns.c ascii.h asciitab.h \ + iasciitab.h latin1tab.h nametab.h utf8tab.h xmltok.h xmltok_impl.h \ + expat_external.h internal.h amigaconfig.h + $(COMPILE) $< -o $@ + + +$(SHAREDLIB): $(DESTDIR)/expat_lib.o $(DESTDIR)/expat_vectors.o $(DESTDIR)/stdlib.o lib/libexpat.a + $(LINK) -nostartfiles -nostdlib -o $@ $^ + +$(DESTDIR)/expat_lib.o: expat_lib.c + $(COMPILE) $< -o $@ + +$(DESTDIR)/expat_vectors.o: expat_vectors.c + $(COMPILE) $< -o $@ + +$(DESTDIR)/stdlib.o: stdlib.c + $(COMPILE) $< -o $@ + +$(LAUNCH): launch.c + $(COMPILE) $< -o $@ + + +$(XMLWF): $(DESTDIR)/xmlwf.o $(DESTDIR)/xmlfile.o $(DESTDIR)/codepage.o $(DESTDIR)/readfilemap.o $(LAUNCH) + $(LINK) $^ $(LIBS) + $(STRIP) $(STRIPFLAGS) $@ + +$(DESTDIR)/xmlwf.o: xmlwf.c + $(COMPILE) $< -o $@ + +$(DESTDIR)/xmlfile.o: xmlfile.c + $(COMPILE) $< -o $@ + +$(DESTDIR)/codepage.o: codepage.c + $(COMPILE) $< -o $@ + +$(DESTDIR)/readfilemap.o: readfilemap.c + $(COMPILE) $< -o $@ + + +$(ELEMENTS): $(DESTDIR)/elements.o $(LAUNCH) + $(LINK) $^ $(LIBS) + $(STRIP) $(STRIPFLAGS) $@ + +$(DESTDIR)/elements.o: elements.c + $(COMPILE) $< -o $@ + + +$(OUTLINE): $(DESTDIR)/outline.o $(LAUNCH) + $(LINK) $^ $(LIBS) + $(STRIP) $(STRIPFLAGS) $@ + +$(DESTDIR)/outline.o: outline.c + $(COMPILE) $< -o $@ + + +$(RUNTESTS): $(DESTDIR)/runtests.o $(DESTDIR)/chardata.o $(DESTDIR)/minicheck.o $(LAUNCH) + $(LINK) $^ $(LIBS) + +$(DESTDIR)/chardata.o: chardata.c chardata.h + $(COMPILE) $< -o $@ + +$(DESTDIR)/minicheck.o: minicheck.c minicheck.h + $(COMPILE) $< -o $@ + +$(DESTDIR)/runtests.o: runtests.c chardata.h + $(COMPILE) $< -o $@ + + +$(BENCHMARK): $(DESTDIR)/benchmark.o $(LAUNCH) + $(LINK) $^ $(LIBS) -lm + +$(DESTDIR)/benchmark.o: benchmark/benchmark.c + $(COMPILE) $< -o $@ Property changes on: trunk/libs-new/libexpat/expat-2.0.1/amiga/Makefile ___________________________________________________________________ Name: svn:executable + * Added: trunk/libs-new/libexpat/expat-2.0.1/amiga/README.txt =================================================================== --- trunk/libs-new/libexpat/expat-2.0.1/amiga/README.txt (rev 0) +++ trunk/libs-new/libexpat/expat-2.0.1/amiga/README.txt 2008-03-30 12:31:51 UTC (rev 300) @@ -0,0 +1,66 @@ +SUMMARY +======= +This is a port of expat for AmigaOS 4.0 which includes the +SDK, some XML tools and the libraries. + +Both static and shared library versions are supported. + +The static library version is limited to clib2 although it should +be possible to use newlib with the appopriate compile options. + +The shared library version is based on the work of Fredrik Wikstrom +and is currently limited to PPC only. + + +HISTORY +======= +4.2 - updated to correspond to Expat 2.0.1 release + - bumped copyright banners and versions + - simplified amigaconfig.h + - updated include/libraries/expat.h file + - modified launch.c to use contructor/deconstructor + - removed need for amiga_main() from expat utilities + +4.1 - fixed memory freeing bug in shared library version + - now allocates shared memory + +4.0 - updated for corresponding Expat 2.0 release + - some minor CVS related changes + +3.1 - removed obsolete sfd file + - added library description xml file + - refactored Makefile + - removed extraneous VARARGS68K keywords + - reworked default memory handling functions in shared lib + - updated amigaconfig.h + +3.0 - initial release + - based on expat 1.95.8 + + +BUILDING +======== +To build expat.library, xmlwf tool, examples and run the test suite, +simply type 'make all' in the amiga subdirectory. + +The test suite will compile and run for both the static and shared +library versions. + + +INSTALLATION +============ +To install both static and shared versions of expat into the +AmigaOS SDK type 'make install' in the amiga subdirectory. + + +CONFIGURATION +============= +You may want to edit the lib/amigaconfig.h file to remove +DTD and/or XML namespace support if they are not required by your +specific application for a smaller and faster implementation. + + +TO DO +===== +- wide character support (UTF-16) +- provide 68k backwards compatibility Property changes on: trunk/libs-new/libexpat/expat-2.0.1/amiga/README.txt ___________________________________________________________________ Name: svn:executable + * Added: trunk/libs-new/libexpat/expat-2.0.1/amiga/expat.xml =================================================================== --- trunk/libs-new/libexpat/expat-2.0.1/amiga/expat.xml (rev 0) +++ trunk/libs-new/libexpat/expat-2.0.1/amiga/expat.xml 2008-03-30 12:31:51 UTC (rev 300) @@ -0,0 +1,264 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE library SYSTEM "library.dtd"> +<!-- autogenerated by fdtrans v51.16 --> +<library name="expat" basename="ExpatBase" basetype="Library" openname="expat.library"> + <include>libraries/expat.h</include> + <interface name="main" version="1.0" struct="ExpatIFace" prefix="_Expat_" asmprefix="IExpat" global="IExpat"> + <method name="Obtain" result="uint32"/> + <method name="Release" result="uint32"/> + <method name="Expunge" result="void" status="unimplemented"/> + <method name="Clone" result="struct Interface *" status="unimplemented"/> + <method name="XML_ParserCreate" result="XML_Parser"> + <arg name="encodingName" type="const XML_Char *"/> + </method> + <method name="XML_ParserCreateNS" result="XML_Parser"> + <arg name="encodingName" type="const XML_Char *"/> + <arg name="nsSep" type="XML_Char"/> + </method> + <method name="XML_ParserCreate_MM" result="XML_Parser"> + <arg name="encoding" type="const XML_Char *"/> + <arg name="memsuite" type="const XML_Memory_Handling_Suite *"/> + <arg name="namespaceSeparator" type="const XML_Char *"/> + </method> + <method name="XML_ExternalEntityParserCreate" result="XML_Parser"> + <arg name="parser" type="XML_Parser"/> + <arg name="context" type="const XML_Char *"/> + <arg name="encoding" type="const XML_Char *"/> + </method> + <method name="XML_ParserFree" result="void"> + <arg name="parser" type="XML_Parser"/> + </method> + <method name="XML_Parse" result="enum XML_Status"> + <arg name="parser" type="XML_Parser"/> + <arg name="s" type="const char *"/> + <arg name="len" type="int"/> + <arg name="isFinal" type="int"/> + </method> + <method name="XML_ParseBuffer" result="enum XML_Status"> + <arg name="parser" type="XML_Parser"/> + <arg name="len" type="int"/> + <arg name="isFinal" type="int"/> + </method> + <method name="XML_GetBuffer" result="void *"> + <arg name="parser" type="XML_Parser"/> + <arg name="len" type="int"/> + </method> + <method name="XML_SetStartElementHandler" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="start" type="XML_StartElementHandler"/> + </method> + <method name="XML_SetEndElementHandler" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="end" type="XML_EndElementHandler"/> + </method> + <method name="XML_SetElementHandler" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="start" type="XML_StartElementHandler"/> + <arg name="end" type="XML_EndElementHandler"/> + </method> + <method name="XML_SetCharacterDataHandler" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="handler" type="XML_CharacterDataHandler"/> + </method> + <method name="XML_SetProcessingInstructionHandler" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="handler" type="XML_ProcessingInstructionHandler"/> + </method> + <method name="XML_SetCommentHandler" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="handler" type="XML_CommentHandler"/> + </method> + <method name="XML_SetStartCdataSectionHandler" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="start" type="XML_StartCdataSectionHandler"/> + </method> + <method name="XML_SetEndCdataSectionHandler" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="end" type="XML_EndCdataSectionHandler"/> + </method> + <method name="XML_SetCdataSectionHandler" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="start" type="XML_StartCdataSectionHandler"/> + <arg name="end" type="XML_EndCdataSectionHandler"/> + </method> + <method name="XML_SetDefaultHandler" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="handler" type="XML_DefaultHandler"/> + </method> + <method name="XML_SetDefaultHandlerExpand" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="handler" type="XML_DefaultHandler"/> + </method> + <method name="XML_SetExternalEntityRefHandler" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="handler" type="XML_ExternalEntityRefHandler"/> + </method> + <method name="XML_SetExternalEntityRefHandlerArg" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="arg" type="void *"/> + </method> + <method name="XML_SetUnknownEncodingHandler" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="handler" type="XML_UnknownEncodingHandler"/> + <arg name="data" type="void *"/> + </method> + <method name="XML_SetStartNamespaceDeclHandler" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="start" type="XML_StartNamespaceDeclHandler"/> + </method> + <method name="XML_SetEndNamespaceDeclHandler" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="end" type="XML_EndNamespaceDeclHandler"/> + </method> + <method name="XML_SetNamespaceDeclHandler" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="start" type="XML_StartNamespaceDeclHandler"/> + <arg name="end" type="XML_EndNamespaceDeclHandler"/> + </method> + <method name="XML_SetXmlDeclHandler" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="handler" type="XML_XmlDeclHandler"/> + </method> + <method name="XML_SetStartDoctypeDeclHandler" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="start" type="XML_StartDoctypeDeclHandler"/> + </method> + <method name="XML_SetEndDoctypeDeclHandler" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="end" type="XML_EndDoctypeDeclHandler"/> + </method> + <method name="XML_SetDoctypeDeclHandler" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="start" type="XML_StartDoctypeDeclHandler"/> + <arg name="end" type="XML_EndDoctypeDeclHandler"/> + </method> + <method name="XML_SetElementDeclHandler" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="eldecl" type="XML_ElementDeclHandler"/> + </method> + <method name="XML_SetAttlistDeclHandler" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="attdecl" type="XML_AttlistDeclHandler"/> + </method> + <method name="XML_SetEntityDeclHandler" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="handler" type="XML_EntityDeclHandler"/> + </method> + <method name="XML_SetUnparsedEntityDeclHandler" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="handler" type="XML_UnparsedEntityDeclHandler"/> + </method> + <method name="XML_SetNotationDeclHandler" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="handler" type="XML_NotationDeclHandler"/> + </method> + <method name="XML_SetNotStandaloneHandler" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="handler" type="XML_NotStandaloneHandler"/> + </method> + <method name="XML_GetErrorCode" result="enum XML_Error"> + <arg name="parser" type="XML_Parser"/> + </method> + <method name="XML_ErrorString" result="const XML_LChar *"> + <arg name="code" type="enum XML_Error"/> + </method> + <method name="XML_GetCurrentByteIndex" result="long"> + <arg name="parser" type="XML_Parser"/> + </method> + <method name="XML_GetCurrentLineNumber" result="int"> + <arg name="parser" type="XML_Parser"/> + </method> + <method name="XML_GetCurrentColumnNumber" result="int"> + <arg name="parser" type="XML_Parser"/> + </method> + <method name="XML_GetCurrentByteCount" result="int"> + <arg name="parser" type="XML_Parser"/> + </method> + <method name="XML_GetInputContext" result="const char *"> + <arg name="parser" type="XML_Parser"/> + <arg name="offset" type="int *"/> + <arg name="size" type="int *"/> + </method> + <method name="XML_SetUserData" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="userData" type="void *"/> + </method> + <method name="XML_DefaultCurrent" result="void"> + <arg name="parser" type="XML_Parser"/> + </method> + <method name="XML_UseParserAsHandlerArg" result="void"> + <arg name="parser" type="XML_Parser"/> + </method> + <method name="XML_SetBase" result="enum XML_Status"> + <arg name="parser" type="XML_Parser"/> + <arg name="base" type="const XML_Char *"/> + </method> + <method name="XML_GetBase" result="const XML_Char *"> + <arg name="parser" type="XML_Parser"/> + </method> + <method name="XML_GetSpecifiedAttributeCount" result="int"> + <arg name="parser" type="XML_Parser"/> + </method> + <method name="XML_GetIdAttributeIndex" result="int"> + <arg name="parser" type="XML_Parser"/> + </method> + <method name="XML_SetEncoding" result="enum XML_Status"> + <arg name="parser" type="XML_Parser"/> + <arg name="encoding" type="const XML_Char *"/> + </method> + <method name="XML_SetParamEntityParsing" result="int"> + <arg name="parser" type="XML_Parser"/> + <arg name="parsing" type="enum XML_ParamEntityParsing"/> + </method> + <method name="XML_SetReturnNSTriplet" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="do_nst" type="int"/> + </method> + <method name="XML_ExpatVersion" result="const XML_LChar *"> + </method> + <method name="XML_ExpatVersionInfo" result="XML_Expat_Version"> + </method> + <method name="XML_ParserReset" result="XML_Bool"> + <arg name="parser" type="XML_Parser"/> + <arg name="encoding" type="const XML_Char *"/> + </method> + <method name="XML_SetSkippedEntityHandler" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="handler" type="XML_SkippedEntityHandler"/> + </method> + <method name="XML_UseForeignDTD" result="enum XML_Error"> + <arg name="parser" type="XML_Parser"/> + <arg name="useDTD" type="XML_Bool"/> + </method> + <method name="XML_GetFeatureList" result="const XML_Feature *"> + </method> + <method name="XML_StopParser" result="enum XML_Status"> + <arg name="parser" type="XML_Parser"/> + <arg name="resumable" type="XML_Bool"/> + </method> + <method name="XML_ResumeParser" result="enum XML_Status"> + <arg name="parser" type="XML_Parser"/> + </method> + <method name="XML_GetParsingStatus" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="status" type="XML_ParsingStatus *"/> + </method> + <method name="XML_FreeContentModel" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="model" type="XML_Content *"/> + </method> + <method name="XML_MemMalloc" result="void *"> + <arg name="parser" type="XML_Parser"/> + <arg name="size" type="size_t"/> + </method> + <method name="XML_MemRealloc" result="void *"> + <arg name="parser" type="XML_Parser"/> + <arg name="ptr" type="void *"/> + <arg name="size" type="size_t"/> + </method> + <method name="XML_MemFree" result="void"> + <arg name="parser" type="XML_Parser"/> + <arg name="ptr" type="void *"/> + </method> + </interface> +</library> Property changes on: trunk/libs-new/libexpat/expat-2.0.1/amiga/expat.xml ___________________________________________________________________ Name: svn:executable + * Added: trunk/libs-new/libexpat/expat-2.0.1/amiga/expat_lib.c =================================================================== --- trunk/libs-new/libexpat/expat-2.0.1/amiga/expat_lib.c (rev 0) +++ trunk/libs-new/libexpat/expat-2.0.1/amiga/expat_lib.c 2008-03-30 12:31:51 UTC (rev 300) @@ -0,0 +1,233 @@ +/* +** Copyright (c) 2001-2007 Expat maintainers. +** +** Permission is hereby granted, free of charge, to any person obtaining +** a copy of this software and associated documentation files (the +** "Software"), to deal in the Software without restriction, including +** without limitation the rights to use, copy, modify, merge, publish, +** distribute, sublicense, and/or sell copies of the Software, and to +** permit persons to whom the Software is furnished to do so, subject to +** the following conditions: +** +** The above copyright notice and this permission notice shall be included +** in all copies or substantial portions of the Software. +** +** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +** SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ + +#include <dos/dos.h> +#include <proto/exec.h> + +#define LIBNAME "expat.library" +#define LIBPRI 0 +#define VERSION 4 +#define REVISION 2 +#define VSTRING "expat.library 4.2 (2.6.2007)" /* dd.mm.yyyy */ + + +static const char* __attribute__((used)) verstag = "\0$VER: " VSTRING; + + +struct ExpatBase { + struct Library libNode; + uint16 pad; + BPTR SegList; +}; + + +struct ExpatBase * libInit(struct ExpatBase *libBase, BPTR seglist, struct ExecIFace *ISys); +uint32 libObtain (struct LibraryManagerInterface *Self); +uint32 libRelease (struct LibraryManagerInterface *Self); +struct ExpatBase *libOpen (struct LibraryManagerInterface *Self, uint32 version); +BPTR libClose (struct LibraryManagerInterface *Self); +BPTR libExpunge (struct LibraryManagerInterface *Self); + + +static APTR lib_manager_vectors[] = { + libObtain, + libRelease, + NULL, + NULL, + libOpen, + libClose, + libExpunge, + NULL, + (APTR)-1, +}; + + +static struct TagItem lib_managerTags[] = { + { MIT_Name, (uint32)"__library" }, + { MIT_VectorTable, (uint32)lib_manager_vectors }, + { MIT_Version, 1 }, + { TAG_END, 0 } +}; + + +extern void *main_vectors[]; + +static struct TagItem lib_mainTags[] = { + { MIT_Name, (uint32)"main" }, + { MIT_VectorTable, (uint32)main_vectors }, + { MIT_Version, 1 }, + { TAG_END, 0 } +}; + + +static APTR libInterfaces[] = { + lib_managerTags, + lib_mainTags, + NULL +}; + + +static struct TagItem libCreateTags[] = { + { CLT_DataSize, sizeof(struct ExpatBase) }, + { CLT_InitFunc, (uint32)libInit }, + { CLT_Interfaces, (uint32)libInterfaces }, + { TAG_END, 0 } +}; + + +static struct Resident __attribute__((used)) lib_res = { + RTC_MATCHWORD, // rt_MatchWord + &lib_res, // rt_MatchTag + &lib_res+1, // rt_EndSkip + RTF_NATIVE | RTF_AUTOINIT, // rt_Flags + VERSION, // rt_Version + NT_LIBRARY, // rt_Type + LIBPRI, // rt_Pri + LIBNAME, // rt_Name + VSTRING, // rt_IdString + libCreateTags // rt_Init +}; + + +struct Library *DOSLib = 0; +struct Library *UtilityBase = 0; + +struct ExecIFace *IExec = 0; +struct DOSIFace *IDOS = 0; +struct UtilityIFace *IUtility = 0; + + +void _start() +{ +} + + +struct ExpatBase *libInit(struct ExpatBase *libBase, BPTR seglist, struct ExecIFace *ISys) +{ + libBase->libNode.lib_Node.ln_Type = NT_LIBRARY; + libBase->libNode.lib_Node.ln_Pri = LIBPRI; + libBase->libNode.lib_Node.ln_Name = LIBNAME; + libBase->libNode.lib_Flags = LIBF_SUMUSED|LIBF_CHANGED; + libBase->libNode.lib_Version = VERSION; + libBase->libNode.lib_Revision = REVISION; + libBase->libNode.lib_IdString = VSTRING; + libBase->SegList = seglist; + + IExec = ISys; + + DOSLib = OpenLibrary("dos.library", 51); + if ( DOSLib != 0 ) { + IDOS = (struct DOSIFace *)GetInterface(DOSLib, "main", 1, NULL); + if ( IDOS != 0 ) { + UtilityBase = OpenLibrary("utility.library", 5... [truncated message content] |
From: <or...@us...> - 2008-03-27 15:14:26
|
Revision: 299 http://open2x.svn.sourceforge.net/open2x/?rev=299&view=rev Author: orkie Date: 2008-03-27 08:12:39 -0700 (Thu, 27 Mar 2008) Log Message: ----------- Updated several libraries. Modified Paths: -------------- trunk/libs-new/Makefile trunk/libs-new/bzip2/Makefile.mk trunk/libs-new/libiconv/Makefile.mk trunk/libs-new/libpng/Makefile.mk trunk/libs-new/libxml2/Makefile.mk trunk/libs-new/readline/Makefile.mk trunk/libs-new/sdl/sdl/SDL-1.2.11/test/autom4te.cache/requests trunk/libs-new/sdl/sdl_gfx/Makefile.mk trunk/libs-new/tremor/tremor-19102007/Makefile.in trunk/libs-new/tremor/tremor-19102007/aclocal.m4 trunk/libs-new/tremor/tremor-19102007/autom4te.cache/output.0 trunk/libs-new/tremor/tremor-19102007/autom4te.cache/output.1 trunk/libs-new/tremor/tremor-19102007/autom4te.cache/requests trunk/libs-new/tremor/tremor-19102007/autom4te.cache/traces.0 trunk/libs-new/tremor/tremor-19102007/autom4te.cache/traces.1 trunk/libs-new/tremor/tremor-19102007/configure trunk/libs-new/tremor/tremor-19102007/depcomp trunk/libs-new/tremor/tremor-19102007/install-sh trunk/libs-new/tremor/tremor-19102007/missing Added Paths: ----------- trunk/libs-new/bzip2/1.0.5.mk trunk/libs-new/bzip2/bzip2-1.0.5/ trunk/libs-new/bzip2/bzip2-1.0.5/CHANGES trunk/libs-new/bzip2/bzip2-1.0.5/LICENSE trunk/libs-new/bzip2/bzip2-1.0.5/Makefile trunk/libs-new/bzip2/bzip2-1.0.5/Makefile-libbz2_so trunk/libs-new/bzip2/bzip2-1.0.5/README trunk/libs-new/bzip2/bzip2-1.0.5/README.COMPILATION.PROBLEMS trunk/libs-new/bzip2/bzip2-1.0.5/README.XML.STUFF trunk/libs-new/bzip2/bzip2-1.0.5/blocksort.c trunk/libs-new/bzip2/bzip2-1.0.5/bz-common.xsl trunk/libs-new/bzip2/bzip2-1.0.5/bz-fo.xsl trunk/libs-new/bzip2/bzip2-1.0.5/bz-html.xsl trunk/libs-new/bzip2/bzip2-1.0.5/bzdiff trunk/libs-new/bzip2/bzip2-1.0.5/bzdiff.1 trunk/libs-new/bzip2/bzip2-1.0.5/bzgrep trunk/libs-new/bzip2/bzip2-1.0.5/bzgrep.1 trunk/libs-new/bzip2/bzip2-1.0.5/bzip.css trunk/libs-new/bzip2/bzip2-1.0.5/bzip2.1 trunk/libs-new/bzip2/bzip2-1.0.5/bzip2.1.preformatted trunk/libs-new/bzip2/bzip2-1.0.5/bzip2.c trunk/libs-new/bzip2/bzip2-1.0.5/bzip2.txt trunk/libs-new/bzip2/bzip2-1.0.5/bzip2recover.c trunk/libs-new/bzip2/bzip2-1.0.5/bzlib.c trunk/libs-new/bzip2/bzip2-1.0.5/bzlib.h trunk/libs-new/bzip2/bzip2-1.0.5/bzlib_private.h trunk/libs-new/bzip2/bzip2-1.0.5/bzmore trunk/libs-new/bzip2/bzip2-1.0.5/bzmore.1 trunk/libs-new/bzip2/bzip2-1.0.5/compress.c trunk/libs-new/bzip2/bzip2-1.0.5/crctable.c trunk/libs-new/bzip2/bzip2-1.0.5/decompress.c trunk/libs-new/bzip2/bzip2-1.0.5/dlltest.c trunk/libs-new/bzip2/bzip2-1.0.5/dlltest.dsp trunk/libs-new/bzip2/bzip2-1.0.5/entities.xml trunk/libs-new/bzip2/bzip2-1.0.5/format.pl trunk/libs-new/bzip2/bzip2-1.0.5/huffman.c trunk/libs-new/bzip2/bzip2-1.0.5/libbz2.def trunk/libs-new/bzip2/bzip2-1.0.5/libbz2.dsp trunk/libs-new/bzip2/bzip2-1.0.5/makefile.msc trunk/libs-new/bzip2/bzip2-1.0.5/manual.xml trunk/libs-new/bzip2/bzip2-1.0.5/mk251.c trunk/libs-new/bzip2/bzip2-1.0.5/randtable.c trunk/libs-new/bzip2/bzip2-1.0.5/sample1.bz2 trunk/libs-new/bzip2/bzip2-1.0.5/sample1.ref trunk/libs-new/bzip2/bzip2-1.0.5/sample2.bz2 trunk/libs-new/bzip2/bzip2-1.0.5/sample2.ref trunk/libs-new/bzip2/bzip2-1.0.5/sample3.bz2 trunk/libs-new/bzip2/bzip2-1.0.5/sample3.ref trunk/libs-new/bzip2/bzip2-1.0.5/spewG.c trunk/libs-new/bzip2/bzip2-1.0.5/unzcrash.c trunk/libs-new/bzip2/bzip2-1.0.5/words0 trunk/libs-new/bzip2/bzip2-1.0.5/words1 trunk/libs-new/bzip2/bzip2-1.0.5/words2 trunk/libs-new/bzip2/bzip2-1.0.5/words3 trunk/libs-new/bzip2/bzip2-1.0.5/xmlproc.sh trunk/libs-new/libiconv/1.12.mk trunk/libs-new/libiconv/libiconv-1.12/ trunk/libs-new/libiconv/libiconv-1.12/ABOUT-NLS trunk/libs-new/libiconv/libiconv-1.12/AUTHORS trunk/libs-new/libiconv/libiconv-1.12/COPYING trunk/libs-new/libiconv/libiconv-1.12/COPYING.LIB trunk/libs-new/libiconv/libiconv-1.12/ChangeLog trunk/libs-new/libiconv/libiconv-1.12/DEPENDENCIES trunk/libs-new/libiconv/libiconv-1.12/DESIGN trunk/libs-new/libiconv/libiconv-1.12/HACKING trunk/libs-new/libiconv/libiconv-1.12/INSTALL.generic trunk/libs-new/libiconv/libiconv-1.12/Makefile.devel trunk/libs-new/libiconv/libiconv-1.12/Makefile.in trunk/libs-new/libiconv/libiconv-1.12/NEWS trunk/libs-new/libiconv/libiconv-1.12/NOTES trunk/libs-new/libiconv/libiconv-1.12/PORTS trunk/libs-new/libiconv/libiconv-1.12/README trunk/libs-new/libiconv/libiconv-1.12/README.djgpp trunk/libs-new/libiconv/libiconv-1.12/README.woe32 trunk/libs-new/libiconv/libiconv-1.12/THANKS trunk/libs-new/libiconv/libiconv-1.12/aclocal.m4 trunk/libs-new/libiconv/libiconv-1.12/autogen.sh trunk/libs-new/libiconv/libiconv-1.12/build-aux/ trunk/libs-new/libiconv/libiconv-1.12/build-aux/config.guess trunk/libs-new/libiconv/libiconv-1.12/build-aux/config.libpath trunk/libs-new/libiconv/libiconv-1.12/build-aux/config.rpath trunk/libs-new/libiconv/libiconv-1.12/build-aux/config.sub trunk/libs-new/libiconv/libiconv-1.12/build-aux/install-reloc trunk/libs-new/libiconv/libiconv-1.12/build-aux/install-sh trunk/libs-new/libiconv/libiconv-1.12/build-aux/link-warning.h trunk/libs-new/libiconv/libiconv-1.12/build-aux/ltmain.sh trunk/libs-new/libiconv/libiconv-1.12/build-aux/missing trunk/libs-new/libiconv/libiconv-1.12/build-aux/mkinstalldirs trunk/libs-new/libiconv/libiconv-1.12/build-aux/reloc-ldflags trunk/libs-new/libiconv/libiconv-1.12/config.h.in trunk/libs-new/libiconv/libiconv-1.12/configure trunk/libs-new/libiconv/libiconv-1.12/configure.ac trunk/libs-new/libiconv/libiconv-1.12/djgpp/ trunk/libs-new/libiconv/libiconv-1.12/djgpp/Makefile.maint trunk/libs-new/libiconv/libiconv-1.12/djgpp/README trunk/libs-new/libiconv/libiconv-1.12/djgpp/README.in trunk/libs-new/libiconv/libiconv-1.12/djgpp/config.bat trunk/libs-new/libiconv/libiconv-1.12/djgpp/config.sed trunk/libs-new/libiconv/libiconv-1.12/djgpp/config.site trunk/libs-new/libiconv/libiconv-1.12/djgpp/edtest.bat trunk/libs-new/libiconv/libiconv-1.12/djgpp/fnchange.in trunk/libs-new/libiconv/libiconv-1.12/djgpp/fnchange.lst trunk/libs-new/libiconv/libiconv-1.12/djgpp/makefile.sed trunk/libs-new/libiconv/libiconv-1.12/djgpp/sources.sed trunk/libs-new/libiconv/libiconv-1.12/djgpp/stateful-check.sed trunk/libs-new/libiconv/libiconv-1.12/djgpp/stateless-check.sed trunk/libs-new/libiconv/libiconv-1.12/djgpp/translit-check.sed trunk/libs-new/libiconv/libiconv-1.12/doc/ trunk/libs-new/libiconv/libiconv-1.12/doc/relocatable.texi trunk/libs-new/libiconv/libiconv-1.12/extras/ trunk/libs-new/libiconv/libiconv-1.12/extras/ChangeLog trunk/libs-new/libiconv/libiconv-1.12/extras/iconv_string.c trunk/libs-new/libiconv/libiconv-1.12/extras/iconv_string.h trunk/libs-new/libiconv/libiconv-1.12/gnulib-local/ trunk/libs-new/libiconv/libiconv-1.12/gnulib-local/lib/ trunk/libs-new/libiconv/libiconv-1.12/gnulib-local/lib/alloca.in.h trunk/libs-new/libiconv/libiconv-1.12/gnulib-local/lib/error.h.diff trunk/libs-new/libiconv/libiconv-1.12/gnulib-local/lib/progname.h.diff trunk/libs-new/libiconv/libiconv-1.12/gnulib-local/lib/xalloc.h trunk/libs-new/libiconv/libiconv-1.12/gnulib-local/lib/xmalloc.c trunk/libs-new/libiconv/libiconv-1.12/gnulib-local/lib/xstrdup.c trunk/libs-new/libiconv/libiconv-1.12/gnulib-local/m4/ trunk/libs-new/libiconv/libiconv-1.12/gnulib-local/m4/alloca.m4 trunk/libs-new/libiconv/libiconv-1.12/gnulib-local/modules/ trunk/libs-new/libiconv/libiconv-1.12/gnulib-local/modules/libiconv-misc trunk/libs-new/libiconv/libiconv-1.12/gnulib-local/modules/mbstate trunk/libs-new/libiconv/libiconv-1.12/gnulib-local/modules/xalloc trunk/libs-new/libiconv/libiconv-1.12/include/ trunk/libs-new/libiconv/libiconv-1.12/include/export.h trunk/libs-new/libiconv/libiconv-1.12/include/iconv.h.build.in trunk/libs-new/libiconv/libiconv-1.12/include/iconv.h.in trunk/libs-new/libiconv/libiconv-1.12/lib/ trunk/libs-new/libiconv/libiconv-1.12/lib/Makefile.in trunk/libs-new/libiconv/libiconv-1.12/lib/aliases.gperf trunk/libs-new/libiconv/libiconv-1.12/lib/aliases.h trunk/libs-new/libiconv/libiconv-1.12/lib/aliases2.h trunk/libs-new/libiconv/libiconv-1.12/lib/aliases_aix.h trunk/libs-new/libiconv/libiconv-1.12/lib/aliases_dos.h trunk/libs-new/libiconv/libiconv-1.12/lib/aliases_extra.h trunk/libs-new/libiconv/libiconv-1.12/lib/aliases_osf1.h trunk/libs-new/libiconv/libiconv-1.12/lib/armscii_8.h trunk/libs-new/libiconv/libiconv-1.12/lib/ascii.h trunk/libs-new/libiconv/libiconv-1.12/lib/atarist.h trunk/libs-new/libiconv/libiconv-1.12/lib/big5.h trunk/libs-new/libiconv/libiconv-1.12/lib/big5_2003.h trunk/libs-new/libiconv/libiconv-1.12/lib/big5hkscs1999.h trunk/libs-new/libiconv/libiconv-1.12/lib/big5hkscs2001.h trunk/libs-new/libiconv/libiconv-1.12/lib/big5hkscs2004.h trunk/libs-new/libiconv/libiconv-1.12/lib/c99.h trunk/libs-new/libiconv/libiconv-1.12/lib/canonical.h trunk/libs-new/libiconv/libiconv-1.12/lib/canonical_aix.h trunk/libs-new/libiconv/libiconv-1.12/lib/canonical_dos.h trunk/libs-new/libiconv/libiconv-1.12/lib/canonical_extra.h trunk/libs-new/libiconv/libiconv-1.12/lib/canonical_local.h trunk/libs-new/libiconv/libiconv-1.12/lib/canonical_osf1.h trunk/libs-new/libiconv/libiconv-1.12/lib/ces_big5.h trunk/libs-new/libiconv/libiconv-1.12/lib/ces_gbk.h trunk/libs-new/libiconv/libiconv-1.12/lib/cjk_variants.h trunk/libs-new/libiconv/libiconv-1.12/lib/cns11643.h trunk/libs-new/libiconv/libiconv-1.12/lib/cns11643_1.h trunk/libs-new/libiconv/libiconv-1.12/lib/cns11643_15.h trunk/libs-new/libiconv/libiconv-1.12/lib/cns11643_2.h trunk/libs-new/libiconv/libiconv-1.12/lib/cns11643_3.h trunk/libs-new/libiconv/libiconv-1.12/lib/cns11643_4.h trunk/libs-new/libiconv/libiconv-1.12/lib/cns11643_4a.h trunk/libs-new/libiconv/libiconv-1.12/lib/cns11643_4b.h trunk/libs-new/libiconv/libiconv-1.12/lib/cns11643_5.h trunk/libs-new/libiconv/libiconv-1.12/lib/cns11643_6.h trunk/libs-new/libiconv/libiconv-1.12/lib/cns11643_7.h trunk/libs-new/libiconv/libiconv-1.12/lib/cns11643_inv.h trunk/libs-new/libiconv/libiconv-1.12/lib/config.h.in trunk/libs-new/libiconv/libiconv-1.12/lib/converters.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp1046.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp1124.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp1125.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp1129.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp1133.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp1161.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp1162.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp1163.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp1250.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp1251.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp1252.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp1253.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp1254.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp1255.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp1256.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp1257.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp1258.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp437.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp737.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp775.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp850.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp852.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp853.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp855.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp856.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp857.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp858.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp860.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp861.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp862.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp863.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp864.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp865.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp866.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp869.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp874.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp922.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp932.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp932ext.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp936.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp936ext.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp943.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp949.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp950.h trunk/libs-new/libiconv/libiconv-1.12/lib/cp950ext.h trunk/libs-new/libiconv/libiconv-1.12/lib/dec_hanyu.h trunk/libs-new/libiconv/libiconv-1.12/lib/dec_kanji.h trunk/libs-new/libiconv/libiconv-1.12/lib/encodings.def trunk/libs-new/libiconv/libiconv-1.12/lib/encodings_aix.def trunk/libs-new/libiconv/libiconv-1.12/lib/encodings_dos.def trunk/libs-new/libiconv/libiconv-1.12/lib/encodings_extra.def trunk/libs-new/libiconv/libiconv-1.12/lib/encodings_local.def trunk/libs-new/libiconv/libiconv-1.12/lib/encodings_osf1.def trunk/libs-new/libiconv/libiconv-1.12/lib/euc_cn.h trunk/libs-new/libiconv/libiconv-1.12/lib/euc_jisx0213.h trunk/libs-new/libiconv/libiconv-1.12/lib/euc_jp.h trunk/libs-new/libiconv/libiconv-1.12/lib/euc_kr.h trunk/libs-new/libiconv/libiconv-1.12/lib/euc_tw.h trunk/libs-new/libiconv/libiconv-1.12/lib/flags.h trunk/libs-new/libiconv/libiconv-1.12/lib/flushwc.h trunk/libs-new/libiconv/libiconv-1.12/lib/gb12345.h trunk/libs-new/libiconv/libiconv-1.12/lib/gb12345ext.h trunk/libs-new/libiconv/libiconv-1.12/lib/gb18030.h trunk/libs-new/libiconv/libiconv-1.12/lib/gb18030ext.h trunk/libs-new/libiconv/libiconv-1.12/lib/gb18030uni.h trunk/libs-new/libiconv/libiconv-1.12/lib/gb2312.h trunk/libs-new/libiconv/libiconv-1.12/lib/gbk.h trunk/libs-new/libiconv/libiconv-1.12/lib/gbkext1.h trunk/libs-new/libiconv/libiconv-1.12/lib/gbkext2.h trunk/libs-new/libiconv/libiconv-1.12/lib/gbkext_inv.h trunk/libs-new/libiconv/libiconv-1.12/lib/genaliases.c trunk/libs-new/libiconv/libiconv-1.12/lib/genaliases2.c trunk/libs-new/libiconv/libiconv-1.12/lib/genflags.c trunk/libs-new/libiconv/libiconv-1.12/lib/gentranslit.c trunk/libs-new/libiconv/libiconv-1.12/lib/georgian_academy.h trunk/libs-new/libiconv/libiconv-1.12/lib/georgian_ps.h trunk/libs-new/libiconv/libiconv-1.12/lib/hkscs1999.h trunk/libs-new/libiconv/libiconv-1.12/lib/hkscs2001.h trunk/libs-new/libiconv/libiconv-1.12/lib/hkscs2004.h trunk/libs-new/libiconv/libiconv-1.12/lib/hp_roman8.h trunk/libs-new/libiconv/libiconv-1.12/lib/hz.h trunk/libs-new/libiconv/libiconv-1.12/lib/iconv.c trunk/libs-new/libiconv/libiconv-1.12/lib/iso2022_cn.h trunk/libs-new/libiconv/libiconv-1.12/lib/iso2022_cnext.h trunk/libs-new/libiconv/libiconv-1.12/lib/iso2022_jp.h trunk/libs-new/libiconv/libiconv-1.12/lib/iso2022_jp1.h trunk/libs-new/libiconv/libiconv-1.12/lib/iso2022_jp2.h trunk/libs-new/libiconv/libiconv-1.12/lib/iso2022_jp3.h trunk/libs-new/libiconv/libiconv-1.12/lib/iso2022_kr.h trunk/libs-new/libiconv/libiconv-1.12/lib/iso646_cn.h trunk/libs-new/libiconv/libiconv-1.12/lib/iso646_jp.h trunk/libs-new/libiconv/libiconv-1.12/lib/iso8859_1.h trunk/libs-new/libiconv/libiconv-1.12/lib/iso8859_10.h trunk/libs-new/libiconv/libiconv-1.12/lib/iso8859_11.h trunk/libs-new/libiconv/libiconv-1.12/lib/iso8859_13.h trunk/libs-new/libiconv/libiconv-1.12/lib/iso8859_14.h trunk/libs-new/libiconv/libiconv-1.12/lib/iso8859_15.h trunk/libs-new/libiconv/libiconv-1.12/lib/iso8859_16.h trunk/libs-new/libiconv/libiconv-1.12/lib/iso8859_2.h trunk/libs-new/libiconv/libiconv-1.12/lib/iso8859_3.h trunk/libs-new/libiconv/libiconv-1.12/lib/iso8859_4.h trunk/libs-new/libiconv/libiconv-1.12/lib/iso8859_5.h trunk/libs-new/libiconv/libiconv-1.12/lib/iso8859_6.h trunk/libs-new/libiconv/libiconv-1.12/lib/iso8859_7.h trunk/libs-new/libiconv/libiconv-1.12/lib/iso8859_8.h trunk/libs-new/libiconv/libiconv-1.12/lib/iso8859_9.h trunk/libs-new/libiconv/libiconv-1.12/lib/isoir165.h trunk/libs-new/libiconv/libiconv-1.12/lib/isoir165ext.h trunk/libs-new/libiconv/libiconv-1.12/lib/java.h trunk/libs-new/libiconv/libiconv-1.12/lib/jisx0201.h trunk/libs-new/libiconv/libiconv-1.12/lib/jisx0208.h trunk/libs-new/libiconv/libiconv-1.12/lib/jisx0212.h trunk/libs-new/libiconv/libiconv-1.12/lib/jisx0213.h trunk/libs-new/libiconv/libiconv-1.12/lib/johab.h trunk/libs-new/libiconv/libiconv-1.12/lib/johab_hangul.h trunk/libs-new/libiconv/libiconv-1.12/lib/koi8_r.h trunk/libs-new/libiconv/libiconv-1.12/lib/koi8_ru.h trunk/libs-new/libiconv/libiconv-1.12/lib/koi8_t.h trunk/libs-new/libiconv/libiconv-1.12/lib/koi8_u.h trunk/libs-new/libiconv/libiconv-1.12/lib/ksc5601.h trunk/libs-new/libiconv/libiconv-1.12/lib/loop_unicode.h trunk/libs-new/libiconv/libiconv-1.12/lib/loop_wchar.h trunk/libs-new/libiconv/libiconv-1.12/lib/loops.h trunk/libs-new/libiconv/libiconv-1.12/lib/mac_arabic.h trunk/libs-new/libiconv/libiconv-1.12/lib/mac_centraleurope.h trunk/libs-new/libiconv/libiconv-1.12/lib/mac_croatian.h trunk/libs-new/libiconv/libiconv-1.12/lib/mac_cyrillic.h trunk/libs-new/libiconv/libiconv-1.12/lib/mac_greek.h trunk/libs-new/libiconv/libiconv-1.12/lib/mac_hebrew.h trunk/libs-new/libiconv/libiconv-1.12/lib/mac_iceland.h trunk/libs-new/libiconv/libiconv-1.12/lib/mac_roman.h trunk/libs-new/libiconv/libiconv-1.12/lib/mac_romania.h trunk/libs-new/libiconv/libiconv-1.12/lib/mac_thai.h trunk/libs-new/libiconv/libiconv-1.12/lib/mac_turkish.h trunk/libs-new/libiconv/libiconv-1.12/lib/mac_ukraine.h trunk/libs-new/libiconv/libiconv-1.12/lib/mulelao.h trunk/libs-new/libiconv/libiconv-1.12/lib/nextstep.h trunk/libs-new/libiconv/libiconv-1.12/lib/pt154.h trunk/libs-new/libiconv/libiconv-1.12/lib/relocatable.c trunk/libs-new/libiconv/libiconv-1.12/lib/relocatable.h trunk/libs-new/libiconv/libiconv-1.12/lib/riscos1.h trunk/libs-new/libiconv/libiconv-1.12/lib/rk1048.h trunk/libs-new/libiconv/libiconv-1.12/lib/shift_jisx0213.h trunk/libs-new/libiconv/libiconv-1.12/lib/sjis.h trunk/libs-new/libiconv/libiconv-1.12/lib/tcvn.h trunk/libs-new/libiconv/libiconv-1.12/lib/tds565.h trunk/libs-new/libiconv/libiconv-1.12/lib/tis620.h trunk/libs-new/libiconv/libiconv-1.12/lib/translit.def trunk/libs-new/libiconv/libiconv-1.12/lib/translit.h trunk/libs-new/libiconv/libiconv-1.12/lib/ucs2.h trunk/libs-new/libiconv/libiconv-1.12/lib/ucs2be.h trunk/libs-new/libiconv/libiconv-1.12/lib/ucs2internal.h trunk/libs-new/libiconv/libiconv-1.12/lib/ucs2le.h trunk/libs-new/libiconv/libiconv-1.12/lib/ucs2swapped.h trunk/libs-new/libiconv/libiconv-1.12/lib/ucs4.h trunk/libs-new/libiconv/libiconv-1.12/lib/ucs4be.h trunk/libs-new/libiconv/libiconv-1.12/lib/ucs4internal.h trunk/libs-new/libiconv/libiconv-1.12/lib/ucs4le.h trunk/libs-new/libiconv/libiconv-1.12/lib/ucs4swapped.h trunk/libs-new/libiconv/libiconv-1.12/lib/uhc_1.h trunk/libs-new/libiconv/libiconv-1.12/lib/uhc_2.h trunk/libs-new/libiconv/libiconv-1.12/lib/utf16.h trunk/libs-new/libiconv/libiconv-1.12/lib/utf16be.h trunk/libs-new/libiconv/libiconv-1.12/lib/utf16le.h trunk/libs-new/libiconv/libiconv-1.12/lib/utf32.h trunk/libs-new/libiconv/libiconv-1.12/lib/utf32be.h trunk/libs-new/libiconv/libiconv-1.12/lib/utf32le.h trunk/libs-new/libiconv/libiconv-1.12/lib/utf7.h trunk/libs-new/libiconv/libiconv-1.12/lib/utf8.h trunk/libs-new/libiconv/libiconv-1.12/lib/vietcomb.h trunk/libs-new/libiconv/libiconv-1.12/lib/viscii.h trunk/libs-new/libiconv/libiconv-1.12/libcharset/ trunk/libs-new/libiconv/libiconv-1.12/libcharset/AUTHORS trunk/libs-new/libiconv/libiconv-1.12/libcharset/COPYING.LIB trunk/libs-new/libiconv/libiconv-1.12/libcharset/ChangeLog trunk/libs-new/libiconv/libiconv-1.12/libcharset/DEPENDENCIES trunk/libs-new/libiconv/libiconv-1.12/libcharset/HACKING trunk/libs-new/libiconv/libiconv-1.12/libcharset/INSTALL.generic trunk/libs-new/libiconv/libiconv-1.12/libcharset/INTEGRATE trunk/libs-new/libiconv/libiconv-1.12/libcharset/Makefile.devel trunk/libs-new/libiconv/libiconv-1.12/libcharset/Makefile.in trunk/libs-new/libiconv/libiconv-1.12/libcharset/NEWS trunk/libs-new/libiconv/libiconv-1.12/libcharset/README trunk/libs-new/libiconv/libiconv-1.12/libcharset/README.djgpp trunk/libs-new/libiconv/libiconv-1.12/libcharset/README.woe32 trunk/libs-new/libiconv/libiconv-1.12/libcharset/autoconf/ trunk/libs-new/libiconv/libiconv-1.12/libcharset/autoconf/aclocal.m4 trunk/libs-new/libiconv/libiconv-1.12/libcharset/autogen.sh trunk/libs-new/libiconv/libiconv-1.12/libcharset/build-aux/ trunk/libs-new/libiconv/libiconv-1.12/libcharset/build-aux/config.guess trunk/libs-new/libiconv/libiconv-1.12/libcharset/build-aux/config.libpath trunk/libs-new/libiconv/libiconv-1.12/libcharset/build-aux/config.sub trunk/libs-new/libiconv/libiconv-1.12/libcharset/build-aux/install-sh trunk/libs-new/libiconv/libiconv-1.12/libcharset/build-aux/ltmain.sh trunk/libs-new/libiconv/libiconv-1.12/libcharset/build-aux/mkinstalldirs trunk/libs-new/libiconv/libiconv-1.12/libcharset/config.h.in trunk/libs-new/libiconv/libiconv-1.12/libcharset/configure trunk/libs-new/libiconv/libiconv-1.12/libcharset/configure.ac trunk/libs-new/libiconv/libiconv-1.12/libcharset/djgpp/ trunk/libs-new/libiconv/libiconv-1.12/libcharset/djgpp/Makefile.maint trunk/libs-new/libiconv/libiconv-1.12/libcharset/djgpp/README trunk/libs-new/libiconv/libiconv-1.12/libcharset/djgpp/README.in trunk/libs-new/libiconv/libiconv-1.12/libcharset/djgpp/config.bat trunk/libs-new/libiconv/libiconv-1.12/libcharset/djgpp/config.sed trunk/libs-new/libiconv/libiconv-1.12/libcharset/djgpp/config.site trunk/libs-new/libiconv/libiconv-1.12/libcharset/djgpp/fnchange.in trunk/libs-new/libiconv/libiconv-1.12/libcharset/djgpp/fnchange.lst trunk/libs-new/libiconv/libiconv-1.12/libcharset/include/ trunk/libs-new/libiconv/libiconv-1.12/libcharset/include/export.h trunk/libs-new/libiconv/libiconv-1.12/libcharset/include/libcharset.h.in trunk/libs-new/libiconv/libiconv-1.12/libcharset/include/localcharset.h.build.in trunk/libs-new/libiconv/libiconv-1.12/libcharset/include/localcharset.h.in trunk/libs-new/libiconv/libiconv-1.12/libcharset/lib/ trunk/libs-new/libiconv/libiconv-1.12/libcharset/lib/ChangeLog trunk/libs-new/libiconv/libiconv-1.12/libcharset/lib/Makefile.in trunk/libs-new/libiconv/libiconv-1.12/libcharset/lib/config.charset trunk/libs-new/libiconv/libiconv-1.12/libcharset/lib/localcharset.c trunk/libs-new/libiconv/libiconv-1.12/libcharset/lib/ref-add.sin trunk/libs-new/libiconv/libiconv-1.12/libcharset/lib/ref-del.sin trunk/libs-new/libiconv/libiconv-1.12/libcharset/lib/relocatable.c trunk/libs-new/libiconv/libiconv-1.12/libcharset/lib/relocatable.h trunk/libs-new/libiconv/libiconv-1.12/libcharset/m4/ trunk/libs-new/libiconv/libiconv-1.12/libcharset/m4/codeset.m4 trunk/libs-new/libiconv/libiconv-1.12/libcharset/m4/glibc21.m4 trunk/libs-new/libiconv/libiconv-1.12/libcharset/m4/libtool.m4 trunk/libs-new/libiconv/libiconv-1.12/libcharset/m4/relocatable-lib.m4 trunk/libs-new/libiconv/libiconv-1.12/libcharset/m4/visibility.m4 trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/ trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/README trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/aix-3.2.5 trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/aix-4.1.5 trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/aix-4.2.0 trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/aix-4.3.2 trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/all-charsets trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/all-charsets-X11 trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/all-locales trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/beos-5 trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/darwin-6.8 trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/darwin-7.5 trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/freebsd-3.3 trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/glibc-2.1.3 trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/glibc-2.1.90 trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/glibc-2.2 trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/glibc-2.2-XF86-3.3.6 trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/glibc-2.2-XF86-4.0.1f trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/hpux-10.01 trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/hpux-10.20 trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/hpux-11.00 trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/irix-6.5 trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/locale_charmap trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/locale_charset.c trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/locale_codeset.c trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/locale_x11encoding.c trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/netbsd-3.0 trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/osf1-4.0a trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/osf1-4.0d trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/osf1-5.1 trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/solaris-2.4 trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/solaris-2.5.1 trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/solaris-2.6 trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/solaris-2.6-cjk trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/solaris-2.7 trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/sunos-4.1.4 trunk/libs-new/libiconv/libiconv-1.12/libcharset/tools/win32 trunk/libs-new/libiconv/libiconv-1.12/m4/ trunk/libs-new/libiconv/libiconv-1.12/m4/cp.m4 trunk/libs-new/libiconv/libiconv-1.12/m4/eilseq.m4 trunk/libs-new/libiconv/libiconv-1.12/m4/endian.m4 trunk/libs-new/libiconv/libiconv-1.12/m4/general.m4 trunk/libs-new/libiconv/libiconv-1.12/m4/libtool.m4 trunk/libs-new/libiconv/libiconv-1.12/m4/ln.m4 trunk/libs-new/libiconv/libiconv-1.12/m4/proto.m4 trunk/libs-new/libiconv/libiconv-1.12/man/ trunk/libs-new/libiconv/libiconv-1.12/man/Makefile.in trunk/libs-new/libiconv/libiconv-1.12/man/iconv.1 trunk/libs-new/libiconv/libiconv-1.12/man/iconv.1.html trunk/libs-new/libiconv/libiconv-1.12/man/iconv.3 trunk/libs-new/libiconv/libiconv-1.12/man/iconv.3.html trunk/libs-new/libiconv/libiconv-1.12/man/iconv_close.3 trunk/libs-new/libiconv/libiconv-1.12/man/iconv_close.3.html trunk/libs-new/libiconv/libiconv-1.12/man/iconv_open.3 trunk/libs-new/libiconv/libiconv-1.12/man/iconv_open.3.html trunk/libs-new/libiconv/libiconv-1.12/man/iconvctl.3 trunk/libs-new/libiconv/libiconv-1.12/man/iconvctl.3.html trunk/libs-new/libiconv/libiconv-1.12/os2/ trunk/libs-new/libiconv/libiconv-1.12/os2/iconv.def trunk/libs-new/libiconv/libiconv-1.12/po/ trunk/libs-new/libiconv/libiconv-1.12/po/ChangeLog trunk/libs-new/libiconv/libiconv-1.12/po/LINGUAS trunk/libs-new/libiconv/libiconv-1.12/po/Makefile.in.in trunk/libs-new/libiconv/libiconv-1.12/po/Makevars trunk/libs-new/libiconv/libiconv-1.12/po/POTFILES.in trunk/libs-new/libiconv/libiconv-1.12/po/Rules-quot trunk/libs-new/libiconv/libiconv-1.12/po/af.gmo trunk/libs-new/libiconv/libiconv-1.12/po/af.po trunk/libs-new/libiconv/libiconv-1.12/po/boldquot.sed trunk/libs-new/libiconv/libiconv-1.12/po/ca.gmo trunk/libs-new/libiconv/libiconv-1.12/po/ca.po trunk/libs-new/libiconv/libiconv-1.12/po/da.gmo trunk/libs-new/libiconv/libiconv-1.12/po/da.po trunk/libs-new/libiconv/libiconv-1.12/po/de.gmo trunk/libs-new/libiconv/libiconv-1.12/po/de.po trunk/libs-new/libiconv/libiconv-1.12/po/el.gmo trunk/libs-new/libiconv/libiconv-1.12/po/el.po trunk/libs-new/libiconv/libiconv-1.12/po/en@boldquot.header trunk/libs-new/libiconv/libiconv-1.12/po/en@quot.header trunk/libs-new/libiconv/libiconv-1.12/po/eo.gmo trunk/libs-new/libiconv/libiconv-1.12/po/eo.po trunk/libs-new/libiconv/libiconv-1.12/po/es.gmo trunk/libs-new/libiconv/libiconv-1.12/po/es.po trunk/libs-new/libiconv/libiconv-1.12/po/et.gmo trunk/libs-new/libiconv/libiconv-1.12/po/et.po trunk/libs-new/libiconv/libiconv-1.12/po/fi.gmo trunk/libs-new/libiconv/libiconv-1.12/po/fi.po trunk/libs-new/libiconv/libiconv-1.12/po/fr.gmo trunk/libs-new/libiconv/libiconv-1.12/po/fr.po trunk/libs-new/libiconv/libiconv-1.12/po/ga.gmo trunk/libs-new/libiconv/libiconv-1.12/po/ga.po trunk/libs-new/libiconv/libiconv-1.12/po/gl.gmo trunk/libs-new/libiconv/libiconv-1.12/po/gl.po trunk/libs-new/libiconv/libiconv-1.12/po/hr.gmo trunk/libs-new/libiconv/libiconv-1.12/po/hr.po trunk/libs-new/libiconv/libiconv-1.12/po/hu.gmo trunk/libs-new/libiconv/libiconv-1.12/po/hu.po trunk/libs-new/libiconv/libiconv-1.12/po/id.gmo trunk/libs-new/libiconv/libiconv-1.12/po/id.po trunk/libs-new/libiconv/libiconv-1.12/po/insert-header.sin trunk/libs-new/libiconv/libiconv-1.12/po/it.gmo trunk/libs-new/libiconv/libiconv-1.12/po/it.po trunk/libs-new/libiconv/libiconv-1.12/po/libiconv.pot trunk/libs-new/libiconv/libiconv-1.12/po/nl.gmo trunk/libs-new/libiconv/libiconv-1.12/po/nl.po trunk/libs-new/libiconv/libiconv-1.12/po/pl.gmo trunk/libs-new/libiconv/libiconv-1.12/po/pl.po trunk/libs-new/libiconv/libiconv-1.12/po/pt_BR.gmo trunk/libs-new/libiconv/libiconv-1.12/po/pt_BR.po trunk/libs-new/libiconv/libiconv-1.12/po/quot.sed trunk/libs-new/libiconv/libiconv-1.12/po/remove-potcdate.sin trunk/libs-new/libiconv/libiconv-1.12/po/rm.gmo trunk/libs-new/libiconv/libiconv-1.12/po/rm.po trunk/libs-new/libiconv/libiconv-1.12/po/ro.gmo trunk/libs-new/libiconv/libiconv-1.12/po/ro.po trunk/libs-new/libiconv/libiconv-1.12/po/ru.gmo trunk/libs-new/libiconv/libiconv-1.12/po/ru.po trunk/libs-new/libiconv/libiconv-1.12/po/sk.gmo trunk/libs-new/libiconv/libiconv-1.12/po/sk.po trunk/libs-new/libiconv/libiconv-1.12/po/sl.gmo trunk/libs-new/libiconv/libiconv-1.12/po/sl.po trunk/libs-new/libiconv/libiconv-1.12/po/sq.gmo trunk/libs-new/libiconv/libiconv-1.12/po/sq.po trunk/libs-new/libiconv/libiconv-1.12/po/sr.gmo trunk/libs-new/libiconv/libiconv-1.12/po/sr.po trunk/libs-new/libiconv/libiconv-1.12/po/stamp-po trunk/libs-new/libiconv/libiconv-1.12/po/sv.gmo trunk/libs-new/libiconv/libiconv-1.12/po/sv.po trunk/libs-new/libiconv/libiconv-1.12/po/tr.gmo trunk/libs-new/libiconv/libiconv-1.12/po/tr.po trunk/libs-new/libiconv/libiconv-1.12/po/uk.gmo trunk/libs-new/libiconv/libiconv-1.12/po/uk.po trunk/libs-new/libiconv/libiconv-1.12/po/vi.gmo trunk/libs-new/libiconv/libiconv-1.12/po/vi.po trunk/libs-new/libiconv/libiconv-1.12/po/wa.gmo trunk/libs-new/libiconv/libiconv-1.12/po/wa.po trunk/libs-new/libiconv/libiconv-1.12/po/zh_CN.gmo trunk/libs-new/libiconv/libiconv-1.12/po/zh_CN.po trunk/libs-new/libiconv/libiconv-1.12/po/zh_TW.gmo trunk/libs-new/libiconv/libiconv-1.12/po/zh_TW.po trunk/libs-new/libiconv/libiconv-1.12/src/ trunk/libs-new/libiconv/libiconv-1.12/src/Makefile.in trunk/libs-new/libiconv/libiconv-1.12/src/iconv.c trunk/libs-new/libiconv/libiconv-1.12/src/iconv_no_i18n.c trunk/libs-new/libiconv/libiconv-1.12/srclib/ trunk/libs-new/libiconv/libiconv-1.12/srclib/Makefile.am trunk/libs-new/libiconv/libiconv-1.12/srclib/Makefile.gnulib trunk/libs-new/libiconv/libiconv-1.12/srclib/Makefile.in trunk/libs-new/libiconv/libiconv-1.12/srclib/alloca.in.h trunk/libs-new/libiconv/libiconv-1.12/srclib/areadlink.c trunk/libs-new/libiconv/libiconv-1.12/srclib/areadlink.h trunk/libs-new/libiconv/libiconv-1.12/srclib/binary-io.h trunk/libs-new/libiconv/libiconv-1.12/srclib/c-ctype.c trunk/libs-new/libiconv/libiconv-1.12/srclib/c-ctype.h trunk/libs-new/libiconv/libiconv-1.12/srclib/canonicalize-lgpl.c trunk/libs-new/libiconv/libiconv-1.12/srclib/canonicalize.h trunk/libs-new/libiconv/libiconv-1.12/srclib/error.c trunk/libs-new/libiconv/libiconv-1.12/srclib/error.h trunk/libs-new/libiconv/libiconv-1.12/srclib/gettext.h trunk/libs-new/libiconv/libiconv-1.12/srclib/intprops.h trunk/libs-new/libiconv/libiconv-1.12/srclib/localcharset.h trunk/libs-new/libiconv/libiconv-1.12/srclib/malloc.c trunk/libs-new/libiconv/libiconv-1.12/srclib/malloca.c trunk/libs-new/libiconv/libiconv-1.12/srclib/malloca.h trunk/libs-new/libiconv/libiconv-1.12/srclib/malloca.valgrind trunk/libs-new/libiconv/libiconv-1.12/srclib/memmove.c trunk/libs-new/libiconv/libiconv-1.12/srclib/pathmax.h trunk/libs-new/libiconv/libiconv-1.12/srclib/progname.c trunk/libs-new/libiconv/libiconv-1.12/srclib/progname.h trunk/libs-new/libiconv/libiconv-1.12/srclib/progreloc.c trunk/libs-new/libiconv/libiconv-1.12/srclib/readlink.c trunk/libs-new/libiconv/libiconv-1.12/srclib/relocatable.c trunk/libs-new/libiconv/libiconv-1.12/srclib/relocatable.h trunk/libs-new/libiconv/libiconv-1.12/srclib/relocwrapper.c trunk/libs-new/libiconv/libiconv-1.12/srclib/setenv.c trunk/libs-new/libiconv/libiconv-1.12/srclib/setenv.h trunk/libs-new/libiconv/libiconv-1.12/srclib/stdbool.in.h trunk/libs-new/libiconv/libiconv-1.12/srclib/stdint.in.h trunk/libs-new/libiconv/libiconv-1.12/srclib/stdlib.in.h trunk/libs-new/libiconv/libiconv-1.12/srclib/streq.h trunk/libs-new/libiconv/libiconv-1.12/srclib/strerror.c trunk/libs-new/libiconv/libiconv-1.12/srclib/string.in.h trunk/libs-new/libiconv/libiconv-1.12/srclib/unistd.in.h trunk/libs-new/libiconv/libiconv-1.12/srclib/unitypes.h trunk/libs-new/libiconv/libiconv-1.12/srclib/uniwidth/ trunk/libs-new/libiconv/libiconv-1.12/srclib/uniwidth/cjk.h trunk/libs-new/libiconv/libiconv-1.12/srclib/uniwidth/width.c trunk/libs-new/libiconv/libiconv-1.12/srclib/uniwidth.h trunk/libs-new/libiconv/libiconv-1.12/srclib/unlocked-io.h trunk/libs-new/libiconv/libiconv-1.12/srclib/unsetenv.c trunk/libs-new/libiconv/libiconv-1.12/srclib/wchar.in.h trunk/libs-new/libiconv/libiconv-1.12/srclib/xalloc.h trunk/libs-new/libiconv/libiconv-1.12/srclib/xmalloc.c trunk/libs-new/libiconv/libiconv-1.12/srclib/xreadlink.c trunk/libs-new/libiconv/libiconv-1.12/srclib/xreadlink.h trunk/libs-new/libiconv/libiconv-1.12/srclib/xstrdup.c trunk/libs-new/libiconv/libiconv-1.12/srcm4/ trunk/libs-new/libiconv/libiconv-1.12/srcm4/absolute-header.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/alloca.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/canonicalize-lgpl.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/codeset.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/eealloc.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/error.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/extensions.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/gettext.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/glibc2.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/glibc21.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/gnulib-cache.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/gnulib-common.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/gnulib-comp.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/gnulib-tool.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/iconv.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/include_next.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/intdiv0.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/intl.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/intldir.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/intlmacosx.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/intmax.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/inttypes-pri.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/inttypes_h.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/lcmessage.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/lib-ld.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/lib-link.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/lib-prefix.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/lock.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/longlong.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/malloc.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/malloca.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/mbstate_t.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/memmove.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/nls.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/pathmax.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/po.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/printf-posix.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/progtest.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/readlink.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/relocatable-lib.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/relocatable.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/setenv.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/size_max.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/ssize_t.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/stdbool.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/stdint.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/stdint_h.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/stdlib_h.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/strerror.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/string_h.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/uintmax_t.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/ulonglong.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/unistd_h.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/unlocked-io.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/visibility.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/wchar.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/wchar_t.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/wint_t.m4 trunk/libs-new/libiconv/libiconv-1.12/srcm4/xsize.m4 trunk/libs-new/libiconv/libiconv-1.12/tests/ trunk/libs-new/libiconv/libiconv-1.12/tests/ARMSCII-8.IRREVERSIBLE.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/ARMSCII-8.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/ASCII.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/ATARIST.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/BIG5-2003.IRREVERSIBLE.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/BIG5-2003.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/BIG5-HKSCS-1999-snippet trunk/libs-new/libiconv/libiconv-1.12/tests/BIG5-HKSCS-1999-snippet.UTF-8 trunk/libs-new/libiconv/libiconv-1.12/tests/BIG5-HKSCS-1999.IRREVERSIBLE.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/BIG5-HKSCS-1999.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/BIG5-HKSCS-2001-snippet trunk/libs-new/libiconv/libiconv-1.12/tests/BIG5-HKSCS-2001-snippet.UTF-8 trunk/libs-new/libiconv/libiconv-1.12/tests/BIG5-HKSCS-2001.IRREVERSIBLE.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/BIG5-HKSCS-2001.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/BIG5-HKSCS-2004-snippet trunk/libs-new/libiconv/libiconv-1.12/tests/BIG5-HKSCS-2004-snippet.UTF-8 trunk/libs-new/libiconv/libiconv-1.12/tests/BIG5-HKSCS-2004.IRREVERSIBLE.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/BIG5-HKSCS-2004.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/BIG5.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP1046.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP1124.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP1125.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP1129.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP1133.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP1161.IRREVERSIBLE.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP1161.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP1162.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP1163.IRREVERSIBLE.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP1163.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP1250.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP1251.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP1252.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP1253.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP1254.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP1255-snippet trunk/libs-new/libiconv/libiconv-1.12/tests/CP1255-snippet.UTF-8 trunk/libs-new/libiconv/libiconv-1.12/tests/CP1255.IRREVERSIBLE.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP1255.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP1256.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP1257.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP1258-snippet trunk/libs-new/libiconv/libiconv-1.12/tests/CP1258-snippet.UTF-8 trunk/libs-new/libiconv/libiconv-1.12/tests/CP1258.IRREVERSIBLE.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP1258.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP437.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP737.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP775.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP850.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP852.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP853.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP855.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP856.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP857.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP858.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP860.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP861.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP862.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP863.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP864.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP865.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP866.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP869.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP874.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP922.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP932.IRREVERSIBLE.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP932.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP936.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP949.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP950.IRREVERSIBLE.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/CP950.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/DEC-HANYU.IRREVERSIBLE.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/DEC-HANYU.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/DEC-KANJI.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/EUC-CN.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/EUC-JISX0213.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/EUC-JP.IRREVERSIBLE.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/EUC-JP.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/EUC-KR.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/EUC-TW.IRREVERSIBLE.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/EUC-TW.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/GB18030-BMP.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/GBK.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/Georgian-Academy.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/Georgian-PS.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/HP-ROMAN8.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/HZ-snippet trunk/libs-new/libiconv/libiconv-1.12/tests/HZ-snippet.UTF-8 trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-2022-CN-EXT-snippet trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-2022-CN-EXT-snippet.UTF-8 trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-2022-CN-snippet trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-2022-CN-snippet.UTF-8 trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-2022-JP-1-snippet trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-2022-JP-1-snippet.UTF-8 trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-2022-JP-2-snippet trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-2022-JP-2-snippet.UTF-8 trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-2022-JP-3-snippet trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-2022-JP-3-snippet.UTF-8 trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-2022-JP-snippet trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-2022-JP-snippet.UTF-8 trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-2022-KR-snippet trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-2022-KR-snippet.UTF-8 trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-8859-1.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-8859-10.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-8859-11.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-8859-13.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-8859-14.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-8859-15.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-8859-16.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-8859-2.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-8859-3.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-8859-4.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-8859-5.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-8859-6.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-8859-7.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-8859-8.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-8859-9.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-IR-165.IRREVERSIBLE.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/ISO-IR-165.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/ISO646-CN.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/ISO646-JP.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/JIS_X0201.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/JOHAB.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/KOI8-R.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/KOI8-RU.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/KOI8-T.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/KOI8-U.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/MacArabic.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/MacCentralEurope.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/MacCroatian.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/MacCyrillic.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/MacGreek.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/MacHebrew.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/MacIceland.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/MacRoman.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/MacRomania.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/MacThai.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/MacTurkish.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/MacUkraine.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/Makefile.in trunk/libs-new/libiconv/libiconv-1.12/tests/MuleLao-1.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/NEXTSTEP.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/PT154.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/Quotes.ASCII trunk/libs-new/libiconv/libiconv-1.12/tests/Quotes.ISO-8859-1 trunk/libs-new/libiconv/libiconv-1.12/tests/Quotes.UTF-8 trunk/libs-new/libiconv/libiconv-1.12/tests/RISCOS-LATIN1.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/RK1048.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/SHIFT_JIS.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/SHIFT_JISX0213.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/TCVN-snippet trunk/libs-new/libiconv/libiconv-1.12/tests/TCVN-snippet.UTF-8 trunk/libs-new/libiconv/libiconv-1.12/tests/TCVN.IRREVERSIBLE.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/TCVN.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/TDS565.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/TIS-620.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/Translit1.ASCII trunk/libs-new/libiconv/libiconv-1.12/tests/Translit1.ISO-8859-1 trunk/libs-new/libiconv/libiconv-1.12/tests/TranslitFail1.ISO-8859-1 trunk/libs-new/libiconv/libiconv-1.12/tests/UCS-2BE-snippet trunk/libs-new/libiconv/libiconv-1.12/tests/UCS-2BE-snippet.UTF-8 trunk/libs-new/libiconv/libiconv-1.12/tests/UCS-2LE-snippet trunk/libs-new/libiconv/libiconv-1.12/tests/UCS-2LE-snippet.UTF-8 trunk/libs-new/libiconv/libiconv-1.12/tests/UCS-4BE-snippet trunk/libs-new/libiconv/libiconv-1.12/tests/UCS-4BE-snippet.UTF-8 trunk/libs-new/libiconv/libiconv-1.12/tests/UCS-4LE-snippet trunk/libs-new/libiconv/libiconv-1.12/tests/UCS-4LE-snippet.UTF-8 trunk/libs-new/libiconv/libiconv-1.12/tests/UTF-16-snippet trunk/libs-new/libiconv/libiconv-1.12/tests/UTF-16-snippet.UTF-8 trunk/libs-new/libiconv/libiconv-1.12/tests/UTF-16BE-snippet trunk/libs-new/libiconv/libiconv-1.12/tests/UTF-16BE-snippet.UTF-8 trunk/libs-new/libiconv/libiconv-1.12/tests/UTF-16LE-snippet trunk/libs-new/libiconv/libiconv-1.12/tests/UTF-16LE-snippet.UTF-8 trunk/libs-new/libiconv/libiconv-1.12/tests/UTF-32-snippet trunk/libs-new/libiconv/libiconv-1.12/tests/UTF-32-snippet.UTF-8 trunk/libs-new/libiconv/libiconv-1.12/tests/UTF-32BE-snippet trunk/libs-new/libiconv/libiconv-1.12/tests/UTF-32BE-snippet.UTF-8 trunk/libs-new/libiconv/libiconv-1.12/tests/UTF-32LE-snippet trunk/libs-new/libiconv/libiconv-1.12/tests/UTF-32LE-snippet.UTF-8 trunk/libs-new/libiconv/libiconv-1.12/tests/UTF-7-snippet trunk/libs-new/libiconv/libiconv-1.12/tests/UTF-7-snippet.UTF-8 trunk/libs-new/libiconv/libiconv-1.12/tests/VISCII.TXT trunk/libs-new/libiconv/libiconv-1.12/tests/check-stateful trunk/libs-new/libiconv/libiconv-1.12/tests/check-stateful.bat trunk/libs-new/libiconv/libiconv-1.12/tests/check-stateless trunk/libs-new/libiconv/libiconv-1.12/tests/check-stateless.bat trunk/libs-new/libiconv/libiconv-1.12/tests/check-subst trunk/libs-new/libiconv/libiconv-1.12/tests/check-translit trunk/libs-new/libiconv/libiconv-1.12/tests/check-translit.bat trunk/libs-new/libiconv/libiconv-1.12/tests/check-translitfailure trunk/libs-new/libiconv/libiconv-1.12/tests/gengb18030z.c trunk/libs-new/libiconv/libiconv-1.12/tests/genutf8.c trunk/libs-new/libiconv/libiconv-1.12/tests/table-from.c trunk/libs-new/libiconv/libiconv-1.12/tests/table-to.c trunk/libs-new/libiconv/libiconv-1.12/tests/uniq-u.c trunk/libs-new/libiconv/libiconv-1.12/tools/ trunk/libs-new/libiconv/libiconv-1.12/tools/8bit_tab_to_h.c trunk/libs-new/libiconv/libiconv-1.12/tools/JISX0213.TXT trunk/libs-new/libiconv/libiconv-1.12/tools/Makefile trunk/libs-new/libiconv/libiconv-1.12/tools/cjk_tab_to_h.c trunk/libs-new/libiconv/libiconv-1.12/tools/cjk_variants.c trunk/libs-new/libiconv/libiconv-1.12/windows/ trunk/libs-new/libiconv/libiconv-1.12/windows/iconv.rc trunk/libs-new/libiconv/libiconv-1.12/windows/libiconv.rc trunk/libs-new/libiconv/libiconv-1.12/windows/windres-options trunk/libs-new/libiconv/libiconv-1.12/woe32dll/ trunk/libs-new/libiconv/libiconv-1.12/woe32dll/export.h trunk/libs-new/libiconv/libiconv-1.12/woe32dll/iconv-exports.c trunk/libs-new/libpng/1.2.25.mk trunk/libs-new/libpng/libpng-1.2.25/ trunk/libs-new/libpng/libpng-1.2.25/ANNOUNCE trunk/libs-new/libpng/libpng-1.2.25/CHANGES trunk/libs-new/libpng/libpng-1.2.25/INSTALL trunk/libs-new/libpng/libpng-1.2.25/KNOWNBUG trunk/libs-new/libpng/libpng-1.2.25/LICENSE trunk/libs-new/libpng/libpng-1.2.25/Makefile.am trunk/libs-new/libpng/libpng-1.2.25/Makefile.in trunk/libs-new/libpng/libpng-1.2.25/README trunk/libs-new/libpng/libpng-1.2.25/TODO trunk/libs-new/libpng/libpng-1.2.25/Y2KINFO trunk/libs-new/libpng/libpng-1.2.25/aclocal.m4 trunk/libs-new/libpng/libpng-1.2.25/autogen.sh trunk/libs-new/libpng/libpng-1.2.25/config.guess trunk/libs-new/libpng/libpng-1.2.25/config.h.in trunk/libs-new/libpng/libpng-1.2.25/config.sub trunk/libs-new/libpng/libpng-1.2.25/configure trunk/libs-new/libpng/libpng-1.2.25/configure.ac trunk/libs-new/libpng/libpng-1.2.25/contrib/ trunk/libs-new/libpng/libpng-1.2.25/contrib/gregbook/ trunk/libs-new/libpng/libpng-1.2.25/contrib/gregbook/COPYING trunk/libs-new/libpng/libpng-1.2.25/contrib/gregbook/LICENSE trunk/libs-new/libpng/libpng-1.2.25/contrib/gregbook/Makefile.mingw32 trunk/libs-new/libpng/libpng-1.2.25/contrib/gregbook/Makefile.sgi trunk/libs-new/libpng/libpng-1.2.25/contrib/gregbook/Makefile.unx trunk/libs-new/libpng/libpng-1.2.25/contrib/gregbook/Makefile.w32 trunk/libs-new/libpng/libpng-1.2.25/contrib/gregbook/README trunk/libs-new/libpng/libpng-1.2.25/contrib/gregbook/makevms.com trunk/libs-new/libpng/libpng-1.2.25/contrib/gregbook/readpng.c trunk/libs-new/libpng/libpng-1.2.25/contrib/gregbook/readpng.h trunk/libs-new/libpng/libpng-1.2.25/contrib/gregbook/readpng2.c trunk/libs-new/libpng/libpng-1.2.25/contrib/gregbook/readpng2.h trunk/libs-new/libpng/libpng-1.2.25/contrib/gregbook/readppm.c trunk/libs-new/libpng/libpng-1.2.25/contrib/gregbook/rpng-win.c trunk/libs-new/libpng/libpng-1.2.25/contrib/gregbook/rpng-x.c trunk/libs-new/libpng/libpng-1.2.25/contrib/gregbook/rpng2-win.c trunk/libs-new/libpng/libpng-1.2.25/contrib/gregbook/rpng2-x.c trunk/libs-new/libpng/libpng-1.2.25/contrib/gregbook/toucan.png trunk/libs-new/libpng/libpng-1.2.25/contrib/gregbook/wpng.c trunk/libs-new/libpng/libpng-1.2.25/contrib/gregbook/writepng.c trunk/libs-new/libpng/libpng-1.2.25/contrib/gregbook/writepng.h trunk/libs-new/libpng/libpng-1.2.25/contrib/pngminim/ trunk/libs-new/libpng/libpng-1.2.25/contrib/pngminim/decoder/ trunk/libs-new/libpng/libpng-1.2.25/contrib/pngminim/decoder/README trunk/libs-new/libpng/libpng-1.2.25/contrib/pngminim/decoder/gather.sh trunk/libs-new/libpng/libpng-1.2.25/contrib/pngminim/decoder/makefile.std trunk/libs-new/libpng/libpng-1.2.25/contrib/pngminim/decoder/pngusr.h trunk/libs-new/libpng/libpng-1.2.25/contrib/pngminim/encoder/ trunk/libs-new/libpng/libpng-1.2.25/contrib/pngminim/encoder/README trunk/libs-new/libpng/libpng-1.2.25/contrib/pngminim/encoder/dummy_inflate.c trunk/libs-new/libpng/libpng-1.2.25/contrib/pngminim/encoder/gather.sh trunk/libs-new/libpng/libpng-1.2.25/contrib/pngminim/encoder/makefile.std trunk/libs-new/libpng/libpng-1.2.25/contrib/pngminim/encoder/pngusr.h trunk/libs-new/libpng/libpng-1.2.25/contrib/pngminus/ trunk/libs-new/libpng/libpng-1.2.25/contrib/pngminus/README trunk/libs-new/libpng/libpng-1.2.25/contrib/pngminus/makefile.std trunk/libs-new/libpng/libpng-1.2.25/contrib/pngminus/makefile.tc3 trunk/libs-new/libpng/libpng-1.2.25/contrib/pngminus/makevms.com trunk/libs-new/libpng/libpng-1.2.25/contrib/pngminus/png2pnm.bat trunk/libs-new/libpng/libpng-1.2.25/contrib/pngminus/png2pnm.c trunk/libs-new/libpng/libpng-1.2.25/contrib/pngminus/png2pnm.sh trunk/libs-new/libpng/libpng-1.2.25/contrib/pngminus/pngminus.bat trunk/libs-new/libpng/libpng-1.2.25/contrib/pngminus/pngminus.sh trunk/libs-new/libpng/libpng-1.2.25/contrib/pngminus/pnm2png.bat trunk/libs-new/libpng/libpng-1.2.25/contrib/pngminus/pnm2png.c trunk/libs-new/libpng/libpng-1.2.25/contrib/pngminus/pnm2png.sh trunk/libs-new/libpng/libpng-1.2.25/contrib/pngsuite/ trunk/libs-new/libpng/libpng-1.2.25/contrib/pngsuite/README trunk/libs-new/libpng/libpng-1.2.25/contrib/pngsuite/basn0g01.png trunk/libs-new/libpng/libpng-1.2.25/contrib/pngsuite/basn0g02.png trunk/libs-new/libpng/libpng-1.2.25/contrib/pngsuite/basn0g04.png trunk/libs-new/libpng/libpng-1.2.25/contrib/pngsuite/basn0g08.png trunk/libs-new/libpng/libpng-1.2.25/contrib/pngsuite/basn0g16.png trunk/libs-new/libpng/libpng-1.2.25/contrib/pngsuite/basn2c08.png trunk/libs-new/libpng/libpng-1.2.25/contrib/pngsuite/basn2c16.png trunk/libs-new/libpng/libpng-1.2.25/contrib/pngsuite/basn3p01.png trunk/libs-new/libpng/libpng-1.2.25/contrib/pngsuite/basn3p02.png trunk/libs-new/libpng/libpng-1.2.25/contrib/pngsuite/basn3p04.png trunk/libs-new/libpng/libpng-1.2.25/contrib/pngsuite/basn3p08.png trunk/libs-new/libpng/libpng-1.2.25/contrib/pngsuite/basn4a08.png trunk/libs-new/libpng/libpng-1.2.25/contrib/pngsuite/basn4a16.png trunk/libs-new/libpng/libpng-1.2.25/contrib/pngsuite/basn6a08.png trunk/libs-new/libpng/libpng-1.2.25/contrib/pngsuite/basn6a16.png trunk/libs-new/libpng/libpng-1.2.25/contrib/visupng/ trunk/libs-new/libpng/libpng-1.2.25/contrib/visupng/PngFile.c trunk/libs-new/libpng/libpng-1.2.25/contrib/visupng/PngFile.h trunk/libs-new/libpng/libpng-1.2.25/contrib/visupng/README.txt trunk/libs-new/libpng/libpng-1.2.25/contrib/visupng/VisualPng.c trunk/libs-new/libpng/libpng-1.2.25/contrib/visupng/VisualPng.dsp trunk/libs-new/libpng/libpng-1.2.25/contrib/visupng/VisualPng.dsw trunk/libs-new/libpng/libpng-1.2.25/contrib/visupng/VisualPng.ico trunk/libs-new/libpng/libpng-1.2.25/contrib/visupng/VisualPng.png trunk/libs-new/libpng/libpng-1.2.25/contrib/visupng/VisualPng.rc trunk/libs-new/libpng/libpng-1.2.25/contrib/visupng/cexcept.h trunk/libs-new/libpng/libpng-1.2.25/contrib/visupng/resource.h trunk/libs-new/libpng/libpng-1.2.25/depcomp trunk/libs-new/libpng/libpng-1.2.25/example.c trunk/libs-new/libpng/libpng-1.2.25/install-sh trunk/libs-new/libpng/libpng-1.2.25/libpng-1.2.25.txt trunk/libs-new/libpng/libpng-1.2.25/libpng.3 trunk/libs-new/libpng/libpng-1.2.25/libpngpf.3 trunk/libs-new/libpng/libpng-1.2.25/ltmain.sh trunk/libs-new/libpng/libpng-1.2.25/missing trunk/libs-new/libpng/libpng-1.2.25/mkinstalldirs trunk/libs-new/libpng/libpng-1.2.25/png.5 trunk/libs-new/libpng/libpng-1.2.25/png.c trunk/libs-new/libpng/libpng-1.2.25/png.h trunk/libs-new/libpng/libpng-1.2.25/pngbar.jpg trunk/libs-new/libpng/libpng-1.2.25/pngbar.png trunk/libs-new/libpng/libpng-1.2.25/pngconf.h trunk/libs-new/libpng/libpng-1.2.25/pngerror.c trunk/libs-new/libpng/libpng-1.2.25/pnggccrd.c trunk/libs-new/libpng/libpng-1.2.25/pngget.c trunk/libs-new/libpng/libpng-1.2.25/pngmem.c trunk/libs-new/libpng/libpng-1.2.25/pngnow.png trunk/libs-new/libpng/libpng-1.2.25/pngpread.c trunk/libs-new/libpng/libpng-1.2.25/pngread.c trunk/libs-new/libpng/libpng-1.2.25/pngrio.c trunk/libs-new/libpng/libpng-1.2.25/pngrtran.c trunk/libs-new/libpng/libpng-1.2.25/pngrutil.c trunk/libs-new/libpng/libpng-1.2.25/pngset.c trunk/libs-new/libpng/libpng-1.2.25/pngtest.c trunk/libs-new/libpng/libpng-1.2.25/pngtest.png trunk/libs-new/libpng/libpng-1.2.25/pngtrans.c trunk/libs-new/libpng/libpng-1.2.25/pngvcrd.c trunk/libs-new/libpng/libpng-1.2.25/pngwio.c trunk/libs-new/libpng/libpng-1.2.25/pngwrite.c trunk/libs-new/libpng/libpng-1.2.25/pngwtran.c trunk/libs-new/libpng/libpng-1.2.25/pngwutil.c trunk/libs-new/libpng/libpng-1.2.25/projects/ trunk/libs-new/libpng/libpng-1.2.25/projects/beos/ trunk/libs-new/libpng/libpng-1.2.25/projects/beos... [truncated message content] |
From: <djw...@us...> - 2008-03-19 20:58:03
|
Revision: 298 http://open2x.svn.sourceforge.net/open2x/?rev=298&view=rev Author: djwillis Date: 2008-03-19 12:48:09 -0700 (Wed, 19 Mar 2008) Log Message: ----------- Add "--enable-video-directfb=no" to the SDL 1.2.11 entry in makefile.o2x to fix building on systems with DirectFB on the host system. Modified Paths: -------------- trunk/libs/makefile.o2x Modified: trunk/libs/makefile.o2x =================================================================== --- trunk/libs/makefile.o2x 2008-02-22 17:37:32 UTC (rev 297) +++ trunk/libs/makefile.o2x 2008-03-19 19:48:09 UTC (rev 298) @@ -23,11 +23,12 @@ #Build everything else. TARGETS += $(PREFIX)/lib/libz.a TARGETS += $(PREFIX)/lib/libpng.a -TARGETS += $(PREFIX)/lib/libSDL_gfx.a +#TARGETS += $(PREFIX)/lib/libSDL_gfx.a TARGETS += $(PREFIX)/lib/libxml2.a TARGETS += $(PREFIX)/lib/libSDL_image.a #TARGETS += $(PREFIX)/lib/libSDL_svg.a TARGETS += $(PREFIX)/lib/libSDL_ttf.a +#TARGETS += $(PREFIX)/lib/libSDL_inifile.a TARGETS += $(PREFIX)/lib/libbz2.a TARGETS += $(PREFIX)/lib/libfreetype.a TARGETS += $(PREFIX)/lib/libid3tag.a @@ -57,13 +58,15 @@ # #$(PREFIX)/lib/libSDL.a: # cd SDL-1.2.9 && ./autogen.sh && $(FLAGS) ./configure --prefix=$(PREFIX) --build=$(BUILD) --host=$(HOST) --enable-shared --enable-static --enable-pthreads --enable-pthreads-sem --enable-threads && $(FLAGS) make && $(FLAGS) make install && $(FLAGS) make clean +# #Use this rule to build the test SDL 1.2.11 SDL: $(PREFIX)/lib/libSDL.a $(PREFIX)/lib/libSDL.a: - cd SDL-1.2.11 && ./autogen.sh && $(FLAGS) ./configure --prefix=$(PREFIX) --build=$(BUILD) --host=$(HOST) --enable-shared --enable-static --enable-pthreads --enable-pthreads-sem --enable-threads --enable-video --enable-video-gp2x --enable-video-fbcon=no && $(FLAGS) make && $(FLAGS) make install && $(FLAGS) make clean + cd SDL-1.2.11 && ./autogen.sh && $(FLAGS) ./configure --prefix=$(PREFIX) --build=$(BUILD) --host=$(HOST) --enable-shared --enable-static --enable-pthreads --enable-pthreads-sem --enable-threads --enable-video --enable-video-gp2x --enable-video-fbcon=no --enable-video-directfb=no && $(FLAGS) make && $(FLAGS) make install && $(FLAGS) make clean + cd $(PREFIX)/bin; ln -f -s sdl-config $(HOST)-sdl-config SDL_gfx: $(PREFIX)/lib/libSDL_gfx.a @@ -85,6 +88,11 @@ $(PREFIX)/lib/libSDL_svg.a: $(PREFIX)/lib/libSDL.a $(PREFIX)/lib/libxml2.a $(PREFIX)/lib/libz.a cd SDL_svg-1.1.9 && ./autogen.sh $(FLAGS) $(LIBS) && $(FLAGS) $(LIBS) ./configure --prefix=$(PREFIX) --build=$(BUILD) --host=$(HOST) --enable-shared --enable-static --with-sdl-prefix=$(PREFIX) --with-gnu-ld && $(FLAGS) make && $(FLAGS) make install && $(FLAGS) make clean +SDL_inifile: $(PREFIX)/lib/libSDL_inifile.a + +$(PREFIX)/lib/libSDL_inifile.a: $(PREFIX)/lib/libSDL.a +# cd SDL_config_ini-0.0.4 && $(FLAGS) make && $(FLAGS) make install && $(FLAGS) make clean + bzip2: $(PREFIX)/lib/libbz2.a $(PREFIX)/lib/libbz2.a: @@ -184,5 +192,4 @@ mpeg2: $(PREFIX)/lib/libmpeg2.a $(PREFIX)/lib/libmpeg2.a: $(PREFIX)/lib/libSDL.a - cd mpeg2dec-gp2x && $(FLAGS) ./configure --prefix=$(PREFIX) --build=$(BUILD) --host=$(HOST) --enable-shared --enable-static --with-sdl-prefix=$(PREFIX) && $(FLAGS) make && $(FLAGS) make install - #&& $(FLAGS) make clean +# cd mpeg2dec-gp2x && $(FLAGS) ./configure --prefix=$(PREFIX) --build=$(BUILD) --host=$(HOST) --enable-shared --enable-static --with-sdl-prefix=$(PREFIX) && $(FLAGS) make && $(FLAGS) make install && $(FLAGS) make clean This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |