From: <hap...@us...> - 2007-09-14 15:29:27
|
Revision: 1319 http://hackndev.svn.sourceforge.net/hackndev/?rev=1319&view=rev Author: happy-slapin Date: 2007-09-14 08:29:25 -0700 (Fri, 14 Sep 2007) Log Message: ----------- cleanup: Device cleanup Modified Paths: -------------- linux4palm/linux/branches/cleanup-branch-never-commit/drivers/leds/led-palmz72.c Removed Paths: ------------- linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/pxa-ci.h linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/pxa_camera.h linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/aufs_type.h Modified: linux4palm/linux/branches/cleanup-branch-never-commit/drivers/leds/led-palmz72.c =================================================================== --- linux4palm/linux/branches/cleanup-branch-never-commit/drivers/leds/led-palmz72.c 2007-09-14 14:31:39 UTC (rev 1318) +++ linux4palm/linux/branches/cleanup-branch-never-commit/drivers/leds/led-palmz72.c 2007-09-14 15:29:25 UTC (rev 1319) @@ -21,13 +21,10 @@ #include <asm/arch/pxa-regs.h> #include <asm/hardware/scoop.h> - -static void palmz72led_green_set(struct led_classdev *led_cdev, enum led_brightness value) +static void palmz72led_green_set(struct led_classdev *led_cdev, + enum led_brightness value) { - if (value) - SET_PALMZ72_GPIO(LED,1); - else - SET_PALMZ72_GPIO(LED,0); + SET_PALMZ72_GPIO(LED, value ? 1 : 0); } static struct led_classdev palmz72_green_led = { Deleted: linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/pxa-ci.h =================================================================== --- linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/pxa-ci.h 2007-09-14 14:31:39 UTC (rev 1318) +++ linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/pxa-ci.h 2007-09-14 15:29:25 UTC (rev 1319) @@ -1,299 +0,0 @@ -/* - ci - header file for pxa capture interface - - Copyright (C) 2003, Intel Corporation - - 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., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -#ifndef _CI_H_ -#define _CI_H_ - -//--------------------------------------------------------------------------- -// Register definitions -//--------------------------------------------------------------------------- - -enum CI_REGBITS_CICR0 { - CI_CICR0_FOM = 0x00000001, - CI_CICR0_EOFM = 0x00000002, - CI_CICR0_SOFM = 0x00000004, - CI_CICR0_CDM = 0x00000008, - CI_CICR0_QDM = 0x00000010, - CI_CICR0_PERRM = 0x00000020, - CI_CICR0_EOLM = 0x00000040, - CI_CICR0_FEM = 0x00000080, - CI_CICR0_RDAVM = 0x00000100, - CI_CICR0_TOM = 0x00000200, - CI_CICR0_RESERVED = 0x03FFFC00, - CI_CICR0_SIM_SHIFT = 24, - CI_CICR0_SIM_SMASK = 0x7, - CI_CICR0_DIS = 0x08000000, - CI_CICR0_ENB = 0x10000000, - CI_CICR0_SL_CAP_EN = 0x20000000, - CI_CICR0_PAR_EN = 0x40000000, - CI_CICR0_DMA_EN = 0x80000000, - CI_CICR0_INTERRUPT_MASK = 0x3FF -}; - -enum CI_REGBITS_CICR1 { - CI_CICR1_DW_SHIFT = 0, - CI_CICR1_DW_SMASK = 0x7, - CI_CICR1_COLOR_SP_SHIFT = 3, - CI_CICR1_COLOR_SP_SMASK = 0x3, - CI_CICR1_RAW_BPP_SHIFT = 5, - CI_CICR1_RAW_BPP_SMASK = 0x3, - CI_CICR1_RGB_BPP_SHIFT = 7, - CI_CICR1_RGB_BPP_SMASK = 0x7, - CI_CICR1_YCBCR_F = 0x00000400, - CI_CICR1_RBG_F = 0x00000800, - CI_CICR1_RGB_CONV_SHIFT = 12, - CI_CICR1_RGB_CONV_SMASK = 0x7, - CI_CICR1_PPL_SHIFT = 15, - CI_CICR1_PPL_SMASK = 0x7FF, - CI_CICR1_RESERVED = 0x1C000000, - CI_CICR1_RGBT_CONV_SHIFT= 29, - CI_CICR1_RGBT_CONV_SMASK= 0x3, - CI_CICR1_TBIT = 0x80000000 -}; - -enum CI_REGBITS_CICR2 { - CI_CICR2_FSW_SHIFT = 0, - CI_CICR2_FSW_SMASK = 0x3, - CI_CICR2_BFPW_SHIFT= 3, - CI_CICR2_BFPW_SMASK= 0x3F, - CI_CICR2_RESERVED = 0x00000200, - CI_CICR2_HSW_SHIFT = 10, - CI_CICR2_HSW_SMASK = 0x3F, - CI_CICR2_ELW_SHIFT = 16, - CI_CICR2_ELW_SMASK = 0xFF, - CI_CICR2_BLW_SHIFT = 24, - CI_CICR2_BLW_SMASK = 0xFF -}; - -enum CI_REGBITS_CICR3 { - CI_CICR3_LPF_SHIFT = 0, - CI_CICR3_LPF_SMASK = 0x7FF, - CI_CICR3_VSW_SHIFT = 11, - CI_CICR3_VSW_SMASK = 0x1F, - CI_CICR3_EFW_SHIFT = 16, - CI_CICR3_EFW_SMASK = 0xFF, - CI_CICR3_BFW_SHIFT = 24, - CI_CICR3_BFW_SMASK = 0xFF -}; - -enum CI_REGBITS_CICR4 { - CI_CICR4_DIV_SHIFT = 0, - CI_CICR4_DIV_SMASK = 0xFF, - CI_CICR4_FR_RATE_SHIFT = 8, - CI_CICR4_FR_RATE_SMASK = 0x7, - CI_CICR4_RESERVED1 = 0x0007F800, - CI_CICR4_MCLK_EN = 0x00080000, - CI_CICR4_VSP = 0x00100000, - CI_CICR4_HSP = 0x00200000, - CI_CICR4_PCP = 0x00400000, - CI_CICR4_PCLK_EN = 0x00800000, - CI_CICR4_RESERVED2 = 0xFF000000, - CI_CICR4_RESERVED = CI_CICR4_RESERVED1 | CI_CICR4_RESERVED2 -}; - -enum CI_REGBITS_CISR { - CI_CISR_IFO_0 = 0x00000001, - CI_CISR_IFO_1 = 0x00000002, - CI_CISR_IFO_2 = 0x00000004, - CI_CISR_EOF = 0x00000008, - CI_CISR_SOF = 0x00000010, - CI_CISR_CDD = 0x00000020, - CI_CISR_CQD = 0x00000040, - CI_CISR_PAR_ERR = 0x00000080, - CI_CISR_EOL = 0x00000100, - CI_CISR_FEMPTY_0 = 0x00000200, - CI_CISR_FEMPTY_1 = 0x00000400, - CI_CISR_FEMPTY_2 = 0x00000800, - CI_CISR_RDAV_0 = 0x00001000, - CI_CISR_RDAV_1 = 0x00002000, - CI_CISR_RDAV_2 = 0x00004000, - CI_CISR_FTO = 0x00008000, - CI_CISR_RESERVED = 0xFFFF0000 -}; - -enum CI_REGBITS_CIFR { - CI_CIFR_FEN0 = 0x00000001, - CI_CIFR_FEN1 = 0x00000002, - CI_CIFR_FEN2 = 0x00000004, - CI_CIFR_RESETF = 0x00000008, - CI_CIFR_THL_0_SHIFT= 4, - CI_CIFR_THL_0_SMASK= 0x3, - CI_CIFR_RESERVED1 = 0x000000C0, - CI_CIFR_FLVL0_SHIFT= 8, - CI_CIFR_FLVL0_SMASK= 0xFF, - CI_CIFR_FLVL1_SHIFT= 16, - CI_CIFR_FLVL1_SMASK= 0x7F, - CI_CIFR_FLVL2_SHIFT= 23, - CI_CIFR_FLVL2_SMASK= 0x7F, - CI_CIFR_RESERVED2 = 0xC0000000, - CI_CIFR_RESERVED = CI_CIFR_RESERVED1 | CI_CIFR_RESERVED2 -}; - -//--------------------------------------------------------------------------- -// Parameter Type definitions -//--------------------------------------------------------------------------- -typedef enum { - CI_RAW8 = 0, //RAW - CI_RAW9, - CI_RAW10, - CI_YCBCR422, //YCBCR - CI_YCBCR422_PLANAR, //YCBCR Planaried - CI_RGB444, //RGB - CI_RGB555, - CI_RGB565, - CI_RGB666, - CI_RGB888, - CI_RGBT555_0, //RGB+Transparent bit 0 - CI_RGBT888_0, - CI_RGBT555_1, //RGB+Transparent bit 1 - CI_RGBT888_1, - CI_RGB666_PACKED, //RGB Packed - CI_RGB888_PACKED, - CI_INVALID_FORMAT = 0xFF -} CI_IMAGE_FORMAT; - -typedef enum { - CI_INTSTATUS_IFO_0 = 0x00000001, - CI_INTSTATUS_IFO_1 = 0x00000002, - CI_INTSTATUS_IFO_2 = 0x00000004, - CI_INTSTATUS_EOF = 0x00000008, - CI_INTSTATUS_SOF = 0x00000010, - CI_INTSTATUS_CDD = 0x00000020, - CI_INTSTATUS_CQD = 0x00000040, - CI_INTSTATUS_PAR_ERR = 0x00000080, - CI_INTSTATUS_EOL = 0x00000100, - CI_INTSTATUS_FEMPTY_0 = 0x00000200, - CI_INTSTATUS_FEMPTY_1 = 0x00000400, - CI_INTSTATUS_FEMPTY_2 = 0x00000800, - CI_INTSTATUS_RDAV_0 = 0x00001000, - CI_INTSTATUS_RDAV_1 = 0x00002000, - CI_INTSTATUS_RDAV_2 = 0x00004000, - CI_INTSTATUS_FTO = 0x00008000, - CI_INTSTATUS_ALL = 0x0000FFFF -} CI_INTERRUPT_STATUS; - -typedef enum { - CI_INT_IFO = 0x00000001, - CI_INT_EOF = 0x00000002, - CI_INT_SOF = 0x00000004, - CI_INT_CDD = 0x00000008, - CI_INT_CQD = 0x00000010, - CI_INT_PAR_ERR = 0x00000020, - CI_INT_EOL = 0x00000040, - CI_INT_FEMPTY = 0x00000080, - CI_INT_RDAV = 0x00000100, - CI_INT_FTO = 0x00000200, - CI_INT_ALL = 0x000003FF -} CI_INTERRUPT_MASK; -#define CI_INT_MAX 10 - -typedef enum CI_MODE { - CI_MODE_MP, // Master-Parallel - CI_MODE_SP, // Slave-Parallel - CI_MODE_MS, // Master-Serial - CI_MODE_EP, // Embedded-Parallel - CI_MODE_ES // Embedded-Serial -} CI_MODE; - - -typedef enum { - CI_FR_ALL = 0, // Capture all incoming frames - CI_FR_1_2, // Capture 1 out of every 2 frames - CI_FR_1_3, // Capture 1 out of every 3 frames - CI_FR_1_4, - CI_FR_1_5, - CI_FR_1_6, - CI_FR_1_7, - CI_FR_1_8 -} CI_FRAME_CAPTURE_RATE; - - -typedef enum { - CI_FIFO_THL_32 = 0, - CI_FIFO_THL_64, - CI_FIFO_THL_96 -} CI_FIFO_THRESHOLD; - -typedef struct { - unsigned int BFW; - unsigned int BLW; -} CI_MP_TIMING, CI_MS_TIMING; - -typedef struct { - unsigned int BLW; - unsigned int ELW; - unsigned int HSW; - unsigned int BFPW; - unsigned int FSW; - unsigned int BFW; - unsigned int EFW; - unsigned int VSW; -} CI_SP_TIMING; - -typedef enum { - CI_DATA_WIDTH4 = 0x0, - CI_DATA_WIDTH5 = 0x1, - CI_DATA_WIDTH8 = 0x2, - CI_DATA_WIDTH9 = 0x3, - CI_DATA_WIDTH10= 0x4 -} CI_DATA_WIDTH; - -//------------------------------------------------------------------------------------------------------- -// Configuration APIs -//------------------------------------------------------------------------------------------------------- - -void ci_set_frame_rate(CI_FRAME_CAPTURE_RATE frate); -CI_FRAME_CAPTURE_RATE ci_get_frame_rate(void); -void ci_set_image_format(CI_IMAGE_FORMAT input_format, CI_IMAGE_FORMAT output_format); -void ci_set_mode(CI_MODE mode, CI_DATA_WIDTH data_width); -void ci_configure_mp(unsigned int PPL, unsigned int LPF, CI_MP_TIMING* timing); -void ci_configure_sp(unsigned int PPL, unsigned int LPF, CI_SP_TIMING* timing); -void ci_configure_ms(unsigned int PPL, unsigned int LPF, CI_MS_TIMING* timing); -void ci_configure_ep(int parity_check); -void ci_configure_es(int parity_check); -void ci_set_clock(unsigned int clk_regs_base, int pclk_enable, int mclk_enable, unsigned int mclk_khz); -void ci_set_polarity(int pclk_sample_falling, int hsync_active_low, int vsync_active_low); -void ci_set_fifo( unsigned int timeout, CI_FIFO_THRESHOLD threshold, int fifo1_enable, - int fifo2_enable); -void ci_set_int_mask( unsigned int mask); -void ci_clear_int_status( unsigned int status); -void ci_set_reg_value( unsigned int reg_offset, unsigned int value); -int ci_get_reg_value(unsigned int reg_offset); - -void ci_reset_fifo(void); -unsigned int ci_get_int_mask(void); -unsigned int ci_get_int_status(void); -void ci_slave_capture_enable(void); -void ci_slave_capture_disable(void); - -//------------------------------------------------------------------------------------------------------- -// Control APIs -//------------------------------------------------------------------------------------------------------- -int ci_init(void); -void ci_deinit(void); -void ci_enable( int dma_en); -int ci_disable(int quick); - -//debug -void ci_dump(void); -// IRQ -irqreturn_t pxa_camera_irq(int irq, void *dev_id, struct pt_regs *regs); - -#endif Deleted: linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/pxa_camera.h =================================================================== --- linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/pxa_camera.h 2007-09-14 14:31:39 UTC (rev 1318) +++ linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/pxa_camera.h 2007-09-14 15:29:25 UTC (rev 1319) @@ -1,74 +0,0 @@ -/* - pxa_camera - PXA camera driver header file - - Copyright (C) 2003, Intel Corporation - - 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., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -#ifndef __LINUX_PXA_CAMERA_H_ -#define __LINUX_PXA_CAMERA_H_ - -#define WCAM_VIDIOCSCAMREG _IOW('v', 211, int) -#define WCAM_VIDIOCGCAMREG _IOR('v', 212, int) -#define WCAM_VIDIOCSCIREG _IOW('v', 213, int) -#define WCAM_VIDIOCGCIREG _IOR('v', 214, int) -#define WCAM_VIDIOCSINFOR _IOW('v', 215, int) -#define WCAM_VIDIOCGINFOR _IOR('v', 216, int) - -/* -Image format definition -*/ -#define CAMERA_IMAGE_FORMAT_RAW8 0 -#define CAMERA_IMAGE_FORMAT_RAW9 1 -#define CAMERA_IMAGE_FORMAT_RAW10 2 - -#define CAMERA_IMAGE_FORMAT_RGB444 3 -#define CAMERA_IMAGE_FORMAT_RGB555 4 -#define CAMERA_IMAGE_FORMAT_RGB565 5 -#define CAMERA_IMAGE_FORMAT_RGB666_PACKED 6 -#define CAMERA_IMAGE_FORMAT_RGB666_PLANAR 7 -#define CAMERA_IMAGE_FORMAT_RGB888_PACKED 8 -#define CAMERA_IMAGE_FORMAT_RGB888_PLANAR 9 -#define CAMERA_IMAGE_FORMAT_RGBT555_0 10 //RGB+Transparent bit 0 -#define CAMERA_IMAGE_FORMAT_RGBT888_0 11 -#define CAMERA_IMAGE_FORMAT_RGBT555_1 12 //RGB+Transparent bit 1 -#define CAMERA_IMAGE_FORMAT_RGBT888_1 13 - -#define CAMERA_IMAGE_FORMAT_YCBCR400 14 -#define CAMERA_IMAGE_FORMAT_YCBCR422_PACKED 15 -#define CAMERA_IMAGE_FORMAT_YCBCR422_PLANAR 16 -#define CAMERA_IMAGE_FORMAT_YCBCR444_PACKED 17 -#define CAMERA_IMAGE_FORMAT_YCBCR444_PLANAR 18 - -/* -Bpp definition -*/ - -#define YUV422_BPP 16 -#define RGB565_BPP 16 -#define RGB666_UNPACKED_BPP 32 -#define RGB666_PACKED_BPP 24 - -/* -VIDIOCCAPTURE Arguments -*/ -#define STILL_IMAGE 1 -#define VIDEO_START 0 -#define VIDEO_STOP -1 - - -#endif /* __LINUX_PXA_CAMERA_H_ */ - Deleted: linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/aufs_type.h =================================================================== --- linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/aufs_type.h 2007-09-14 14:31:39 UTC (rev 1318) +++ linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/aufs_type.h 2007-09-14 15:29:25 UTC (rev 1319) @@ -1,100 +0,0 @@ -/* - * Copyright (C) 2005, 2006, 2007 Junjiro Okajima - * - * This program, aufs 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 St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* $Id: aufs_type.h,v 1.59 2007/06/11 01:42:40 sfjro Exp $ */ - -#include <linux/ioctl.h> - -#ifndef __AUFS_TYPE_H__ -#define __AUFS_TYPE_H__ - -#define AUFS_VERSION "20070611" - -/* ---------------------------------------------------------------------- */ - -typedef short aufs_bindex_t; -#ifdef CONFIG_AUFS_BRANCH_MAX_127 -#define AUFS_BRANCH_MAX 127 -#elif CONFIG_AUFS_BRANCH_MAX_511 -#define AUFS_BRANCH_MAX 511 -#elif defined(CONFIG_AUFS_BRANCH_MAX_1023) -#define AUFS_BRANCH_MAX 1023 -#elif defined(CONFIG_AUFS_BRANCH_MAX_32767) -#define AUFS_BRANCH_MAX 32767 -#else -#error unknown CONFIG_AUFS_BRANCH_MAX value -#endif - -#define AUFS_NAME "aufs" -#define AUFS_FSTYPE AUFS_NAME - -#define AUFS_ROOT_INO 2 -#define AUFS_FIRST_INO 11 - -#define AUFS_WH_PFX ".wh." -#define AUFS_WH_PFX_LEN ((int)sizeof(AUFS_WH_PFX) - 1) -#define AUFS_XINO_FNAME "." AUFS_NAME ".xino" -#define AUFS_XINO_DEFPATH "/tmp/" AUFS_XINO_FNAME -#define AUFS_DIRWH_DEF 3 -#define AUFS_RDCACHE_DEF 10 /* seconds */ -#define AUFS_WKQ_NAME AUFS_NAME "d" -#ifdef CONFIG_AUFS_NWKQ_DEF -#define AUFS_NWKQ_DEF CONFIG_AUFS_NWKQ_DEF -#else -#define AUFS_NWKQ_DEF 4 -#endif - -#ifdef CONFIG_AUFS_COMPAT -#define AUFS_DIROPQ_NAME "__dir_opaque" -#else -#define AUFS_DIROPQ_NAME AUFS_WH_PFX ".opq" /* whiteouted doubly */ -#endif -#define AUFS_WH_DIROPQ AUFS_WH_PFX AUFS_DIROPQ_NAME - -/* will be whiteouted doubly */ -#define AUFS_WH_BASENAME AUFS_WH_PFX AUFS_NAME -#define AUFS_WH_PLINKDIR AUFS_WH_PFX "plink" - -/* ---------------------------------------------------------------------- */ - -/* ioctl */ -enum {AuCtlErr, AuCtlErr_Last}; -enum { - AuCtl_REFRESH, //AuCtl_REFRESHV, - //AuCtl_FLUSH_PLINK, - //AuCtl_CPUP, - AuCtl_CPDOWN, AuCtl_MVDOWN, - //AuCtl_DIROPQ -}; - -struct aufs_ctl_cp { - int bsrc, bdst; - int err; -}; - -#define Type 'A' -#define AUFS_CTL_REFRESH _IO(Type, AuCtl_REFRESH) -//#define AUFS_CTL_REFRESHV _IO(Type, AuCtl_REFRESHV) -//#define AUFS_CTL_FLUSH_PLINK _IOR(Type, AuCtl_FLUSH_PLINK) -//#define AUFS_CTL_CPUP _IOWR(Type, AuCtl_CPUP, struct aufs_ctl_cp) -#define AUFS_CTL_CPDOWN _IOWR(Type, AuCtl_CPDOWN, struct aufs_ctl_cp) -#define AUFS_CTL_MVDOWN _IOWR(Type, AuCtl_MVDOWN, struct aufs_ctl_cp) -//#define AUFS_CTL_DIROPQ _IO(Type, AuCtl_DIROPQ) -#undef Type - -#endif /* __AUFS_TYPE_H__ */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |