Menu
▾
▴
gc-linux-cvs — CVS commit logs.
This list is closed, nobody may subscribe to it.
| 2004 |
Jan
(53) |
Feb
(78) |
Mar
(34) |
Apr
(26) |
May
(25) |
Jun
(34) |
Jul
(16) |
Aug
(16) |
Sep
(2) |
Oct
(58) |
Nov
(13) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(62) |
Feb
(4) |
Mar
(40) |
Apr
(9) |
May
(13) |
Jun
(26) |
Jul
(32) |
Aug
(24) |
Sep
(18) |
Oct
(18) |
Nov
(14) |
Dec
|
| 2006 |
Jan
(15) |
Feb
(2) |
Mar
(23) |
Apr
(2) |
May
(2) |
Jun
(13) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2007 |
Jan
(1) |
Feb
(45) |
Mar
|
Apr
(13) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
(31) |
Dec
(5) |
| 2008 |
Jan
(6) |
Feb
(34) |
Mar
(113) |
Apr
(40) |
May
(19) |
Jun
(5) |
Jul
(41) |
Aug
(13) |
Sep
(53) |
Oct
(4) |
Nov
(53) |
Dec
|
| 2009 |
Jan
(1) |
Feb
(29) |
Mar
(66) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(163) |
Nov
|
Dec
(91) |
|
From: <he...@us...> - 2005-01-06 20:28:03
|
Update of /cvsroot/gc-linux/linux/drivers/net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2103/drivers/net Modified Files: gcn-bba.c Log Message: Fix label indentation. Fix copyright dates. Index: gcn-bba.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/gcn-bba.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gcn-bba.c 23 Nov 2004 20:59:52 -0000 1.2 +++ gcn-bba.c 6 Jan 2005 20:27:54 -0000 1.3 @@ -2,8 +2,8 @@ * drivers/net/gcn-bba.c * * Nintendo GameCube Broadband Adapter driver - * Copyright (C) 2004 The GameCube Linux Team - * Copyright (C) 2004 Albert Herranz + * Copyright (C) 2004-2005 The GameCube Linux Team + * Copyright (C) 2004,2005 Albert Herranz * * Based on previous work by Stefan Esser, Franz Lehner, Costis and tmbinc. * @@ -1018,10 +1018,10 @@ return 0; - err_out_free_dev: +err_out_free_dev: free_netdev(dev); - err_out: +err_out: return err; } |
|
From: <he...@us...> - 2005-01-06 20:23:31
|
Update of /cvsroot/gc-linux/linux/sound/ppc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1191/sound/ppc Modified Files: gcn-ai.c Log Message: Fix module license. Fix copyright dates. Index: gcn-ai.c =================================================================== RCS file: /cvsroot/gc-linux/linux/sound/ppc/gcn-ai.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gcn-ai.c 20 Oct 2004 00:15:43 -0000 1.1 +++ gcn-ai.c 6 Jan 2005 20:23:21 -0000 1.2 @@ -2,7 +2,7 @@ * sound/ppc/gcn-ai.c * * Nintendo GameCube audio interface driver - * Copyright (C) 2004 The GameCube Linux Team + * Copyright (C) 2004-2005 The GameCube Linux Team * * Based on work from mist, kirin, groepaz, Steve_-, isobel and others. * @@ -39,7 +39,7 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION); MODULE_AUTHOR(DRV_AUTHOR); -MODULE_LICENSE(GPL); +MODULE_LICENSE("GPL"); #define PFX DRV_MODULE_NAME ": " #define ai_printk(level, format, arg...) \ |
|
From: <he...@us...> - 2005-01-06 20:22:25
|
Update of /cvsroot/gc-linux/linux/include/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv851/include/linux Modified Files: fb.h Log Message: Add __iomem annotations. Index: fb.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- fb.h 4 Jan 2005 21:39:31 -0000 1.10 +++ fb.h 6 Jan 2005 20:22:17 -0000 1.11 @@ -775,7 +775,7 @@ #else extern unsigned int gcnfb_writel(unsigned int, void *); # define fb_writel(b,addr) gcnfb_writel(b,addr) -# define fb_writel_real(b,addr) /* __raw_writel */ (*(volatile u32 *) (addr) = (b)) +# define fb_writel_real(b,addr) /* __raw_writel */ (*(volatile u32 __iomem *) (addr) = (b)) #endif #define fb_writeq __raw_writeq #define fb_memset memset_io |
|
From: <he...@us...> - 2005-01-06 20:21:25
|
Update of /cvsroot/gc-linux/linux/drivers/video In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32415/drivers/video Modified Files: gcngx.c Log Message: Add __iomem annotations. Fix myfree (it should not return anything). Do update again the foreground console. Use remap_pfn_range instead of deprecated remap_page_range. Fix copyright dates. Index: gcngx.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/gcngx.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gcngx.c 4 Jan 2005 21:39:30 -0000 1.2 +++ gcngx.c 6 Jan 2005 20:21:16 -0000 1.3 @@ -2,8 +2,8 @@ * drivers/video/gcngx.c * * Nintendo GameCube GX driver extension - * Copyright (C) 2004 Todd Jeffreys <to...@vo...> - * Copyright (C) 2004 The GameCube Linux Team + * Copyright (C) 2004-2005 The GameCube Linux Team + * Copyright (C) 2004,2005 Todd Jeffreys <to...@vo...> * * Parts borrowed heavily from libogc. This driver would not have * been possible with this library. Thanks! @@ -63,22 +63,21 @@ #define KMALLOC_BASE 0x0D000000 -#define VIDEO_PE_INTERRUPT 0xCC00100A -#define VIDEO_PE_TOKEN 0xCC00100E -#define VIDEO_PE_INTERRUPT_TOKEN_ENABLE (1 << 0) -#define VIDEO_PE_INTERRUPT_FINISH_ENABLE (1 << 1) -#define VIDEO_PE_INTERRUPT_TOKEN_INTERRUPT (1 << 2) +#define VIDEO_PE_INTERRUPT ((void __iomem *)0xcc00100a) +#define VIDEO_PE_TOKEN ((void __iomem *)0xcc00100e) +#define VIDEO_PE_INTERRUPT_TOKEN_ENABLE (1 << 0) +#define VIDEO_PE_INTERRUPT_FINISH_ENABLE (1 << 1) +#define VIDEO_PE_INTERRUPT_TOKEN_INTERRUPT (1 << 2) #define VIDEO_PE_INTERRUPT_FINISH_INTERRUPT (1 << 3) #define gcngx_disable_pe_interrupts() writew(readw(VIDEO_PE_INTERRUPT) & ~(VIDEO_PE_INTERRUPT_TOKEN_ENABLE | VIDEO_PE_INTERRUPT_FINISH_ENABLE),VIDEO_PE_INTERRUPT) #define gcngx_enable_pe_interrupts() { writew(readw(VIDEO_PE_INTERRUPT) | (VIDEO_PE_INTERRUPT_TOKEN_ENABLE | VIDEO_PE_INTERRUPT_FINISH_ENABLE | VIDEO_PE_INTERRUPT_TOKEN_INTERRUPT | VIDEO_PE_INTERRUPT_FINISH_INTERRUPT),VIDEO_PE_INTERRUPT); writew(0,VIDEO_PE_TOKEN); } -#define VIDEO_CP_SR ((volatile u16*)0xCC000000) -#define VIDEO_CP_CR ((volatile u16*)0xCC000002) - -#define VIDEO_CP_SR_OVERFLOW (1 << 0) -#define VIDEO_CP_SR_UNDERFLOW (1 << 1) +#define VIDEO_CP_SR ((volatile u16 __iomem *)0xcc000000) +#define VIDEO_CP_SR_OVERFLOW (1 << 0) +#define VIDEO_CP_SR_UNDERFLOW (1 << 1) +#define VIDEO_CP_CR ((volatile u16 __iomem *)0xcc000002) #define VIDEO_CP_CR_GP_FIFO_READ_ENABLE (1 << 0) #define VIDEO_CP_CR_CP_IRQ_ENABLE (1 << 1) #define VIDEO_CP_CR_OVERFLOW_IRQ_ENABLE (1 << 2) @@ -90,11 +89,6 @@ #define SIG_PE_TOKEN (SIGRTMIN+15) #define SIG_VTRACE_COMPLETE (SIGRTMIN+16) -#define ENABLE_RUMBLE() do \ - { writel(0x00400001,0xCC006400); \ - writel(0x80000000,0xCC006438); } \ - while (0) - #define FIFO_PUTU8(x) (*((volatile u8*) WGPIPE) = (x)) #define FIFO_PUTU32(x) (*((volatile u32*)WGPIPE) = (x)) @@ -245,7 +239,7 @@ return p; } -static void *myfree(void *p) +static void myfree(void *p) { struct page *page; u32 len; @@ -283,7 +277,7 @@ gcnfb_restorefb(info); #ifdef CONFIG_FRAMEBUFFER_CONSOLE acquire_console_sem(); -/* update_screen(info->currcon);*/ + update_screen(fg_console); unblank_screen(); release_console_sem(); #endif @@ -332,8 +326,8 @@ /* now setup the mapping */ phys = virt_to_phys(vma->vm_private_data); vma->vm_flags |= (VM_RESERVED | VM_LOCKED); - if (remap_page_range(vma,vma->vm_start, - phys,len,vma->vm_page_prot)) + if (remap_pfn_range(vma,vma->vm_start, + phys >> PAGE_SHIFT,len,vma->vm_page_prot)) { kfree(vma->vm_private_data); return -EINVAL; |
|
From: <he...@us...> - 2005-01-06 20:17:11
|
Update of /cvsroot/gc-linux/linux/drivers/video In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31528/drivers/video Modified Files: gcnfb.c Log Message: Add __iomem annotations. Rearrange a bit the init function so that we setup the interrupt handler before enabling interrupts. Fix copyright dates. Index: gcnfb.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/gcnfb.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- gcnfb.c 15 Nov 2004 01:16:29 -0000 1.8 +++ gcnfb.c 6 Jan 2005 20:16:53 -0000 1.9 @@ -2,9 +2,9 @@ * drivers/video/gcnfb.c * * Nintendo GameCube "Flipper" chipset frame buffer driver - * Copyright (C) 2004 The GameCube Linux Team + * Copyright (C) 2004-2005 The GameCube Linux Team * Copyright (C) 2004 Michael Steil <mi...@c6...> - * Copyright (C) 2004 Todd Jeffreys <to...@vo...> + * Copyright (C) 2004,2005 Todd Jeffreys <to...@vo...> * * Based on vesafb (c) 1998 Gerd Knorr <kr...@go...> * @@ -144,10 +144,10 @@ #define VI_IRQ 8 -#define VI_DI0 0xCC002030 -#define VI_DI1 0xCC002034 -#define VI_DI2 0xCC002038 -#define VI_DI3 0xCC00203C +#define VI_DI0 ((void __iomem *)0xcc002030) +#define VI_DI1 ((void __iomem *)0xcc002034) +#define VI_DI2 ((void __iomem *)0xcc002038) +#define VI_DI3 ((void __iomem *)0xcc00203C) #define VI_DI_INT (1 << 31) #define VI_DI_ENB (1 << 28) @@ -156,10 +156,10 @@ #define VI_DI_HCT_SHIFT 0 #define VI_DI_HCT_MASK 0x000003FF -#define VI_VISEL 0xCC00206E +#define VI_VISEL ((void __iomem *)0xcc00206e) #define VI_VISEL_PROGRESSIVE (1 << 0) -static volatile u32 *vi_regs = (volatile u32 *)0xCC002000; +static volatile u32 *vi_regs = (volatile u32 __iomem *)0xcc002000; static u32 pseudo_palette[17]; @@ -780,8 +780,11 @@ goto err_alloc_cmap; } - /* setup the framebuffer address */ - gcnfb_restorefb(&gcnfb_info); + if (request_irq + (VI_IRQ, gcnfb_vi_irq_handler, SA_INTERRUPT, "VI Line", 0)) { + printk(KERN_ERR "Unable to register IRQ %u\n", VI_IRQ); + goto err_request_irq; + } /* now register us */ if (register_framebuffer(&gcnfb_info) < 0) { @@ -789,10 +792,8 @@ goto err_register_framebuffer; } - if (request_irq - (VI_IRQ, gcnfb_vi_irq_handler, SA_INTERRUPT, "VI Line", 0)) { - printk(KERN_ERR "Unable to register IRQ %u\n", VI_IRQ); - } + /* setup the framebuffer address */ + gcnfb_restorefb(&gcnfb_info); if ((err = gcngx_init(&gcnfb_info))) { goto err_gcngx_init; @@ -804,9 +805,10 @@ return 0; err_gcngx_init: - free_irq(VI_IRQ, 0); unregister_framebuffer(&gcnfb_info); err_register_framebuffer: + free_irq(VI_IRQ, 0); +err_request_irq: fb_dealloc_cmap(&gcnfb_info.cmap); err_alloc_cmap: iounmap(gcnfb_info.screen_base); |
|
From: <he...@us...> - 2005-01-06 20:13:06
|
Update of /cvsroot/gc-linux/linux/drivers/exi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29563/drivers/exi Modified Files: gcn-exi-lite.c Log Message: Add __iomem annotations. Do not use shared IRQs, or we'll fail. (We still do not use a real device here). Fix copyright dates. Introduce Scream|CT's new comming exi framework. Index: gcn-exi-lite.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/exi/gcn-exi-lite.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gcn-exi-lite.c 19 Oct 2004 22:49:40 -0000 1.1 +++ gcn-exi-lite.c 6 Jan 2005 20:12:55 -0000 1.2 @@ -2,10 +2,10 @@ * drivers/exi/gcn_exi_lite.c * * Nintendo GameCube EXpansion Interface support, "lite" version. - * Copyright (C) 2004 The GameCube Linux Team + * Copyright (C) 2004-2005 The GameCube Linux Team * * Partly, depends on existing work by tmbinc. - * This code will be replaced by apgo's EXI framework, when available. + * This code will be replaced by Scream|CT's EXI framework, available soon. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -245,7 +245,7 @@ event->data = data; /* ack and enable interrupts */ - unsigned long reg = EXI_CSR_BASE + channel * 0x14; + void __iomem *reg = (void __iomem *)(EXI_CSR_BASE + channel * 0x14); unsigned long csr = readl(reg); switch (event_id) { case EXI_EVENT_INSERT: @@ -282,7 +282,7 @@ event->data = 0; /* ack and disable interrupts */ - unsigned long reg = EXI_CSR_BASE + channel * 0x14; + void __iomem *reg = (void __iomem *)(EXI_CSR_BASE + channel * 0x14); unsigned long csr = readl(reg); switch (event_id) { case EXI_EVENT_INSERT: @@ -310,13 +310,14 @@ { struct exi_private *priv = exi_priv(); - register unsigned long reg, csr, status, mask; + register unsigned long csr, status, mask; + void __iomem *reg; register int channel; spin_lock(&priv->lock); for (channel = 0; channel < EXI_MAX_CHANNELS; channel++) { - reg = EXI_CSR_BASE + channel * 0x14; + reg = (void __iomem *)(EXI_CSR_BASE + channel * 0x14); csr = readl(reg); mask = csr & (EXI_CSR_EXTINTMASK | EXI_CSR_TCINTMASK | EXI_CSR_EXIINTMASK); @@ -350,7 +351,7 @@ spin_lock_init(priv->lock); spin_lock_init(priv->select_lock); - err = request_irq(EXI_IRQ, exi_irq_handler, SA_SHIRQ, "exi", NULL); + err = request_irq(EXI_IRQ, exi_irq_handler, 0, "exi", NULL); if (err) { exi_printk(KERN_ERR, "request of irq%d failed\n", EXI_IRQ); } |
|
From: <he...@us...> - 2005-01-06 20:08:32
|
Update of /cvsroot/gc-linux/linux/drivers/block In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29249/drivers/block Modified Files: gcn-sd.c Log Message: Comment out unused function, avoiding compiler warning. Update copyright dates. Index: gcn-sd.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-sd.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gcn-sd.c 10 Dec 2004 12:23:34 -0000 1.1 +++ gcn-sd.c 6 Jan 2005 20:08:21 -0000 1.2 @@ -2,9 +2,8 @@ * drivers/block/gcn-sd.c * * Nintendo GameCube SD/MMC memory card driver - * Copyright (C) 2004 The GameCube Linux Team - * - * Copyright (C) 2004 by Rob Reilink (ro...@re...) + * Copyright (C) 2004-2005 The GameCube Linux Team + * Copyright (C) 2004,2005 by Rob Reilink (ro...@re...) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -225,6 +224,7 @@ return FAIL; } +#if 0 static int gcn_sd_read_csd(void) { unsigned char c; unsigned char data[16]; @@ -252,6 +252,7 @@ return SUCCESS; } +#endif static int gcn_sd_block_read(unsigned long sector,void * data) { unsigned char c; |
|
From: <he...@us...> - 2005-01-06 20:06:54
|
Update of /cvsroot/gc-linux/linux/arch/ppc/platforms In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28881/arch/ppc/platforms Modified Files: gcn-rsw.c Log Message: Fix module license. Update copyright dates. Index: gcn-rsw.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gcn-rsw.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gcn-rsw.c 19 Oct 2004 23:36:54 -0000 1.1 +++ gcn-rsw.c 6 Jan 2005 20:06:45 -0000 1.2 @@ -2,9 +2,9 @@ * arch/ppc/platforms/gcn-rsw.c * * Nintendo GameCube reset switch driver + * Copyright (C) 2004-2005 The GameCube Linux Team * Copyright (C) 2004 Stefan Esser - * Copyright (C) 2004 Albert Herranz - * Copyright (C) 2004 The GameCube Linux Team + * Copyright (C) 2004,2005 Albert Herranz * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -52,7 +52,7 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION); MODULE_AUTHOR(DRV_AUTHOR); -MODULE_LICENSE(GPL); +MODULE_LICENSE("GPL"); #define PFX DRV_MODULE_NAME ": " #define rsw_printk(level, format, arg...) \ |
|
From: <he...@us...> - 2005-01-06 20:04:33
|
Update of /cvsroot/gc-linux/linux/arch/ppc/platforms In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28158/arch/ppc/platforms Modified Files: gcn-dvdcover.c Log Message: Use __iomem annotations. Fix module license. Slightly arrange the code, no functional changes. Update copyright dates. Index: gcn-dvdcover.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gcn-dvdcover.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gcn-dvdcover.c 19 Oct 2004 23:36:54 -0000 1.1 +++ gcn-dvdcover.c 6 Jan 2005 20:04:20 -0000 1.2 @@ -2,8 +2,9 @@ * arch/ppc/platforms/gcn-dvdcover.c * * Nintendo GameCube DVD cover driver + * Copyright (C) 2004-2005 The GameCube Linux Team * Copyright (C) 2004 Stefan Esser - * Copyright (C) 2004 The GameCube Linux Team + * Copyright (C) 2004,2005 Albert Herranz * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -21,7 +22,8 @@ #define DVD_IRQ 2 -#define DI_DISR 0xcc006000 /* DI Status Register */ +/* DI Status Register */ +#define DI_DISR ((void __iomem *)0xcc006000) #define DI_DISR_BRKINT (1<<6) #define DI_DISR_BRKINTMASK (1<<5) #define DI_DISR_TCINT (1<<4) @@ -30,14 +32,17 @@ #define DI_DISR_DEINTMASK (1<<1) #define DI_DISR_BRK (1<<0) -#define DI_DICVR 0xcc006004 /* DI Cover Register */ +/* DI Cover Register */ +#define DI_DICVR ((void __iomem *)0xcc006004) #define DI_DICVR_CVRINT (1<<2) #define DI_DICVR_CVRINTMASK (1<<1) #define DI_DICVR_CVR (1<<0) -#define DI_DICMDBUF0 0xcc006008 /* DI Command Buffer 0 */ +/* DI Command Buffer 0 */ +#define DI_DICMDBUF0 ((void __iomem *)0xcc006008) -#define DI_DICR 0xcc00601c /* DI Control Register */ +/* DI Control Register */ +#define DI_DICR ((void __iomem *)0xcc00601c) #define DI_DICR_RW (1<<2) #define DI_DICR_DMA (1<<1) #define DI_DICR_TSTART (1<<0) @@ -51,12 +56,19 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION); MODULE_AUTHOR(DRV_AUTHOR); -MODULE_LICENSE(GPL); +MODULE_LICENSE("GPL"); #define PFX DRV_MODULE_NAME ": " #define di_printk(level, format, arg...) \ printk(level PFX format , ## arg) +typedef enum { + OPENED = 0, + CLOSED, + UNKNOWN, +} gcn_dvdcover_state_t; + +gcn_dvdcover_state_t gcn_dvdcover_state = UNKNOWN; /** * @@ -66,12 +78,16 @@ { unsigned long reason = readl(DI_DICVR); + gcn_dvdcover_state = (readl(DI_DICVR) & DI_DICVR_CVR)? + OPENED:CLOSED; + + di_printk(KERN_INFO, "DVD cover was %s.\n", + (gcn_dvdcover_state == OPENED) ? + "opened" : "closed"); + /* handle only DVD cover interrupts here */ if (reason & DI_DICVR_CVRINT) { writel(reason | DI_DICVR_CVRINT, DI_DICVR); - di_printk(KERN_INFO, "DVD cover was %s.\n", - (reason & DI_DICVR_CVR) ? "opened" : "closed"); - return IRQ_HANDLED; } return IRQ_NONE; |
|
From: <he...@us...> - 2005-01-06 20:01:08
|
Update of /cvsroot/gc-linux/linux/arch/ppc/platforms In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27156/arch/ppc/platforms Modified Files: gcn-con.c Log Message: Use too the preconfigured number of lines on the debug framebuffer. Update copyright dates. Index: gcn-con.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gcn-con.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gcn-con.c 4 Jan 2005 22:09:09 -0000 1.2 +++ gcn-con.c 6 Jan 2005 19:59:56 -0000 1.3 @@ -2,7 +2,7 @@ * arch/ppc/platforms/gcn-con.c * * Nintendo GameCube early debug console - * Copyright (C) 2004 The GameCube Linux Team + * Copyright (C) 2004-2005 The GameCube Linux Team * * Based on console.c by tmbinc. * @@ -220,7 +220,7 @@ void gcn_con_init(void) { console_init(&gcn_con_data, (void *)(0xd0000000 | GCN_XFB_START), - 640, 576, 640 * 2); + 640, GCN_VIDEO_LINES, 640 * 2); gcn_con_puts("gcn-con: console initialized.\n"); gcn_con.write = gcn_con_write; |
|
From: <he...@us...> - 2005-01-06 19:58:09
|
Update of /cvsroot/gc-linux/linux/arch/ppc/platforms In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25422/arch/ppc/platforms Modified Files: gamecube.c gamecube.h Log Message: We use now the new generic hard irq subsystem, thus we need to add the necessary irq hooks. Add new __iomem anotations to avoid compiler warnings. Do not use a potentially dangerous changing memory map due to changes in the size (number of lines) of the framebuffer. Do not reserve memory for non configured options. Update copyright dates. Index: gamecube.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gamecube.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- gamecube.c 4 Jan 2005 23:30:44 -0000 1.27 +++ gamecube.c 6 Jan 2005 19:57:53 -0000 1.28 @@ -2,7 +2,7 @@ * arch/ppc/platforms/gamecube.c * * Nintendo GameCube board-specific support - * Copyright (C) 2004 The GameCube Linux Team + * Copyright (C) 2004-2005 The GameCube Linux Team * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -105,11 +105,19 @@ set_bit(irq, FLIPPER_IMR); } +static void flipper_end_irq(unsigned int irq) +{ + if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)) + && irq_desc[irq].action) + flipper_unmask_irq(irq); +} + static struct hw_interrupt_type flipper_pic = { .typename = " FLIPPER-PIC ", .enable = flipper_unmask_irq, .disable = flipper_mask_irq, .ack = flipper_mask_and_ack_irq, + .end = flipper_end_irq, }; static void __init gamecube_init_IRQ(void) Index: gamecube.h =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gamecube.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- gamecube.h 4 Jan 2005 23:30:44 -0000 1.11 +++ gamecube.h 6 Jan 2005 19:57:53 -0000 1.12 @@ -2,7 +2,7 @@ * arch/ppc/platforms/gamecube.h * * Nintendo GameCube board-specific definitions - * Copyright (C) 2004 The GameCube Linux Team + * Copyright (C) 2004-2005 The GameCube Linux Team * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -25,13 +25,13 @@ * asserting the corresponding bit in ICR. */ #define FLIPPER_NR_IRQS (14) -#define FLIPPER_ICR ((volatile ulong *)0xcc003000) -#define FLIPPER_IMR ((volatile ulong *)0xcc003004) +#define FLIPPER_ICR ((void __iomem *)0xcc003000) +#define FLIPPER_IMR ((void __iomem *)0xcc003004) /* * Anything written here automagically puts us through reset. */ -#define FLIPPER_RESET ((volatile ulong *)0xcc003024) +#define FLIPPER_RESET ((void __iomem *)0xcc003024) /* * This is the current memory layout for the GameCube Linux port. @@ -44,7 +44,7 @@ * . . * . . * +------------------------------+ GCN_XFB_START - * | GX Fifo reserved 256k | GCN_GX_FIFO_END + * | GX FIFO reserved 256k | GCN_GX_FIFO_END * . . * +------------------------------+ GCN_GX_FIFO_START * | kexec reserved 4x4096 bytes | GCN_KXC_END @@ -64,18 +64,44 @@ */ /* - * Some useful sizes + * XXX + * It seems not a good idea to hot change the memory map by simply + * changing a video register. + * Be conservative here, and assume we're using (or will use) the bigger + * of the two framebuffer sizes supported. + */ +//#define GCN_VIDEO_REG (*((volatile u16*)0xCC002002)) +//#define GCN_VIDEO_LINES (((GCN_VIDEO_REG >> 8) & 3) ? 576 : 480) +#define GCN_VIDEO_LINES 576 + +/* + * Total amount of RAM found in the system */ -#define GCN_VIDEO_REG (*((volatile u16*)0xCC002002)) -#define GCN_VIDEO_LINES (((GCN_VIDEO_REG >> 8) & 3) ? 576 : 480) -#define GCN_GX_FIFO_SIZE (256*1024) #define GCN_RAM_SIZE (24*1024*1024) /* 24 MB */ -#define GCN_XFB_SIZE (640*GCN_VIDEO_LINES*4) /* framebuffer */ + +/* + * Size of reserved memory for the video subsystem + */ +#ifdef CONFIG_FB_GAMECUBE + #define GCN_XFB_SIZE (2*640*GCN_VIDEO_LINES*2) /* framebuffer */ + #define GCN_GX_FIFO_SIZE (256*1024) +#else + #define GCN_XFB_SIZE (0) + #define GCN_GX_FIFO_SIZE (0) +#endif + +/* + * Size of reserved memory for kexec compatibility with some homebrew DOLs + */ #ifdef CONFIG_KEXEC #define GCN_KXC_SIZE (4*4096) /* PAGE_ALIGN(GCN_PRESERVE_SIZE) */ #else #define GCN_KXC_SIZE (0) #endif + +/* + * Amount of useable memory + */ #define GCN_MEM_SIZE (GCN_MEM_END+1) /* @@ -102,8 +128,8 @@ /* * These registers control where the visible framebuffer is located. */ -#define GCN_VI_TFBL 0xcc00201c -#define GCN_VI_BFBL 0xcc002024 +#define GCN_VI_TFBL ((void __iomem *)0xcc00201c) +#define GCN_VI_BFBL ((void __iomem *)0xcc002024) /* arch/ppc/platforms/gcn-time.c */ |
|
From: <aot...@us...> - 2005-01-04 23:31:31
|
Update of /cvsroot/gc-linux/linux/arch/ppc/platforms In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14929/arch/ppc/platforms Modified Files: gamecube.c gamecube.h Log Message: Isolate majority of register definitions and function declarations back into arch/ppc/platforms/gamecube.h Index: gamecube.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gamecube.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- gamecube.c 4 Jan 2005 22:42:25 -0000 1.26 +++ gamecube.c 4 Jan 2005 23:30:44 -0000 1.27 @@ -27,44 +27,13 @@ #include "gamecube.h" /* - * There are 14 IRQs in total. Each has a corresponding bit in both - * the Interrupt Cause (ICR) and Interrupt Mask (IMR) registers. - * - * Enabling/disabling an interrupt line involves asserting/clearing - * the corresponding bit in IMR. ACK'ing a request simply involves - * asserting the corresponding bit in ICR. - */ -#define FLIPPER_NR_IRQS 14 -#define FLIPPER_ICR ((volatile ulong *)0xcc003000) -#define FLIPPER_IMR ((volatile ulong *)0xcc003004) - -/* - * Anything written here automagically puts us through reset. - */ -#define GCN_PI_RESET 0xcc003024 - -/* - * These registers control where the visible framebuffer is located. - */ -#define GCN_VI_TFBL 0xcc00201c -#define GCN_VI_BFBL 0xcc002024 - -/* - * We happen to be ISA/PCI-free, hence the !CONFIG_PCI. These - * are here only to avoid the accompanying compile breakage. + * We happen to be ISA/PCI-free, hence !CONFIG_PCI. These + * are only here to avoid the accompanying compile breakage. */ unsigned long isa_io_base = 0; unsigned long isa_mem_base = 0; unsigned long pci_dram_offset = 0; -/* from arch/ppc/platforms/gcn-time.c */ -extern long gcn_time_init(void) __init; -extern unsigned long gcn_get_rtc_time(void); -extern int gcn_set_rtc_time(unsigned long nowtime); - -/* from arch/ppc/platforms/gcn-con.c */ -extern void gcn_con_init(void); - static unsigned long gamecube_find_end_of_memory(void) { @@ -83,7 +52,7 @@ static void gamecube_restart(char *cmd) { local_irq_disable(); - writeb(0x00, GCN_PI_RESET); + writeb(0x00, FLIPPER_RESET); } static void gamecube_power_off(void) Index: gamecube.h =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gamecube.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- gamecube.h 22 Oct 2004 19:42:03 -0000 1.10 +++ gamecube.h 4 Jan 2005 23:30:44 -0000 1.11 @@ -17,6 +17,23 @@ #include <asm/ppcboot.h> /* + * There are 14 IRQs in total. Each has a corresponding bit in both + * the Interrupt Cause (ICR) and Interrupt Mask (IMR) registers. + * + * Enabling/disabling an interrupt line involves asserting/clearing + * the corresponding bit in IMR. ACK'ing a request simply involves + * asserting the corresponding bit in ICR. + */ +#define FLIPPER_NR_IRQS (14) +#define FLIPPER_ICR ((volatile ulong *)0xcc003000) +#define FLIPPER_IMR ((volatile ulong *)0xcc003004) + +/* + * Anything written here automagically puts us through reset. + */ +#define FLIPPER_RESET ((volatile ulong *)0xcc003024) + +/* * This is the current memory layout for the GameCube Linux port. * * +------------------------------+ @@ -82,5 +99,19 @@ #define GCN_PRESERVE_TO (GCN_KXC_START) #define GCN_PRESERVE_SIZE (GCN_PRESERVE_END+1) -#endif /* !__MACH_GAMECUBE_H */ +/* + * These registers control where the visible framebuffer is located. + */ +#define GCN_VI_TFBL 0xcc00201c +#define GCN_VI_BFBL 0xcc002024 + + +/* arch/ppc/platforms/gcn-time.c */ +extern long gcn_time_init(void); +extern unsigned long gcn_get_rtc_time(void); +extern int gcn_set_rtc_time(unsigned long nowtime); +/* arch/ppc/platforms/gcn-con.c */ +extern void gcn_con_init(void); + +#endif /* !__MACH_GAMECUBE_H */ |
|
From: Albert H. <alb...@ya...> - 2005-01-04 23:29:54
|
> > #ifdef CONFIG_FRAMEBUFFER_CONSOLE
> > acquire_console_sem();
> > - update_screen(info->currcon);
> > +/* update_screen(info->currcon);*/
> > unblank_screen();
> > release_console_sem();
> > #endif
>
> struct fb_info.currcon was moved into fbcon-specific
> code, effectively
> making it invisible to drivers. I don't know how
> killing this off
> entirely semantically affects things, so I stuck
> with simply commenting
> it out. Just a heads-up.
You may change it to:
#ifdef CONFIG_FRAMEBUFFER_CONSOLE
acquire_console_sem();
update_screen(fg_console);
unblank_screen();
release_console_sem();
#endif
Cheers,
Albert
______________________________________________
Renovamos el Correo Yahoo!: ¡250 MB GRATIS!
Nuevos servicios, más seguridad
http://correo.yahoo.es
|
|
From: <a.o...@bl...> - 2005-01-04 23:11:02
|
On Tue, Jan 04, 2005 at 01:41:07PM -0800, aot...@us... wrote: > Update of /cvsroot/gc-linux/linux/drivers/video > In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24768/drivers/video > > Modified Files: > Kconfig Makefile gcngx.c > Log Message: > Merge 2.6.10 > > Index: gcngx.c > =================================================================== > RCS file: /cvsroot/gc-linux/linux/drivers/video/gcngx.c,v > retrieving revision 1.1 > retrieving revision 1.2 > diff -u -d -r1.1 -r1.2 > --- gcngx.c 22 Oct 2004 20:51:16 -0000 1.1 > +++ gcngx.c 4 Jan 2005 21:39:30 -0000 1.2 > @@ -283,7 +283,7 @@ > gcnfb_restorefb(info); > #ifdef CONFIG_FRAMEBUFFER_CONSOLE > acquire_console_sem(); > - update_screen(info->currcon); > +/* update_screen(info->currcon);*/ > unblank_screen(); > release_console_sem(); > #endif struct fb_info.currcon was moved into fbcon-specific code, effectively making it invisible to drivers. I don't know how killing this off entirely semantically affects things, so I stuck with simply commenting it out. Just a heads-up. Arthur |
|
From: <aot...@us...> - 2005-01-04 22:42:53
|
Update of /cvsroot/gc-linux/linux/arch/ppc/platforms In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5827/arch/ppc/platforms Modified Files: gamecube.c Log Message: We #include'ed <linux/console.h> only for `conswitchp', and that is long gone now. Index: gamecube.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gamecube.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- gamecube.c 4 Jan 2005 22:38:02 -0000 1.25 +++ gamecube.c 4 Jan 2005 22:42:25 -0000 1.26 @@ -13,7 +13,6 @@ #include <linux/init.h> #include <linux/config.h> -#include <linux/console.h> #include <linux/irq.h> #include <linux/initrd.h> #include <linux/seq_file.h> |
|
From: <aot...@us...> - 2005-01-04 22:38:29
|
Update of /cvsroot/gc-linux/linux/arch/ppc/platforms In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4896/arch/ppc/platforms Modified Files: gamecube.c Log Message: - Rename platform hooks back to the more intuitive gamecube_* - Documentation/CodingStyle fixups Index: gamecube.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gamecube.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- gamecube.c 4 Jan 2005 22:09:05 -0000 1.24 +++ gamecube.c 4 Jan 2005 22:38:02 -0000 1.25 @@ -58,7 +58,6 @@ unsigned long isa_mem_base = 0; unsigned long pci_dram_offset = 0; - /* from arch/ppc/platforms/gcn-time.c */ extern long gcn_time_init(void) __init; extern unsigned long gcn_get_rtc_time(void); @@ -67,14 +66,13 @@ /* from arch/ppc/platforms/gcn-con.c */ extern void gcn_con_init(void); -unsigned long -gcn_find_end_of_memory(void) + +static unsigned long gamecube_find_end_of_memory(void) { return GCN_MEM_SIZE; } -void __init -gcn_map_io(void) +static void __init gamecube_map_io(void) { /* all RAM and more ??? */ io_block_mapping(0xd0000000, 0, 0x02000000, _PAGE_IO); @@ -83,28 +81,24 @@ io_block_mapping(0xcc000000, 0x0c000000, 0x00100000, _PAGE_IO); } -static void -gcn_restart(char *cmd) +static void gamecube_restart(char *cmd) { local_irq_disable(); writeb(0x00, GCN_PI_RESET); } -static void -gcn_power_off(void) +static void gamecube_power_off(void) { local_irq_disable(); - for (;;); /* Wait until power button depressed */ + for (;;); /* spin until power button pressed */ } -static void -gcn_halt(void) +static void gamecube_halt(void) { - gcn_restart(NULL); + gamecube_restart(NULL); } -void __init -gcn_calibrate_decr(void) +static void __init gamecube_calibrate_decr(void) { int freq, divisor; freq = 162000000; @@ -113,8 +107,7 @@ tb_to_us = mulhwu_scale_factor(freq/divisor, 1000000); } -static int -gcn_get_irq(struct pt_regs *regs) +static int gamecube_get_irq(struct pt_regs *regs) { int irq; u32 irq_status; @@ -128,21 +121,18 @@ return (31 - irq); } -static void -flipper_mask_and_ack_irq(unsigned int irq) +static void flipper_mask_and_ack_irq(unsigned int irq) { clear_bit(irq, FLIPPER_IMR); set_bit(irq, FLIPPER_ICR); } -static void -flipper_mask_irq(unsigned int irq) +static void flipper_mask_irq(unsigned int irq) { clear_bit(irq, FLIPPER_IMR); } -static void -flipper_unmask_irq(unsigned int irq) +static void flipper_unmask_irq(unsigned int irq) { set_bit(irq, FLIPPER_IMR); } @@ -154,8 +144,7 @@ .ack = flipper_mask_and_ack_irq, }; -static void __init -gcn_init_IRQ(void) +static void __init gamecube_init_IRQ(void) { int i; @@ -167,8 +156,7 @@ irq_desc[i].handler = &flipper_pic; } -static int -gcn_show_cpuinfo(struct seq_file *m) +static int gamecube_show_cpuinfo(struct seq_file *m) { seq_printf(m, "vendor\t\t: IBM\n"); seq_printf(m, "machine\t\t: Nintendo GameCube\n"); @@ -178,11 +166,11 @@ seq_printf(m, "bus speed\t: 162 MHz\n"); seq_printf(m, "mem bus speed\t: 200 MHz\n"); seq_printf(m, "bus width\t: 64 bit\n"); + return 0; } -static void __init -gcn_setup_arch(void) +static void __init gamecube_setup_arch(void) { #ifdef CONFIG_GAMECUBE_CONSOLE #if (GCN_XFB_START <= 0x00fffe00) @@ -208,23 +196,22 @@ } #endif - ppc_md.setup_arch = gcn_setup_arch; - ppc_md.show_cpuinfo = gcn_show_cpuinfo; + ppc_md.setup_arch = gamecube_setup_arch; + ppc_md.show_cpuinfo = gamecube_show_cpuinfo; - ppc_md.init_IRQ = gcn_init_IRQ; - ppc_md.get_irq = gcn_get_irq; + ppc_md.init_IRQ = gamecube_init_IRQ; + ppc_md.get_irq = gamecube_get_irq; - ppc_md.restart = gcn_restart; - ppc_md.power_off = gcn_power_off; - ppc_md.halt = gcn_halt; + ppc_md.restart = gamecube_restart; + ppc_md.power_off = gamecube_power_off; + ppc_md.halt = gamecube_halt; - ppc_md.calibrate_decr = gcn_calibrate_decr; + ppc_md.calibrate_decr = gamecube_calibrate_decr; - ppc_md.find_end_of_memory = gcn_find_end_of_memory; - ppc_md.setup_io_mappings = gcn_map_io; + ppc_md.find_end_of_memory = gamecube_find_end_of_memory; + ppc_md.setup_io_mappings = gamecube_map_io; - ppc_md.time_init = gcn_time_init; - ppc_md.set_rtc_time = gcn_set_rtc_time; - ppc_md.get_rtc_time = gcn_get_rtc_time; + ppc_md.time_init = gcn_time_init; + ppc_md.set_rtc_time = gcn_set_rtc_time; + ppc_md.get_rtc_time = gcn_get_rtc_time; } - |
|
From: <aot...@us...> - 2005-01-04 22:09:44
|
Update of /cvsroot/gc-linux/linux/arch/ppc/platforms In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32107/arch/ppc/platforms Modified Files: gamecube.c gcn-con.c Removed Files: gcn-con.h Log Message: Kill off arch/ppc/platforms/gcn-con.h; the only thing we needed in there was gcn_con_init(), now declared in arch/ppc/platforms/gamecube.c (This should eventually move to drivers/video/console/) Index: gamecube.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gamecube.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- gamecube.c 22 Oct 2004 19:42:03 -0000 1.23 +++ gamecube.c 4 Jan 2005 22:09:05 -0000 1.24 @@ -26,7 +26,6 @@ #include <asm/pgtable.h> #include "gamecube.h" -#include "gcn-con.h" /* * There are 14 IRQs in total. Each has a corresponding bit in both @@ -65,6 +64,8 @@ extern unsigned long gcn_get_rtc_time(void); extern int gcn_set_rtc_time(unsigned long nowtime); +/* from arch/ppc/platforms/gcn-con.c */ +extern void gcn_con_init(void); unsigned long gcn_find_end_of_memory(void) Index: gcn-con.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gcn-con.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gcn-con.c 19 Oct 2004 23:36:54 -0000 1.1 +++ gcn-con.c 4 Jan 2005 22:09:09 -0000 1.2 @@ -19,7 +19,6 @@ #include <linux/cache.h> #include "gamecube.h" -#include "gcn-con.h" extern struct font_desc font_vga_8x16; --- gcn-con.h DELETED --- |
|
From: <aot...@us...> - 2005-01-04 21:41:17
|
Update of /cvsroot/gc-linux/linux/drivers/video In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24768/drivers/video Modified Files: Kconfig Makefile gcngx.c Log Message: Merge 2.6.10 Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Kconfig 20 Oct 2004 00:07:40 -0000 1.10 +++ Kconfig 4 Jan 2005 21:39:29 -0000 1.11 @@ -41,7 +41,7 @@ config FB_MODE_HELPERS bool "Enable Video Mode Handling Helpers" depends on FB - default y + default n ---help--- This enables functions for handling video modes using the Generalized Timing Formula and the EDID parser. A few drivers rely @@ -49,6 +49,24 @@ your driver does not take advantage of this feature, choosing Y will just increase the kernel size by about 5K. +config FB_TILEBLITTING + bool "Enable Tile Blitting Support" + depends on FB + default n + ---help--- + This enables tile blitting. Tile blitting is a drawing technique + where the screen is divided into rectangular sections (tiles), whereas + the standard blitting divides the screen into pixels. Because the + default drawing element is a tile, drawing functions will be passed + parameters in terms of number of tiles instead of number of pixels. + For example, to draw a single character, instead of using bitmaps, + an index to an array of bitmaps will be used. To clear or move a + rectangular section of a screen, the rectangle will be described in + terms of number of tiles in the x- and y-axis. + + This is particularly important to one driver, matroxfb. If + unsure, say N. + config FB_CIRRUS tristate "Cirrus Logic support" depends on FB && (ZORRO || PCI) @@ -499,6 +517,27 @@ If unsure, say N. +config FB_INTEL + tristate "Intel 830M/845G/852GM/855GM/865G support (EXPERIMENTAL)" + depends on FB && EXPERIMENTAL && PCI && X86 && !X86_64 + select AGP + select AGP_INTEL + help + This driver supports the on-board graphics built in to the Intel + 830M/845G/852GM/855GM/865G chipsets. + Say Y if you have and plan to use such a board. + + To compile this driver as a module, choose M here: the + module will be called intelfb. + +config FB_INTEL_DEBUG + bool "Intel driver Debug Messages" + depends on FB_INTEL + ---help--- + Say Y here if you want the Intel driver to output all sorts + of debugging informations to provide to the maintainer when + something goes wrong. + config FB_MATROX tristate "Matrox acceleration" depends on FB && PCI @@ -732,6 +771,19 @@ framebuffer device. The ATI product support page for these boards is at <http://support.ati.com/products/pc/mach64/>. +config FB_ATY_GENERIC_LCD + bool "Mach64 generic LCD support (EXPERIMENTAL)" + depends on FB_ATY_CT + help + Say Y if you have a laptop with an ATI Rage LT PRO, Rage Mobility, + Rage XC, or Rage XL chipset. + +config FB_ATY_XL_INIT + bool "Rage XL No-BIOS Init support" + depends on FB_ATY_CT + help + Say Y here to support booting a Rage XL without BIOS support. + config FB_ATY_GX bool "Mach64 GX support" if PCI depends on FB_ATY @@ -743,11 +795,41 @@ is at <http://support.ati.com/products/pc/mach64/graphics_xpression.html>. -config FB_ATY_XL_INIT - bool " Rage XL No-BIOS Init support" if FB_ATY_CT - depends on FB_ATY +config FB_SAVAGE + tristate "S3 Savage support" + depends on FB && PCI && EXPERIMENTAL + select I2C_ALGOBIT if FB_SAVAGE_I2C + select I2C if FB_SAVAGE_I2C + select FB_MODE_HELPERS help - Say Y here to support booting a Rage XL without BIOS support. + This driver supports notebooks and computers with S3 Savage PCI/AGP + chips. + + Say Y if you have such a graphics card. + + To compile this driver as a module, choose M here; the module + will be called savagefb. + +config FB_SAVAGE_I2C + tristate "Enable DDC2 Support" + depends on FB_SAVAGE + help + This enables I2C support for S3 Savage Chipsets. This is used + only for getting EDID information from the attached display + allowing for robust video mode handling and switching. + + Because fbdev-2.6 requires that drivers must be able to + independently validate video mode parameters, you should say Y + here. + +config FB_SAVAGE_ACCEL + tristate "Enable Console Acceleration" + depends on FB_SAVAGE + default n + help + This option will compile in console acceleration support. If + the resulting framebuffer console has bothersome glitches, then + choose N here. config FB_SIS tristate "SiS acceleration" Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Makefile 22 Oct 2004 19:42:04 -0000 1.10 +++ Makefile 4 Jan 2005 21:39:30 -0000 1.11 @@ -23,15 +23,20 @@ obj-$(CONFIG_FB_PM3) += pm3fb.o obj-$(CONFIG_FB_MATROX) += matrox/ cfbfillrect.o cfbcopyarea.o cfbimgblt.o -obj-$(CONFIG_FB_RIVA) += riva/ cfbimgblt.o vgastate.o +obj-$(CONFIG_FB_RIVA) += riva/ cfbimgblt.o cfbfillrect.o \ + cfbcopyarea.o vgastate.o obj-$(CONFIG_FB_ATY) += aty/ cfbcopyarea.o cfbfillrect.o cfbimgblt.o obj-$(CONFIG_FB_ATY128) += aty/ cfbcopyarea.o cfbfillrect.o cfbimgblt.o obj-$(CONFIG_FB_RADEON) += aty/ cfbcopyarea.o cfbfillrect.o cfbimgblt.o obj-$(CONFIG_FB_SIS) += sis/ cfbcopyarea.o cfbfillrect.o cfbimgblt.o obj-$(CONFIG_FB_KYRO) += kyro/ cfbfillrect.o cfbcopyarea.o cfbimgblt.o - +obj-$(CONFIG_FB_SAVAGE) += savage/ cfbfillrect.o cfbcopyarea.o \ + cfbimgblt.o obj-$(CONFIG_FB_I810) += cfbcopyarea.o cfbfillrect.o cfbimgblt.o \ vgastate.o +obj-$(CONFIG_FB_INTEL) += cfbfillrect.o cfbcopyarea.o \ + cfbimgblt.o + obj-$(CONFIG_FB_RADEON_OLD) += radeonfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_NEOMAGIC) += neofb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o vgastate.o obj-$(CONFIG_FB_VIRGE) += virgefb.o Index: gcngx.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/gcngx.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gcngx.c 22 Oct 2004 20:51:16 -0000 1.1 +++ gcngx.c 4 Jan 2005 21:39:30 -0000 1.2 @@ -283,7 +283,7 @@ gcnfb_restorefb(info); #ifdef CONFIG_FRAMEBUFFER_CONSOLE acquire_console_sem(); - update_screen(info->currcon); +/* update_screen(info->currcon);*/ unblank_screen(); release_console_sem(); #endif |
|
From: <aot...@us...> - 2005-01-04 21:41:12
|
Update of /cvsroot/gc-linux/linux/include/asm-ppc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24768/include/asm-ppc Modified Files: io.h Log Message: Merge 2.6.10 Index: io.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/asm-ppc/io.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- io.h 19 Oct 2004 09:46:10 -0000 1.4 +++ io.h 4 Jan 2005 21:39:31 -0000 1.5 @@ -3,6 +3,7 @@ #define _PPC_IO_H #include <linux/config.h> +#include <linux/string.h> #include <linux/types.h> #include <asm/page.h> @@ -41,34 +42,172 @@ #define PCI_DRAM_OFFSET pci_dram_offset #endif /* Platform-dependent I/O */ +#define ___IO_BASE ((void __iomem *)_IO_BASE) extern unsigned long isa_io_base; extern unsigned long isa_mem_base; extern unsigned long pci_dram_offset; -#define readb(addr) in_8((volatile u8 *)(addr)) -#define writeb(b,addr) out_8((volatile u8 *)(addr), (b)) +/* + * 8, 16 and 32 bit, big and little endian I/O operations, with barrier. + * + * Read operations have additional twi & isync to make sure the read + * is actually performed (i.e. the data has come back) before we start + * executing any following instructions. + */ +extern inline int in_8(volatile unsigned char __iomem *addr) +{ + int ret; + + __asm__ __volatile__( + "lbz%U1%X1 %0,%1;\n" + "twi 0,%0,0;\n" + "isync" : "=r" (ret) : "m" (*addr)); + return ret; +} + +extern inline void out_8(volatile unsigned char __iomem *addr, int val) +{ + __asm__ __volatile__("stb%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val)); +} + +extern inline int in_le16(volatile unsigned short __iomem *addr) +{ + int ret; + + __asm__ __volatile__("lhbrx %0,0,%1;\n" + "twi 0,%0,0;\n" + "isync" : "=r" (ret) : + "r" (addr), "m" (*addr)); + return ret; +} + +extern inline int in_be16(volatile unsigned short __iomem *addr) +{ + int ret; + + __asm__ __volatile__("lhz%U1%X1 %0,%1;\n" + "twi 0,%0,0;\n" + "isync" : "=r" (ret) : "m" (*addr)); + return ret; +} + +extern inline void out_le16(volatile unsigned short __iomem *addr, int val) +{ + __asm__ __volatile__("sthbrx %1,0,%2; eieio" : "=m" (*addr) : + "r" (val), "r" (addr)); +} + +extern inline void out_be16(volatile unsigned short __iomem *addr, int val) +{ + __asm__ __volatile__("sth%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val)); +} + +extern inline unsigned in_le32(volatile unsigned __iomem *addr) +{ + unsigned ret; + + __asm__ __volatile__("lwbrx %0,0,%1;\n" + "twi 0,%0,0;\n" + "isync" : "=r" (ret) : + "r" (addr), "m" (*addr)); + return ret; +} + +extern inline unsigned in_be32(volatile unsigned __iomem *addr) +{ + unsigned ret; + + __asm__ __volatile__("lwz%U1%X1 %0,%1;\n" + "twi 0,%0,0;\n" + "isync" : "=r" (ret) : "m" (*addr)); + return ret; +} + +extern inline void out_le32(volatile unsigned __iomem *addr, int val) +{ + __asm__ __volatile__("stwbrx %1,0,%2; eieio" : "=m" (*addr) : + "r" (val), "r" (addr)); +} + +extern inline void out_be32(volatile unsigned __iomem *addr, int val) +{ + __asm__ __volatile__("stw%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val)); +} + +static inline __u8 readb(volatile void __iomem *addr) +{ + return in_8(addr); +} +static inline void writeb(__u8 b, volatile void __iomem *addr) +{ + out_8(addr, b); +} #if defined(CONFIG_APUS) || defined(CONFIG_GAMECUBE) -#define readw(addr) (*(volatile u16 *) (addr)) -#define readl(addr) (*(volatile u32 *) (addr)) -#define writew(b,addr) ((*(volatile u16 *) (addr)) = (b)) -#define writel(b,addr) ((*(volatile u32 *) (addr)) = (b)) +static inline __u16 readw(volatile void __iomem *addr) +{ + return *(__force volatile __u16 *)(addr); +} +static inline __u32 readl(volatile void __iomem *addr) +{ + return *(__force volatile __u32 *)(addr); +} +static inline void writew(__u16 b, volatile void __iomem *addr) +{ + *(__force volatile __u16 *)(addr) = b; +} +static inline void writel(__u32 b, volatile void __iomem *addr) +{ + *(__force volatile __u32 *)(addr) = b; +} #else -#define readw(addr) in_le16((volatile u16 *)(addr)) -#define readl(addr) in_le32((volatile u32 *)(addr)) -#define writew(b,addr) out_le16((volatile u16 *)(addr),(b)) -#define writel(b,addr) out_le32((volatile u32 *)(addr),(b)) +static inline __u16 readw(volatile void __iomem *addr) +{ + return in_le16(addr); +} +static inline __u32 readl(volatile void __iomem *addr) +{ + return in_le32(addr); +} +static inline void writew(__u16 b, volatile void __iomem *addr) +{ + out_le16(addr, b); +} +static inline void writel(__u32 b, volatile void __iomem *addr) +{ + out_le32(addr, b); +} #endif /* CONFIG_APUS || CONFIG_GAMECUBE */ #define readb_relaxed(addr) readb(addr) #define readw_relaxed(addr) readw(addr) #define readl_relaxed(addr) readl(addr) -#define __raw_readb(addr) (*(volatile unsigned char *)(addr)) -#define __raw_readw(addr) (*(volatile unsigned short *)(addr)) -#define __raw_readl(addr) (*(volatile unsigned int *)(addr)) -#define __raw_writeb(v, addr) (*(volatile unsigned char *)(addr) = (v)) -#define __raw_writew(v, addr) (*(volatile unsigned short *)(addr) = (v)) -#define __raw_writel(v, addr) (*(volatile unsigned int *)(addr) = (v)) +static inline __u8 __raw_readb(volatile void __iomem *addr) +{ + return *(__force volatile __u8 *)(addr); +} +static inline __u16 __raw_readw(volatile void __iomem *addr) +{ + return *(__force volatile __u16 *)(addr); +} +static inline __u32 __raw_readl(volatile void __iomem *addr) +{ + return *(__force volatile __u32 *)(addr); +} +static inline void __raw_writeb(__u8 b, volatile void __iomem *addr) +{ + *(__force volatile __u8 *)(addr) = b; +} +static inline void __raw_writew(__u16 b, volatile void __iomem *addr) +{ + *(__force volatile __u16 *)(addr) = b; +} +static inline void __raw_writel(__u32 b, volatile void __iomem *addr) +{ + *(__force volatile __u32 *)(addr) = b; +} + +#define mmiowb() /* * The insw/outsw/insl/outsl macros don't do byte-swapping. @@ -76,12 +215,12 @@ * are arrays of bytes, and byte-swapping is not appropriate in * that case. - paulus */ -#define insb(port, buf, ns) _insb((u8 *)((port)+_IO_BASE), (buf), (ns)) -#define outsb(port, buf, ns) _outsb((u8 *)((port)+_IO_BASE), (buf), (ns)) -#define insw(port, buf, ns) _insw_ns((u16 *)((port)+_IO_BASE), (buf), (ns)) -#define outsw(port, buf, ns) _outsw_ns((u16 *)((port)+_IO_BASE), (buf), (ns)) -#define insl(port, buf, nl) _insl_ns((u32 *)((port)+_IO_BASE), (buf), (nl)) -#define outsl(port, buf, nl) _outsl_ns((u32 *)((port)+_IO_BASE), (buf), (nl)) +#define insb(port, buf, ns) _insb((port)+___IO_BASE, (buf), (ns)) +#define outsb(port, buf, ns) _outsb((port)+___IO_BASE, (buf), (ns)) +#define insw(port, buf, ns) _insw_ns((port)+___IO_BASE, (buf), (ns)) +#define outsw(port, buf, ns) _outsw_ns((port)+___IO_BASE, (buf), (ns)) +#define insl(port, buf, nl) _insl_ns((port)+___IO_BASE, (buf), (nl)) +#define outsl(port, buf, nl) _outsl_ns((port)+___IO_BASE, (buf), (nl)) /* * On powermacs, we will get a machine check exception if we @@ -121,7 +260,7 @@ " .long 3b,5b\n" \ ".previous" \ : "=&r" (x) \ - : "r" (port + _IO_BASE)); \ + : "r" (port + ___IO_BASE)); \ return x; \ } @@ -136,7 +275,7 @@ " .align 2\n" \ " .long 1b,2b\n" \ ".previous" \ - : : "r" (val), "r" (port + _IO_BASE)); \ + : : "r" (val), "r" (port + ___IO_BASE)); \ } __do_out_asm(outb, "stbx") @@ -148,9 +287,9 @@ __do_out_asm(outw, "sth%U0%X0") #elif defined (CONFIG_8260_PCI9) /* in asm cannot be defined if PCI9 workaround is used */ -#define inb(port) in_8((u8 *)((port)+_IO_BASE)) -#define inw(port) in_le16((u16 *)((port)+_IO_BASE)) -#define inl(port) in_le32((u32 *)((port)+_IO_BASE)) +#define inb(port) in_8((port)+___IO_BASE) +#define inw(port) in_le16((port)+___IO_BASE) +#define inl(port) in_le32((port)+___IO_BASE) __do_out_asm(outw, "sthbrx") __do_out_asm(outl, "stwbrx") #else @@ -169,46 +308,55 @@ #define inl_p(port) inl((port)) #define outl_p(val, port) outl((val), (port)) -extern void _insb(volatile u8 *port, void *buf, int ns); -extern void _outsb(volatile u8 *port, const void *buf, int ns); -extern void _insw(volatile u16 *port, void *buf, int ns); -extern void _outsw(volatile u16 *port, const void *buf, int ns); -extern void _insl(volatile u32 *port, void *buf, int nl); -extern void _outsl(volatile u32 *port, const void *buf, int nl); -extern void _insw_ns(volatile u16 *port, void *buf, int ns); -extern void _outsw_ns(volatile u16 *port, const void *buf, int ns); -extern void _insl_ns(volatile u32 *port, void *buf, int nl); -extern void _outsl_ns(volatile u32 *port, const void *buf, int nl); +extern void _insb(volatile u8 __iomem *port, void *buf, int ns); +extern void _outsb(volatile u8 __iomem *port, const void *buf, int ns); +extern void _insw(volatile u16 __iomem *port, void *buf, int ns); +extern void _outsw(volatile u16 __iomem *port, const void *buf, int ns); +extern void _insl(volatile u32 __iomem *port, void *buf, int nl); +extern void _outsl(volatile u32 __iomem *port, const void *buf, int nl); +extern void _insw_ns(volatile u16 __iomem *port, void *buf, int ns); +extern void _outsw_ns(volatile u16 __iomem *port, const void *buf, int ns); +extern void _insl_ns(volatile u32 __iomem *port, void *buf, int nl); +extern void _outsl_ns(volatile u32 __iomem *port, const void *buf, int nl); /* * The *_ns versions below don't do byte-swapping. * Neither do the standard versions now, these are just here * for older code. */ -#define insw_ns(port, buf, ns) _insw_ns((u16 *)((port)+_IO_BASE), (buf), (ns)) -#define outsw_ns(port, buf, ns) _outsw_ns((u16 *)((port)+_IO_BASE), (buf), (ns)) -#define insl_ns(port, buf, nl) _insl_ns((u32 *)((port)+_IO_BASE), (buf), (nl)) -#define outsl_ns(port, buf, nl) _outsl_ns((u32 *)((port)+_IO_BASE), (buf), (nl)) +#define insw_ns(port, buf, ns) _insw_ns((port)+___IO_BASE, (buf), (ns)) +#define outsw_ns(port, buf, ns) _outsw_ns((port)+___IO_BASE, (buf), (ns)) +#define insl_ns(port, buf, nl) _insl_ns((port)+___IO_BASE, (buf), (nl)) +#define outsl_ns(port, buf, nl) _outsl_ns((port)+___IO_BASE, (buf), (nl)) #define IO_SPACE_LIMIT ~0 -#define memset_io(a,b,c) memset((void *)(a),(b),(c)) -#define memcpy_fromio(a,b,c) memcpy((a),(void *)(b),(c)) -#define memcpy_toio(a,b,c) memcpy((void *)(a),(b),(c)) +static inline void memset_io(volatile void __iomem *addr, unsigned char val, int count) +{ + memset((void __force *)addr, val, count); +} +static inline void memcpy_fromio(void *dst, volatile void __iomem *src, int count) +{ + memcpy(dst, (void __force *) src, count); +} +static inline void memcpy_toio(volatile void __iomem *dst, const void *src, int count) +{ + memcpy((void __force *) dst, src, count); +} /* * Map in an area of physical address space, for accessing * I/O devices etc. */ -extern void *__ioremap(phys_addr_t address, unsigned long size, +extern void __iomem *__ioremap(phys_addr_t address, unsigned long size, unsigned long flags); -extern void *ioremap(phys_addr_t address, unsigned long size); +extern void __iomem *ioremap(phys_addr_t address, unsigned long size); #ifdef CONFIG_44x -extern void *ioremap64(unsigned long long address, unsigned long size); +extern void __iomem *ioremap64(unsigned long long address, unsigned long size); #endif #define ioremap_nocache(addr, size) ioremap((addr), (size)) -extern void iounmap(void *addr); +extern void iounmap(volatile void __iomem *addr); extern unsigned long iopa(unsigned long addr); extern unsigned long mm_ptov(unsigned long addr) __attribute_const__; extern void io_block_mapping(unsigned long virt, phys_addr_t phys, @@ -288,94 +436,7 @@ #define iobarrier_r() eieio() #define iobarrier_w() eieio() -/* - * 8, 16 and 32 bit, big and little endian I/O operations, with barrier. - * - * Read operations have additional twi & isync to make sure the read - * is actually performed (i.e. the data has come back) before we start - * executing any following instructions. - */ -extern inline int in_8(volatile unsigned char *addr) -{ - int ret; - - __asm__ __volatile__( - "lbz%U1%X1 %0,%1;\n" - "twi 0,%0,0;\n" - "isync" : "=r" (ret) : "m" (*addr)); - return ret; -} - -extern inline void out_8(volatile unsigned char *addr, int val) -{ - __asm__ __volatile__("stb%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val)); -} - -extern inline int in_le16(volatile unsigned short *addr) -{ - int ret; - - __asm__ __volatile__("lhbrx %0,0,%1;\n" - "twi 0,%0,0;\n" - "isync" : "=r" (ret) : - "r" (addr), "m" (*addr)); - return ret; -} - -extern inline int in_be16(volatile unsigned short *addr) -{ - int ret; - - __asm__ __volatile__("lhz%U1%X1 %0,%1;\n" - "twi 0,%0,0;\n" - "isync" : "=r" (ret) : "m" (*addr)); - return ret; -} - -extern inline void out_le16(volatile unsigned short *addr, int val) -{ - __asm__ __volatile__("sthbrx %1,0,%2; eieio" : "=m" (*addr) : - "r" (val), "r" (addr)); -} - -extern inline void out_be16(volatile unsigned short *addr, int val) -{ - __asm__ __volatile__("sth%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val)); -} - -extern inline unsigned in_le32(volatile unsigned *addr) -{ - unsigned ret; - - __asm__ __volatile__("lwbrx %0,0,%1;\n" - "twi 0,%0,0;\n" - "isync" : "=r" (ret) : - "r" (addr), "m" (*addr)); - return ret; -} - -extern inline unsigned in_be32(volatile unsigned *addr) -{ - unsigned ret; - - __asm__ __volatile__("lwz%U1%X1 %0,%1;\n" - "twi 0,%0,0;\n" - "isync" : "=r" (ret) : "m" (*addr)); - return ret; -} - -extern inline void out_le32(volatile unsigned *addr, int val) -{ - __asm__ __volatile__("stwbrx %1,0,%2; eieio" : "=m" (*addr) : - "r" (val), "r" (addr)); -} - -extern inline void out_be32(volatile unsigned *addr, int val) -{ - __asm__ __volatile__("stw%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val)); -} - -static inline int check_signature(unsigned long io_addr, +static inline int check_signature(volatile void __iomem * io_addr, const unsigned char *signature, int length) { int retval = 0; @@ -391,13 +452,6 @@ return retval; } -/* Make some pcmcia drivers happy */ -static inline int isa_check_signature(unsigned long io_addr, - const unsigned char *signature, int length) -{ - return 0; -} - /* * Here comes the ppc implementation of the IOMAP * interfaces. |
|
From: <aot...@us...> - 2005-01-04 21:41:12
|
Update of /cvsroot/gc-linux/linux/drivers/block In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24768/drivers/block Modified Files: Kconfig Makefile Log Message: Merge 2.6.10 Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/Kconfig,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Kconfig 10 Dec 2004 12:23:34 -0000 1.9 +++ Kconfig 4 Jan 2005 21:39:25 -0000 1.10 @@ -346,6 +346,8 @@ This driver supports certain USB attached storage devices such as flash keys. + Warning: Enabling this cripples the usb-storage driver. + If unsure, say N. config BLK_DEV_RAM @@ -367,6 +369,14 @@ Most normal users won't need the RAM disk functionality, and can thus say N here. +config BLK_DEV_RAM_COUNT + int "Default number of RAM disks" if BLK_DEV_RAM + default "16" + help + The default value is 16 RAM disks. Change this if you know what + are doing. If you boot from a filesystem that needs to be extracted + in memory, you will need at least one RAM disk (e.g. root on cramfs). + config BLK_DEV_RAM_SIZE int "Default RAM disk size (kbytes)" depends on BLK_DEV_RAM @@ -386,6 +396,32 @@ "real" root file system, etc. See <file:Documentation/initrd.txt> for details. +config INITRAMFS_SOURCE + string "Source directory of cpio_list" + default "" + help + This can be set to either a directory containing files, etc to be + included in the initramfs archive, or a file containing newline + separated entries. + + If it is a file, it should be in the following format: + # a comment + file <name> <location> <mode> <uid> <gid> + dir <name> <mode> <uid> <gid> + nod <name> <mode> <uid> <gid> <dev_type> <maj> <min> + + Where: + <name> name of the file/dir/nod in the archive + <location> location of the file in the current filesystem + <mode> mode/permissions of the file + <uid> user id (0=root) + <gid> group id (0=root) + <dev_type> device type (b=block, c=character) + <maj> major number of nod + <min> minor number of nod + + If you are not sure, leave it blank. + config LBD bool "Support for Large Block Devices" depends on X86 || MIPS32 || PPC32 || ARCH_S390_31 || SUPERH @@ -394,6 +430,41 @@ your machine, or if you want to have a raid or loopback device bigger than 2TB. Otherwise say N. +config CDROM_PKTCDVD + tristate "Packet writing on CD/DVD media" + help + If you have a CDROM drive that supports packet writing, say Y to + include preliminary support. It should work with any MMC/Mt Fuji + compliant ATAPI or SCSI drive, which is just about any newer CD + writer. + + Currently only writing to CD-RW, DVD-RW and DVD+RW discs is possible. + DVD-RW disks must be in restricted overwrite mode. + + To compile this driver as a module, choose M here: the + module will be called pktcdvd. + +config CDROM_PKTCDVD_BUFFERS + int "Free buffers for data gathering" + depends on CDROM_PKTCDVD + default "8" + help + This controls the maximum number of active concurrent packets. More + concurrent packets can increase write performance, but also require + more memory. Each concurrent packet will require approximately 64Kb + of non-swappable kernel memory, memory which will be allocated at + pktsetup time. + +config CDROM_PKTCDVD_WCACHE + bool "Enable write caching" + depends on CDROM_PKTCDVD + help + If enabled, write caching will be set for the CD-R/W device. For now + this option is dangerous unless the CD-RW media is known good, as we + don't do deferred write error handling yet. + source "drivers/s390/block/Kconfig" +source "drivers/block/Kconfig.iosched" + endmenu Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Makefile 10 Dec 2004 12:23:34 -0000 1.9 +++ Makefile 4 Jan 2005 21:39:29 -0000 1.10 @@ -38,6 +38,7 @@ obj-$(CONFIG_BLK_CPQ_DA) += cpqarray.o obj-$(CONFIG_BLK_CPQ_CISS_DA) += cciss.o obj-$(CONFIG_BLK_DEV_DAC960) += DAC960.o +obj-$(CONFIG_CDROM_PKTCDVD) += pktcdvd.o obj-$(CONFIG_BLK_DEV_UMEM) += umem.o obj-$(CONFIG_BLK_DEV_NBD) += nbd.o |
|
From: <aot...@us...> - 2005-01-04 21:41:12
|
Update of /cvsroot/gc-linux/linux/drivers/net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24768/drivers/net Modified Files: Kconfig Makefile Log Message: Merge 2.6.10 Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Kconfig 20 Oct 2004 00:01:16 -0000 1.10 +++ Kconfig 4 Jan 2005 21:39:29 -0000 1.11 @@ -294,7 +294,7 @@ config APNE tristate "PCMCIA NE2000 support" - depends on NETDEVICES && AMIGA_PCMCIA + depends on NET_ETHERNET && AMIGA_PCMCIA select CRC32 help If you have a PCMCIA NE2000 compatible adapter, say Y. Otherwise, @@ -305,7 +305,7 @@ config APOLLO_ELPLUS tristate "Apollo 3c505 support" - depends on NETDEVICES && APOLLO + depends on NET_ETHERNET && APOLLO help Say Y or M here if your Apollo has a 3Com 3c505 ISA Ethernet card. If you don't have one made for Apollos, you can use one from a PC, @@ -314,7 +314,7 @@ config MAC8390 bool "Macintosh NS 8390 based ethernet cards" - depends on NETDEVICES && MAC + depends on NET_ETHERNET && MAC select CRC32 help If you want to include a driver to support Nubus or LC-PDS @@ -324,7 +324,7 @@ config MAC89x0 tristate "Macintosh CS89x0 based ethernet cards" - depends on NETDEVICES && MAC && BROKEN + depends on NET_ETHERNET && MAC && BROKEN ---help--- Support for CS89x0 chipset based Ethernet cards. If you have a Nubus or LC-PDS network (Ethernet) card of this type, say Y and @@ -337,7 +337,7 @@ config MACSONIC tristate "Macintosh SONIC based ethernet (onboard, NuBus, LC, CS)" - depends on NETDEVICES && MAC + depends on NET_ETHERNET && MAC ---help--- Support for NatSemi SONIC based Ethernet devices. This includes the onboard Ethernet in many Quadras as well as some LC-PDS, @@ -351,7 +351,7 @@ config MACMACE bool "Macintosh (AV) onboard MACE ethernet (EXPERIMENTAL)" - depends on NETDEVICES && MAC && EXPERIMENTAL + depends on NET_ETHERNET && MAC && EXPERIMENTAL select CRC32 help Support for the onboard AMD 79C940 MACE Ethernet controller used in @@ -361,7 +361,7 @@ config MVME147_NET tristate "MVME147 (Lance) Ethernet support" - depends on NETDEVICES && MVME147 + depends on NET_ETHERNET && MVME147 select CRC32 help Support for the on-board Ethernet interface on the Motorola MVME147 @@ -371,7 +371,7 @@ config MVME16x_NET tristate "MVME16x Ethernet support" - depends on NETDEVICES && MVME16x + depends on NET_ETHERNET && MVME16x help This is the driver for the Ethernet interface on the Motorola MVME162, 166, 167, 172 and 177 boards. Say Y here to include the @@ -380,7 +380,7 @@ config BVME6000_NET tristate "BVME6000 Ethernet support" - depends on NETDEVICES && BVME6000 + depends on NET_ETHERNET && BVME6000 help This is the driver for the Ethernet interface on BVME4000 and BVME6000 VME boards. Say Y here to include the driver for this chip @@ -389,7 +389,7 @@ config ATARILANCE tristate "Atari Lance support" - depends on NETDEVICES && ATARI + depends on NET_ETHERNET && ATARI help Say Y to include support for several Atari Ethernet adapters based on the AMD Lance chipset: RieblCard (with or without battery), or @@ -397,7 +397,7 @@ config ATARI_BIONET tristate "BioNet-100 support" - depends on NETDEVICES && ATARI && ATARI_ACSI!=n && BROKEN + depends on NET_ETHERNET && ATARI && ATARI_ACSI && BROKEN help Say Y to include support for BioData's BioNet-100 Ethernet adapter for the ACSI port. The driver works (has to work...) with a polled @@ -405,7 +405,7 @@ config ATARI_PAMSNET tristate "PAMsNet support" - depends on NETDEVICES && ATARI && ATARI_ACSI!=n && BROKEN + depends on NET_ETHERNET && ATARI && ATARI_ACSI && BROKEN help Say Y to include support for the PAMsNet Ethernet adapter for the ACSI port ("ACSI node"). The driver works (has to work...) with a @@ -413,7 +413,7 @@ config SUN3LANCE tristate "Sun3/Sun3x on-board LANCE support" - depends on NETDEVICES && (SUN3 || SUN3X) + depends on NET_ETHERNET && (SUN3 || SUN3X) help Most Sun3 and Sun3x motherboards (including the 3/50, 3/60 and 3/80) featured an AMD Lance 10Mbit Ethernet controller on board; say Y @@ -426,7 +426,7 @@ config SUN3_82586 tristate "Sun3 on-board Intel 82586 support" - depends on NETDEVICES && SUN3 + depends on NET_ETHERNET && SUN3 help This driver enables support for the on-board Intel 82586 based Ethernet adapter found on Sun 3/1xx and 3/2xx motherboards. Note @@ -435,7 +435,7 @@ config HPLANCE bool "HP on-board LANCE support" - depends on NETDEVICES && HP300 + depends on NET_ETHERNET && DIO select CRC32 help If you want to use the builtin "LANCE" Ethernet controller on an @@ -1419,66 +1419,17 @@ depends on NET_PCI && PCI select MII ---help--- - This driver supports Intel(R) PRO/100 family of adapters, which - includes: - - Controller Adapter Name Board IDs - ---------- ------------ --------- - - 82558 PRO/100+ PCI Adapter 668081-xxx, - 689661-xxx - 82558 PRO/100+ Management Adapter 691334-xxx, - 701738-xxx, - 721383-xxx - 82558 PRO/100+ Dual Port Server Adapter 714303-xxx, - 711269-xxx, - A28276-xxx - 82558 PRO/100+ PCI Server Adapter 710550-xxx - 82550 PRO/100 S Server Adapter 752438-xxx - 82559 A56831-xxx, - A10563-xxx, - A12171-xxx, - A12321-xxx, - A12320-xxx, - A12170-xxx - 748568-xxx - 748565-xxx - 82550 PRO/100 S Desktop Adapter 751767-xxx - 82559 748592-xxx, - A12167-xxx, - A12318-xxx, - A12317-xxx, - A12165-xxx, - 748569-xxx - 82559 PRO/100+ Server Adapter 729757-xxx - 82559 PRO/100 S Management Adapter 748566-xxx, - 748564-xxx - 82550 PRO/100 S Dual Port Server Adapter A56831-xxx - 82551 PRO/100 M Desktop Adapter A80897-xxx - PRO/100 S Advanced Management Adapter - 747842-xxx, - 745171-xxx - CNR PRO/100 VE Desktop Adapter A10386-xxx, - A10725-xxx, - A23801-xxx, - A19716-xxx - PRO/100 VM Desktop Adapter A14323-xxx, - A19725-xxx, - A23801-xxx, - A22220-xxx, - A23796-xxx - - + This driver supports Intel(R) PRO/100 family of adapters. To verify that your adapter is supported, find the board ID number on the adapter. Look for a label that has a barcode and a number - in the format 123456-001 (six digits hyphen three digits). Match - this to the list of numbers above. + in the format 123456-001 (six digits hyphen three digits). - For more information on how to identify your adapter, go to the - Adapter & Driver ID Guide at: + Use the above information and the Adapter & Driver ID Guide at: http://support.intel.com/support/network/adapter/pro100/21397.htm + to identify the adapter. + For the latest Intel PRO/100 network driver for Linux, see: http://appsr.intel.com/scripts-df/support_intel.asp @@ -1748,18 +1699,6 @@ If unsure, say Y. -config VIA_VELOCITY - tristate "VIA Velocity support" - depends on NET_PCI && PCI - select CRC32 - select CRC_CCITT - select MII - help - If you have a VIA "Velocity" based network card say Y here. - - To compile this driver as a module, choose M here. The module - will be called via-velocity. - config LAN_SAA9730 bool "Philips SAA9730 Ethernet support (EXPERIMENTAL)" depends on NET_PCI && EXPERIMENTAL && MIPS @@ -1939,29 +1878,8 @@ depends on PCI ---help--- This driver supports Intel(R) PRO/1000 gigabit ethernet family of - adapters, which includes: - - Controller Adapter Name Board IDs - ---------- ------------ --------- - 82542 PRO/1000 Gigabit Server Adapter 700262-xxx, - 717037-xxx - 82543 PRO/1000 F Server Adapter 738640-xxx, - A38888-xxx - 82543 PRO/1000 T Server Adapter A19845-xxx, - A33948-xxx - 82544 PRO/1000 XT Server Adapter A51580-xxx - 82544 PRO/1000 XF Server Adapter A50484-xxx - 82544 PRO/1000 T Desktop Adapter A62947-xxx - 82540 PRO/1000 MT Desktop Adapter A78408-xxx - 82541 PRO/1000 MT Desktop Adapter C91016-xxx - 82545 PRO/1000 MT Server Adapter A92165-xxx - 82546 PRO/1000 MT Dual Port Server Adapter A92111-xxx - 82545 PRO/1000 MF Server Adapter A91622-xxx - 82545 PRO/1000 MF Server Adapter(LX) A91624-xxx - 82546 PRO/1000 MF Dual Port Server Adapter A91620-xxx - - For more information on how to identify your adapter, go to the - Adapter & Driver ID Guide at: + adapters. For more information on how to identify your adapter, go + to the Adapter & Driver ID Guide at: <http://support.intel.com/support/network/adapter/pro100/21397.htm> @@ -2146,6 +2064,18 @@ say M here and read Documentation/kbuild/modules.txt. The module will be called sk98lin. This is recommended. +config VIA_VELOCITY + tristate "VIA Velocity support" + depends on NET_PCI && PCI + select CRC32 + select CRC_CCITT + select MII + help + If you have a VIA "Velocity" based network card say Y here. + + To compile this driver as a module, choose M here. The module + will be called via-velocity. + config TIGON3 tristate "Broadcom Tigon3 support" depends on PCI @@ -2208,14 +2138,8 @@ depends on PCI ---help--- This driver supports Intel(R) PRO/10GbE family of - adapters, which includes: - - Controller Adapter Name Board IDs - ---------- ------------ --------- - 82597EX Intel(R) PRO/10GbE LR Server Adapter A82505-xxx - - For more information on how to identify your adapter, go to the - Adapter & Driver ID Guide at: + adapters. For more information on how to identify your adapter, go + to the Adapter & Driver ID Guide at: <http://support.intel.com/support/network/adapter/pro100/21397.htm> Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Makefile 20 Oct 2004 00:01:17 -0000 1.10 +++ Makefile 4 Jan 2005 21:39:29 -0000 1.11 @@ -195,5 +195,6 @@ obj-$(CONFIG_NET_TULIP) += tulip/ obj-$(CONFIG_HAMRADIO) += hamradio/ obj-$(CONFIG_IRDA) += irda/ +obj-$(CONFIG_ETRAX_ETHERNET) += cris/ obj-$(CONFIG_NETCONSOLE) += netconsole.o |
|
From: <aot...@us...> - 2005-01-04 21:41:04
|
Update of /cvsroot/gc-linux/linux/arch/ppc/boot/simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24768/arch/ppc/boot/simple Modified Files: Makefile embed_config.c misc-embedded.c Log Message: Merge 2.6.10 Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/simple/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Makefile 19 Oct 2004 09:46:08 -0000 1.9 +++ Makefile 4 Jan 2005 21:39:02 -0000 1.10 @@ -41,7 +41,7 @@ # if present on 'classic' PPC. cacheflag-y := -DCLEAR_CACHES="" # This file will flush / disable the L2, and L3 if present. -clear_L2_L3 := $(boot)/simple/clear.S +clear_L2_L3 := $(srctree)/$(boot)/simple/clear.S # # See arch/ppc/kconfig and arch/ppc/platforms/Kconfig Index: embed_config.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/simple/embed_config.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- embed_config.c 19 Oct 2004 23:18:39 -0000 1.6 +++ embed_config.c 4 Jan 2005 21:39:02 -0000 1.7 @@ -752,25 +752,25 @@ static const unsigned long line_size = 32; static const unsigned long congruence_classes = 256; unsigned long addr; - u_char *cp; - int i; + unsigned long dccr; bd_t *bd; /* - * At one point, we were getting machine checks. Linux was not - * invalidating the data cache before it was enabled. The - * following code was added to do that. Soon after we had done - * that, we found the real reasons for the machine checks. I've - * run the kernel a few times with the following code - * temporarily removed without any apparent problems. However, - * I objdump'ed the kernel and boot code and found out that - * there were no other dccci's anywhere, so I put the code back - * in and have been reluctant to remove it. It seems safer to - * just leave it here. + * Invalidate the data cache if the data cache is turned off. + * - The 405 core does not invalidate the data cache on power-up + * or reset but does turn off the data cache. We cannot assume + * that the cache contents are valid. + * - If the data cache is turned on this must have been done by + * a bootloader and we assume that the cache contents are + * valid. */ - for (addr = 0; - addr < (congruence_classes * line_size); addr += line_size) { - __asm__("dccci 0,%0": :"b"(addr)); + __asm__("mfdccr %0": "=r" (dccr)); + if (dccr == 0) { + for (addr = 0; + addr < (congruence_classes * line_size); + addr += line_size) { + __asm__("dccci 0,%0": :"b"(addr)); + } } bd = &bdinfo; @@ -778,6 +778,9 @@ bd->bi_memsize = XPAR_DDR_0_SIZE; bd->bi_intfreq = XPAR_CORE_CLOCK_FREQ_HZ; bd->bi_busfreq = XPAR_PLB_CLOCK_FREQ_HZ; + bd->bi_pci_busfreq = XPAR_PCI_0_CLOCK_FREQ_HZ; + timebase_period_ns = 1000000000 / bd->bi_tbfreq; + /* see bi_tbfreq definition in arch/ppc/platforms/4xx/xilinx_ml300.h */ } #endif /* CONFIG_XILINX_ML300 */ Index: misc-embedded.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/simple/misc-embedded.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- misc-embedded.c 19 Oct 2004 23:18:39 -0000 1.6 +++ misc-embedded.c 4 Jan 2005 21:39:03 -0000 1.7 @@ -226,7 +226,7 @@ puts("done.\n"); { struct bi_record *rec; - unsigned long initrd_loc; + unsigned long initrd_loc = 0; unsigned long rec_loc = _ALIGN((unsigned long)(zimage_size) + (1 << 20) - 1, (1 << 20)); rec = (struct bi_record *)rec_loc; |
|
From: <aot...@us...> - 2005-01-04 21:40:50
|
Update of /cvsroot/gc-linux/linux/drivers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24768/drivers Modified Files: Makefile Log Message: Merge 2.6.10 Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile 19 Oct 2004 09:46:09 -0000 1.5 +++ Makefile 4 Jan 2005 21:39:13 -0000 1.6 @@ -17,8 +17,9 @@ # default. obj-y += char/ -# i810fb depends on char/agp/ +# i810fb and intelfb depend on char/agp/ obj-$(CONFIG_FB_I810) += video/i810/ +obj-$(CONFIG_FB_INTEL) += video/intelfb/ # we also need input/serio early so serio bus is initialized by the time # serial drivers start registering their serio ports @@ -36,7 +37,7 @@ obj-$(CONFIG_IEEE1394) += ieee1394/ obj-y += cdrom/ obj-$(CONFIG_MTD) += mtd/ -obj-$(CONFIG_PCMCIA) += pcmcia/ +obj-$(CONFIG_PCCARD) += pcmcia/ obj-$(CONFIG_DIO) += dio/ obj-$(CONFIG_SBUS) += sbus/ obj-$(CONFIG_ZORRO) += zorro/ |
|
From: <aot...@us...> - 2005-01-04 21:40:50
|
Update of /cvsroot/gc-linux/linux/include/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24768/include/linux Modified Files: fb.h Log Message: Merge 2.6.10 Index: fb.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- fb.h 22 Oct 2004 19:42:04 -0000 1.9 +++ fb.h 4 Jan 2005 21:39:31 -0000 1.10 @@ -105,6 +105,7 @@ #define FB_ACCEL_I810 39 /* Intel 810/815 */ #define FB_ACCEL_SIS_GLAMOUR_2 40 /* SiS 315, 650, 740 */ #define FB_ACCEL_SIS_XABRE 41 /* SiS 330 ("Xabre") */ +#define FB_ACCEL_I830 42 /* Intel 830M/845G/85x/865G */ #define FB_ACCEL_NEOMAGIC_NM2070 90 /* NeoMagic NM2070 */ #define FB_ACCEL_NEOMAGIC_NM2090 91 /* NeoMagic NM2090 */ @@ -116,6 +117,21 @@ #define FB_ACCEL_NEOMAGIC_NM2360 97 /* NeoMagic NM2360 */ #define FB_ACCEL_NEOMAGIC_NM2380 98 /* NeoMagic NM2380 */ +#define FB_ACCEL_SAVAGE4 0x80 /* S3 Savage4 */ +#define FB_ACCEL_SAVAGE3D 0x81 /* S3 Savage3D */ +#define FB_ACCEL_SAVAGE3D_MV 0x82 /* S3 Savage3D-MV */ +#define FB_ACCEL_SAVAGE2000 0x83 /* S3 Savage2000 */ +#define FB_ACCEL_SAVAGE_MX_MV 0x84 /* S3 Savage/MX-MV */ +#define FB_ACCEL_SAVAGE_MX 0x85 /* S3 Savage/MX */ +#define FB_ACCEL_SAVAGE_IX_MV 0x86 /* S3 Savage/IX-MV */ +#define FB_ACCEL_SAVAGE_IX 0x87 /* S3 Savage/IX */ +#define FB_ACCEL_PROSAVAGE_PM 0x88 /* S3 ProSavage PM133 */ +#define FB_ACCEL_PROSAVAGE_KM 0x89 /* S3 ProSavage KM133 */ +#define FB_ACCEL_S3TWISTER_P 0x8a /* S3 Twister */ +#define FB_ACCEL_S3TWISTER_K 0x8b /* S3 TwisterK */ +#define FB_ACCEL_SUPERSAVAGE 0x8c /* S3 Supersavage */ +#define FB_ACCEL_PROSAVAGE_DDR 0x8d /* S3 ProSavage DDR */ +#define FB_ACCEL_PROSAVAGE_DDRK 0x8e /* S3 ProSavage DDR-K */ struct fb_fix_screeninfo { char id[16]; /* identification string eg "TT Builtin" */ @@ -245,6 +261,24 @@ #define VESA_HSYNC_SUSPEND 2 #define VESA_POWERDOWN 3 + +enum { + /* screen: unblanked, hsync: on, vsync: on */ + FB_BLANK_UNBLANK = VESA_NO_BLANKING, + + /* screen: blanked, hsync: on, vsync: on */ + FB_BLANK_NORMAL = VESA_NO_BLANKING + 1, + + /* screen: blanked, hsync: on, vsync: off */ + FB_BLANK_VSYNC_SUSPEND = VESA_VSYNC_SUSPEND + 1, + + /* screen: blanked, hsync: off, vsync: on */ + FB_BLANK_HSYNC_SUSPEND = VESA_HSYNC_SUSPEND + 1, + + /* screen: blanked, hsync: off, vsync: off */ + FB_BLANK_POWERDOWN = VESA_POWERDOWN + 1 +}; + #define FB_VBLANK_VBLANKING 0x001 /* currently in a vertical blank */ #define FB_VBLANK_HBLANKING 0x002 /* currently in a horizontal blank */ #define FB_VBLANK_HAVE_VBLANK 0x004 /* vertical blanks can be detected */ @@ -301,7 +335,7 @@ * hardware cursor control */ -#define FB_CUR_SETCUR 0x01 +#define FB_CUR_SETIMAGE 0x01 #define FB_CUR_SETPOS 0x02 #define FB_CUR_SETHOT 0x04 #define FB_CUR_SETCMAP 0x08 @@ -320,8 +354,6 @@ const char *mask; /* cursor mask bits */ struct fbcurpos hot; /* cursor hot spot */ struct fb_image image; /* Cursor image */ -/* all fields below are for fbcon use only */ - char *data; /* copy of bitmap */ }; #ifdef __KERNEL__ @@ -558,6 +590,82 @@ int (*fb_mmap)(struct fb_info *info, struct file *file, struct vm_area_struct *vma); }; +#ifdef CONFIG_FB_TILEBLITTING + +#define FB_TILE_CURSOR_NONE 0 +#define FB_TILE_CURSOR_UNDERLINE 1 +#define FB_TILE_CURSOR_LOWER_THIRD 2 +#define FB_TILE_CURSOR_LOWER_HALF 3 +#define FB_TILE_CURSOR_TWO_THIRDS 4 +#define FB_TILE_CURSOR_BLOCK 5 + +struct fb_tilemap { + __u32 width; /* width of each tile in pixels */ + __u32 height; /* height of each tile in scanlines */ + __u32 depth; /* color depth of each tile */ + __u32 length; /* number of tiles in the map */ + __u8 *data; /* actual tile map: a bitmap array, packed + to the nearest byte */ +}; + +struct fb_tilerect { + __u32 sx; /* origin in the x-axis */ + __u32 sy; /* origin in the y-axis */ + __u32 width; /* number of tiles in the x-axis */ + __u32 height; /* number of tiles in the y-axis */ + __u32 index; /* what tile to use: index to tile map */ + __u32 fg; /* foreground color */ + __u32 bg; /* background color */ + __u32 rop; /* raster operation */ +}; + +struct fb_tilearea { + __u32 sx; /* source origin in the x-axis */ + __u32 sy; /* source origin in the y-axis */ + __u32 dx; /* destination origin in the x-axis */ + __u32 dy; /* destination origin in the y-axis */ + __u32 width; /* number of tiles in the x-axis */ + __u32 height; /* number of tiles in the y-axis */ +}; + +struct fb_tileblit { + __u32 sx; /* origin in the x-axis */ + __u32 sy; /* origin in the y-axis */ + __u32 width; /* number of tiles in the x-axis */ + __u32 height; /* number of tiles in the y-axis */ + __u32 fg; /* foreground color */ + __u32 bg; /* background color */ + __u32 length; /* number of tiles to draw */ + __u32 *indices; /* array of indices to tile map */ +}; + +struct fb_tilecursor { + __u32 sx; /* cursor position in the x-axis */ + __u32 sy; /* cursor position in the y-axis */ + __u32 mode; /* 0 = erase, 1 = draw */ + __u32 shape; /* see FB_TILE_CURSOR_* */ + __u32 fg; /* foreground color */ + __u32 bg; /* background color */ +}; + +struct fb_tile_ops { + /* set tile characteristics */ + void (*fb_settile)(struct fb_info *info, struct fb_tilemap *map); + + /* all dimensions from hereon are in terms of tiles */ + + /* move a rectangular region of tiles from one area to another*/ + void (*fb_tilecopy)(struct fb_info *info, struct fb_tilearea *area); + /* fill a rectangular region with a tile */ + void (*fb_tilefill)(struct fb_info *info, struct fb_tilerect *rect); + /* copy an array of tiles */ + void (*fb_tileblit)(struct fb_info *info, struct fb_tileblit *blit); + /* cursor */ + void (*fb_tilecursor)(struct fb_info *info, + struct fb_tilecursor *cursor); +}; +#endif /* CONFIG_FB_TILEBLITTING */ + /* FBINFO_* = fb_info.flags bit flags */ #define FBINFO_MODULE 0x0001 /* Low-level driver is a module */ #define FBINFO_HWACCEL_DISABLED 0x0002 @@ -589,6 +697,7 @@ from userspace */ #define FBINFO_MISC_MODESWITCH 0x20000 /* mode switch */ #define FBINFO_MISC_MODESWITCHLATE 0x40000 /* init hardware later */ +#define FBINFO_MISC_TILEBLITTING 0x80000 /* use tile blitting */ struct fb_info { int node; @@ -596,22 +705,23 @@ struct fb_var_screeninfo var; /* Current var */ struct fb_fix_screeninfo fix; /* Current fix */ struct fb_monspecs monspecs; /* Current Monitor specs */ - struct fb_cursor cursor; /* Current cursor */ struct work_struct queue; /* Framebuffer event queue */ - struct timer_list cursor_timer; /* Cursor timer */ struct fb_pixmap pixmap; /* Image hardware mapper */ struct fb_pixmap sprite; /* Cursor hardware mapper */ struct fb_cmap cmap; /* Current cmap */ struct list_head modelist; /* mode list */ struct fb_ops *fbops; + struct device *device; +#ifdef CONFIG_FB_TILEBLITTING + struct fb_tile_ops *tileops; /* Tile Blitting */ +#endif char __iomem *screen_base; /* Virtual address */ unsigned long screen_size; /* Amount of ioremapped VRAM or 0 */ - int currcon; /* Current VC. */ void *pseudo_palette; /* Fake palette of 16 colors */ #define FBINFO_STATE_RUNNING 0 #define FBINFO_STATE_SUSPENDED 1 u32 state; /* Hardware state i.e suspend */ - + void *fbcon_par; /* fbcon use-only private area */ /* From here on everything is device dependent */ void *par; }; @@ -714,7 +824,6 @@ extern void fb_sysmove_buf_aligned(struct fb_info *info, struct fb_pixmap *buf, u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch, u32 height); -extern void fb_load_cursor_image(struct fb_info *); extern void fb_set_suspend(struct fb_info *info, int state); extern int fb_get_color_depth(struct fb_info *info); extern int fb_get_options(char *name, char **option); |
|
From: <aot...@us...> - 2005-01-04 21:40:33
|
Update of /cvsroot/gc-linux/linux/arch/ppc/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24768/arch/ppc/kernel Modified Files: cputable.c Log Message: Merge 2.6.10 Index: cputable.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/kernel/cputable.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- cputable.c 19 Nov 2004 01:10:59 -0000 1.5 +++ cputable.c 4 Jan 2005 21:39:06 -0000 1.6 @@ -30,7 +30,6 @@ extern void __setup_cpu_power3(unsigned long offset, int cpu_nr, struct cpu_spec* spec); extern void __setup_cpu_power4(unsigned long offset, int cpu_nr, struct cpu_spec* spec); extern void __setup_cpu_ppc970(unsigned long offset, int cpu_nr, struct cpu_spec* spec); -extern void __setup_cpu_8xx(unsigned long offset, int cpu_nr, struct cpu_spec* spec); extern void __setup_cpu_generic(unsigned long offset, int cpu_nr, struct cpu_spec* spec); #define CLASSIC_PPC (!defined(CONFIG_8xx) && !defined(CONFIG_4xx) && \ @@ -48,12 +47,21 @@ */ #ifdef CONFIG_ALTIVEC #define CPU_FTR_ALTIVEC_COMP CPU_FTR_ALTIVEC [...1379 lines suppressed...] #endif #if !CLASSIC_PPC - { /* default match */ - 0x00000000, 0x00000000, "(generic PPC)", - CPU_FTR_COMMON, - PPC_FEATURE_32, - 32, 32, - 0, - } + { /* default match */ + .pvr_mask = 0x00000000, + .pvr_value = 0x00000000, + .cpu_name = "(generic PPC)", + .cpu_features = CPU_FTR_COMMON, + .cpu_user_features = PPC_FEATURE_32, + .icache_bsize = 32, + .dcache_bsize = 32, + } #endif /* !CLASSIC_PPC */ }; |
165 messages has been excluded from this view by a project administrator.
