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: Albert H. <he...@us...> - 2006-03-24 21:45:24
|
Update of /cvsroot/gc-linux/linux/arch/ppc/platforms In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4338/arch/ppc/platforms Modified Files: Makefile Log Message: 2.6.16 merged. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/Makefile,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- Makefile 18 Jan 2006 23:41:52 -0000 1.21 +++ Makefile 24 Mar 2006 21:45:18 -0000 1.22 @@ -3,26 +3,18 @@ # # Extra CFLAGS so we don't have to do relative includes -CFLAGS_pmac_setup.o += -Iarch/$(ARCH)/mm +CFLAGS_chrp_setup.o += -Iarch/$(ARCH)/mm obj-$(CONFIG_APUS) += apus_setup.o ifeq ($(CONFIG_APUS),y) obj-$(CONFIG_PCI) += apus_pci.o endif -obj-$(CONFIG_PPC_PMAC) += pmac_pic.o pmac_setup.o pmac_time.o \ - pmac_feature.o pmac_pci.o pmac_sleep.o \ - pmac_low_i2c.o pmac_cache.o obj-$(CONFIG_PPC_CHRP) += chrp_setup.o chrp_time.o chrp_pci.o \ chrp_pegasos_eth.o ifeq ($(CONFIG_PPC_CHRP),y) obj-$(CONFIG_NVRAM) += chrp_nvram.o endif obj-$(CONFIG_PPC_PREP) += prep_pci.o prep_setup.o -ifeq ($(CONFIG_PPC_PMAC),y) -obj-$(CONFIG_NVRAM) += pmac_nvram.o -obj-$(CONFIG_CPU_FREQ_PMAC) += pmac_cpufreq.o -endif -obj-$(CONFIG_PMAC_BACKLIGHT) += pmac_backlight.o obj-$(CONFIG_PREP_RESIDUAL) += residual.o obj-$(CONFIG_PQ2ADS) += pq2ads.o obj-$(CONFIG_TQM8260) += tqm8260_setup.o @@ -51,6 +43,5 @@ obj-$(CONFIG_GAMECUBE_RESET) += gcn-rsw.o ifeq ($(CONFIG_SMP),y) -obj-$(CONFIG_PPC_PMAC) += pmac_smp.o obj-$(CONFIG_PPC_CHRP) += chrp_smp.o endif |
|
From: Albert H. <he...@us...> - 2006-03-21 22:37:07
|
Update of /cvsroot/gc-linux/libsdl/src/video/gc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17380/src/video/gc Modified Files: SDL_gcvideo.c Log Message: Do not modify the yres, even on PAL mode. We want the yres equal to the actual physical screen mode. Make sure video page 0 is both the visible and back page when no double-buffering is enabled. Index: SDL_gcvideo.c =================================================================== RCS file: /cvsroot/gc-linux/libsdl/src/video/gc/SDL_gcvideo.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- SDL_gcvideo.c 17 Mar 2006 22:32:02 -0000 1.3 +++ SDL_gcvideo.c 21 Mar 2006 22:36:38 -0000 1.4 @@ -439,8 +439,9 @@ vinfo.bits_per_pixel = bpp; vinfo.xres = width; vinfo.xres_virtual = width; - vinfo.yres = height; - vinfo.yres_virtual = 2*height; + /* do not modify yres*, we use a fake 640x480 mode in PAL */ + //vinfo.yres = height; + //vinfo.yres_virtual = 2*height; vinfo.xoffset = 0; vinfo.yoffset = 0; vinfo.red.length = vinfo.red.offset = 0; @@ -456,7 +457,7 @@ int maxheight; /* Figure out how much video memory is available */ - maxheight = 2*height; + maxheight = 2*yres; if (vinfo.yres_virtual > maxheight) { vinfo.yres_virtual = maxheight; } @@ -514,12 +515,16 @@ page_address[0] = mapped_mem; page_address[1] = mapped_mem + current->pitch * yres; - back_page = 0; + back_page = 1; if (flags & SDL_DOUBLEBUF) { current->flags |= SDL_DOUBLEBUF; flip_pending = 1; } else { flip_pending = 0; + /* make page 0 both the visible and back page */ + back_page = ioctl(console_fd, FBIOFLIPHACK, &back_page); + if (back_page < 0) + back_page = 0; } /* Set the update rectangle function */ |
|
From: Albert H. <he...@us...> - 2006-03-17 22:32:09
|
Update of /cvsroot/gc-linux/libsdl/src/video/gc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12443/src/video/gc Modified Files: SDL_gcevents.c SDL_gcvideo.c SDL_gcvideo.h SDL_gcyuv.c Log Message: Added double buffering and automatic vsync (with near-zero wait). Index: SDL_gcyuv.c =================================================================== RCS file: /cvsroot/gc-linux/libsdl/src/video/gc/SDL_gcyuv.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- SDL_gcyuv.c 23 Jun 2005 18:18:33 -0000 1.1.1.1 +++ SDL_gcyuv.c 17 Mar 2006 22:32:02 -0000 1.2 @@ -3,7 +3,7 @@ Copyright (C) 1997-2004 Sam Lantinga SDL port for the Nintendo GameCube - Copyright (C) 2004-2005 Albert Herranz + Copyright (C) 2004-2006 Albert Herranz Accelerated yuv blitters courtesy of kirin. This library is free software; you can redistribute it and/or @@ -312,7 +312,9 @@ } } - dst = mapped_mem + mapped_offset + + GC_WaitForFlipCompletion(_this); + + dst = page_address[back_page] + page_offset + (dstrect->y * display->pitch) + dstrect->x * 2; height = dstrect->h; /* overlay->h; */ width = dstrect->w * 2; /* overlay->w * 2; */ Index: SDL_gcevents.c =================================================================== RCS file: /cvsroot/gc-linux/libsdl/src/video/gc/SDL_gcevents.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- SDL_gcevents.c 23 Jun 2005 18:18:34 -0000 1.1.1.1 +++ SDL_gcevents.c 17 Mar 2006 22:32:01 -0000 1.2 @@ -25,7 +25,7 @@ sl...@li... */ -#define DEBUG_KEYBOARD 1 +//#define DEBUG_KEYBOARD 1 /* Handle the event stream, converting console events into SDL events */ Index: SDL_gcvideo.c =================================================================== RCS file: /cvsroot/gc-linux/libsdl/src/video/gc/SDL_gcvideo.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- SDL_gcvideo.c 23 Jun 2005 19:08:16 -0000 1.2 +++ SDL_gcvideo.c 17 Mar 2006 22:32:02 -0000 1.3 @@ -3,7 +3,7 @@ Copyright (C) 1997-2004 Sam Lantinga SDL port for the Nintendo GameCube - Copyright (C) 2004-2005 Albert Herranz + Copyright (C) 2004-2006 Albert Herranz This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -33,6 +33,7 @@ #include <string.h> #include <fcntl.h> #include <unistd.h> +#include <errno.h> #include <sys/ioctl.h> #include <sys/mman.h> #include <asm/page.h> /* For definition of PAGE_SIZE */ @@ -50,7 +51,7 @@ #ifdef HAVE_OPENGL #include "SDL_gcgl.h" -#endif /* HAVE_OPENGL */ +#endif /* HAVE_OPENGL */ /* Initialization/Query functions */ static int GC_VideoInit(_THIS, SDL_PixelFormat * vformat); @@ -71,19 +72,30 @@ static void GC_InitRGB2YUVTables(void); static void GC_UpdateRects(_THIS, int numrects, SDL_Rect * rects); static void GC_UpdateRectRGB16(_THIS, SDL_Rect * rect, int pitch); -static void GC_UpdateRectRGB24(_THIS, SDL_Rect * rect, int pitch); -static void GC_UpdateRectRGB32(_THIS, SDL_Rect * rect, int pitch); - +void GC_WaitForFlipCompletion(_THIS); #define GC_BLACK 0x00800080 -/* GC driver bootstrap functions */ +/* + * + * Bootstrap functions. + */ + +/* + * + */ static int GC_Available(void) { int console; const char *SDL_fbdev; + /* + * XXX We could check that + * "/sys/devices/platform/gcnfb.0/graphics\:fb0/name" + * exists and contains gcnfb. + */ + SDL_fbdev = getenv("SDL_FBDEV"); if (SDL_fbdev == NULL) { SDL_fbdev = "/dev/fb0"; @@ -95,6 +107,9 @@ return (console >= 0); } +/* + * + */ static void GC_DeleteDevice(_THIS) { if (_this->hidden->buffer) { @@ -103,11 +118,15 @@ } free(_this->hidden); #ifdef HAVE_OPENGL - free(_this->gl_data); /* check for NULL? */ + if (_this->gl_data) + free(_this->gl_data); #endif /* HAVE_OPENGL */ free(_this); } +/* + * + */ static SDL_VideoDevice *GC_CreateDevice(int devindex) { _THIS; @@ -116,31 +135,31 @@ _this = (SDL_VideoDevice *) malloc(sizeof(SDL_VideoDevice)); if (_this) { memset(_this, 0, (sizeof *_this)); - _this->hidden = (struct SDL_PrivateVideoData *) - malloc((sizeof *_this->hidden)); + #ifdef HAVE_OPENGL _this->gl_data = (struct SDL_PrivateGLData *) malloc((sizeof *_this->gl_data)); -#endif /* HAVE_OPENGL */ - } - if ((_this == NULL) || (_this->hidden == NULL) + if (_this->gl_data == NULL) { + SDL_OutOfMemory(); + free(_this); + return 0; + } + memset(_this->gl_data, 0, (sizeof *_this->gl_data)); +#endif /* HAVE_OPENGL */ + + _this->hidden = (struct SDL_PrivateVideoData *) + malloc((sizeof *_this->hidden)); + if (_this->hidden == NULL) { + SDL_OutOfMemory(); #ifdef HAVE_OPENGL - || (_this->gl_data == NULL) -#endif /* HAVE_OPENGL */ - ) { /* mem-leak if only one malloc fails.. */ - SDL_OutOfMemory(); - if (_this) { + free(_this->gl_data); +#endif /* HAVE_OPENGL */ free(_this); + return (0); } - return (0); } memset(_this->hidden, 0, (sizeof *_this->hidden)); -#ifdef HAVE_OPENGL - memset(_this->gl_data, 0, (sizeof *_this->gl_data)); -#endif /* HAVE_OPENGL */ - //wait_vbl = FB_WaitVBL; - //wait_idle = FB_WaitIdle; keyboard_fd = -1; in_graphics_mode = 0; @@ -186,6 +205,15 @@ GC_Available, GC_CreateDevice }; + +/* + * + * Video setup routines. + */ + +/* + * + */ int GC_VideoInit(_THIS, SDL_PixelFormat * vformat) { struct fb_fix_screeninfo finfo; @@ -250,13 +278,6 @@ GC_VideoQuit(_this); return (-1); } -#if 0 - if (vinfo.bits_per_pixel != 16) { - SDL_SetError("XXX Sorry, but I need a 16bpp mode for now..."); - GC_VideoQuit(_this); - return (-1); - } -#endif /* XXX isobel, review */ @@ -288,64 +309,66 @@ return (0); } -#if 0 //defined(GC_DEBUG) -static void print_vinfo(struct fb_var_screeninfo *vinfo) -{ - fprintf(stderr, "Printing vinfo:\n"); - fprintf(stderr, "\txres: %d\n", vinfo->xres); - fprintf(stderr, "\tyres: %d\n", vinfo->yres); - fprintf(stderr, "\txres_virtual: %d\n", vinfo->xres_virtual); - fprintf(stderr, "\tyres_virtual: %d\n", vinfo->yres_virtual); - fprintf(stderr, "\txoffset: %d\n", vinfo->xoffset); - fprintf(stderr, "\tyoffset: %d\n", vinfo->yoffset); - fprintf(stderr, "\tbits_per_pixel: %d\n", vinfo->bits_per_pixel); - fprintf(stderr, "\tgrayscale: %d\n", vinfo->grayscale); - fprintf(stderr, "\tnonstd: %d\n", vinfo->nonstd); - fprintf(stderr, "\tactivate: %d\n", vinfo->activate); - fprintf(stderr, "\theight: %d\n", vinfo->height); - fprintf(stderr, "\twidth: %d\n", vinfo->width); - fprintf(stderr, "\taccel_flags: %d\n", vinfo->accel_flags); - fprintf(stderr, "\tpixclock: %d\n", vinfo->pixclock); - fprintf(stderr, "\tleft_margin: %d\n", vinfo->left_margin); - fprintf(stderr, "\tright_margin: %d\n", vinfo->right_margin); - fprintf(stderr, "\tupper_margin: %d\n", vinfo->upper_margin); - fprintf(stderr, "\tlower_margin: %d\n", vinfo->lower_margin); - fprintf(stderr, "\thsync_len: %d\n", vinfo->hsync_len); - fprintf(stderr, "\tvsync_len: %d\n", vinfo->vsync_len); - fprintf(stderr, "\tsync: %d\n", vinfo->sync); - fprintf(stderr, "\tvmode: %d\n", vinfo->vmode); - fprintf(stderr, "\tred: %d/%d\n", vinfo->red.length, vinfo->red.offset); - fprintf(stderr, "\tgreen: %d/%d\n", vinfo->green.length, - vinfo->green.offset); - fprintf(stderr, "\tblue: %d/%d\n", vinfo->blue.length, - vinfo->blue.offset); - fprintf(stderr, "\talpha: %d/%d\n", vinfo->transp.length, - vinfo->transp.offset); -} -static void print_finfo(struct fb_fix_screeninfo *finfo) +/* + * + * Note: If we are terminated, this could be called in the middle of + * another SDL video routine -- notably UpdateRects. + */ +static void GC_VideoQuit(_THIS) { - fprintf(stderr, "Printing finfo:\n"); - fprintf(stderr, "\tsmem_start = %p\n", (char *)finfo->smem_start); - fprintf(stderr, "\tsmem_len = %d\n", finfo->smem_len); - fprintf(stderr, "\ttype = %d\n", finfo->type); - fprintf(stderr, "\ttype_aux = %d\n", finfo->type_aux); - fprintf(stderr, "\tvisual = %d\n", finfo->visual); - fprintf(stderr, "\txpanstep = %d\n", finfo->xpanstep); - fprintf(stderr, "\typanstep = %d\n", finfo->ypanstep); - fprintf(stderr, "\tywrapstep = %d\n", finfo->ywrapstep); - fprintf(stderr, "\tline_length = %d\n", finfo->line_length); - fprintf(stderr, "\tmmio_start = %p\n", (char *)finfo->mmio_start); - fprintf(stderr, "\tmmio_len = %d\n", finfo->mmio_len); - fprintf(stderr, "\taccel = %d\n", finfo->accel); + if (_this->hidden->buffer) { + free(_this->hidden->buffer); + _this->hidden->buffer = NULL; + } + if (_this->screen) { + Uint32 *rowp = (Uint32 *) (mapped_mem + page_offset); + int left = + (_this->screen->pitch * _this->screen->h) / sizeof(Uint32); + while (left--) { + *rowp++ = GC_BLACK; + } + if (_this->screen->pixels != NULL) { + /* already freed above */ + _this->screen->pixels = NULL; + } + } + /* Close console and input file descriptors */ + if (console_fd > 0) { + /* Unmap the video framebuffer and I/O registers */ + if (mapped_mem) { + munmap(mapped_mem, mapped_memlen); + mapped_mem = NULL; + } + + /* Restore the original video mode and palette */ + if (GC_InGraphicsMode(_this)) { + //FB_RestorePalette(_this); + ioctl(console_fd, FBIOPUT_VSCREENINFO, &saved_vinfo); + } + + /* We're all done with the framebuffer */ + close(console_fd); + console_fd = -1; + } + GC_CloseKeyboard(_this); } -#endif + +/* + * + * Video mode handling. + */ + +/* only 640x480 16bpp is currently supported */ const static SDL_Rect RECT_640x480 = { 0, 0, 640, 480 }; const static SDL_Rect *vid_modes[] = { &RECT_640x480, NULL }; +/* + * + */ SDL_Rect **GC_ListModes(_THIS, SDL_PixelFormat * format, Uint32 flags) { switch (format->BitsPerPixel) { @@ -360,9 +383,11 @@ default: return NULL; } -// return (SDL_Rect **) -1; } +/* + * + */ SDL_Surface *GC_SetVideoMode(_THIS, SDL_Surface * current, int width, int height, int bpp, Uint32 flags) { @@ -373,8 +398,10 @@ Uint32 Gmask; Uint32 Bmask; Uint32 *p, *q; + Uint32 yres; - GC_DPRINTF("Setting %dx%d %dbpp mode\n", width, height, bpp); + GC_DPRINTF("Setting %dx%d %dbpp %smode\n", width, height, bpp, + (flags & SDL_DOUBLEBUF)?"(doublebuf) ":""); /* Set the terminal into graphics mode */ if (GC_EnterGraphicsMode(_this) < 0) { @@ -389,29 +416,22 @@ SDL_SetError("Couldn't get console screen info"); return (NULL); } -#if 0 //defined(GC_DEBUG) - fprintf(stderr, "Printing original vinfo:\n"); - print_vinfo(&vinfo); -#endif + + yres = vinfo.yres; /* hack to center 640x480 resolution on PAL cubes */ if (vinfo.xres == 640 && vinfo.yres == 576) { - mapped_offset = ((576 - 480) / 2) * 640 * ((bpp + 7) / 8); - - p = (Uint32 *)mapped_mem; - q = (Uint32 *)(mapped_mem + mapped_offset); - while (p < q) - *p++ = GC_BLACK; - - q = (Uint32 *)(mapped_mem + mapped_memlen); - p = (Uint32 *)(mapped_mem + mapped_memlen - mapped_offset); - while (p < q) - *p++ = GC_BLACK; - + page_offset = ((576 - 480) / 2) * 640 * ((bpp + 7) / 8); } else { - mapped_offset = 0; + page_offset = 0; } + /* clear all video memory */ + p = (Uint32 *)mapped_mem; + q = (Uint32 *)(mapped_mem + mapped_memlen); + while (p < q) + *p++ = GC_BLACK; + if ((vinfo.xres != width) || (vinfo.yres != height) || (vinfo.bits_per_pixel != bpp)) { vinfo.activate = FB_ACTIVATE_NOW; @@ -419,8 +439,8 @@ vinfo.bits_per_pixel = bpp; vinfo.xres = width; vinfo.xres_virtual = width; - //vinfo.yres = height; - vinfo.yres_virtual = height; + vinfo.yres = height; + vinfo.yres_virtual = 2*height; vinfo.xoffset = 0; vinfo.yoffset = 0; vinfo.red.length = vinfo.red.offset = 0; @@ -428,11 +448,6 @@ vinfo.blue.length = vinfo.blue.offset = 0; vinfo.transp.length = vinfo.transp.offset = 0; -#if 0 //defined(GC_DEBUG) - fprintf(stderr, "Printing wanted vinfo:\n"); - print_vinfo(&vinfo); -#endif - if (ioctl(console_fd, FBIOPUT_VSCREENINFO, &vinfo) < 0) { SDL_SetError("Couldn't set console screen info"); return (NULL); @@ -441,18 +456,13 @@ int maxheight; /* Figure out how much video memory is available */ - maxheight = height; + maxheight = 2*height; if (vinfo.yres_virtual > maxheight) { vinfo.yres_virtual = maxheight; } } cache_vinfo = vinfo; -#if 0 //defined(GC_DEBUG) - fprintf(stderr, "Printing actual vinfo:\n"); - print_vinfo(&vinfo); -#endif - Rmask = 0; for (i = 0; i < vinfo.red.length; ++i) { Rmask <<= 1; @@ -501,18 +511,21 @@ current->pitch = width * ((bpp + 7) / 8); current->pixels = _this->hidden->buffer; + page_address[0] = mapped_mem; + page_address[1] = mapped_mem + current->pitch * yres; + + back_page = 0; + if (flags & SDL_DOUBLEBUF) { + current->flags |= SDL_DOUBLEBUF; + flip_pending = 1; + } else { + flip_pending = 0; + } + /* Set the update rectangle function */ switch (bpp) { - case 32: - GC_DPRINTF("Using 32bpp blitter (not working)\n"); - _this->hidden->UpdateRect = GC_UpdateRectRGB32; - break; - case 24: - GC_DPRINTF("Using 24bpp blitter (not working)\n"); - _this->hidden->UpdateRect = GC_UpdateRectRGB24; - break; case 16: - GC_DPRINTF("Using new fast 16bpp blitter\n"); + GC_DPRINTF("Using 16bpp blitter\n"); _this->hidden->UpdateRect = GC_UpdateRectRGB16; break; default: @@ -536,32 +549,97 @@ return (current); } -/* We don't actually allow hardware surfaces other than the main one */ + +/* + * + * Hardware surface hooks. + */ + +/* + * + */ static int GC_AllocHWSurface(_THIS, SDL_Surface * surface) { + /* We don't actually allow hardware surfaces other than the main one */ return (-1); } + +/* + * + */ static void GC_FreeHWSurface(_THIS, SDL_Surface * surface) { return; } -/* We need to wait for vertical retrace on page flipped displays */ +/* + * + */ static int GC_LockHWSurface(_THIS, SDL_Surface * surface) { return (0); } +/* + * + */ static void GC_UnlockHWSurface(_THIS, SDL_Surface * surface) { return; } +/* + * + */ static int GC_FlipHWSurface(_THIS, SDL_Surface * surface) { + if (flip_pending) { + /* SDL_UpdateRect was not called */ + SDL_UpdateRect(_this->screen, 0, 0, 0, 0); + } + + /* flip video page as soon as possible */ + ioctl(console_fd, FBIOFLIPHACK, NULL); + flip_pending = 1; + return (0); } +/* + * + */ +void GC_WaitForFlipCompletion(_THIS) +{ + int visible_page; + int result; + + if (flip_pending) { + flip_pending = 0; + back_page ^= 1; + visible_page = back_page; + while (visible_page == back_page) { + /* wait until back_page is not visible */ + result = ioctl(console_fd, FBIOFLIPHACK, &back_page); + if (result < 0) { + if ((errno == EINTR) || (errno == EAGAIN)) + continue; + return; /* ioctl unsupported ... */ + } + visible_page = result; + } + /* + * At this point the back_page is not visible. We can safely + * write to it without tearing. + */ + } +} + + +/* + * + * Color space handling. + */ + #define RGB2YUV_SHIFT 16 #define RGB2YUV_LUMA 16 #define RGB2YUV_CHROMA 128 @@ -595,6 +673,9 @@ static Uint8 RGB16toU[1 << 16]; static Uint8 RGB16toV[1 << 16]; +/* + * + */ static void GC_InitRGB2YUVTables(void) { unsigned int i; @@ -634,6 +715,9 @@ } } +/* + * + */ static inline Uint32 rgbrgb16toyuy2(Uint16 rgb1, Uint16 rgb2) { register int Y1, Cb, Y2, Cr; @@ -665,6 +749,60 @@ | (((char)Cr) << 0); } +/* + * + */ +static int GC_SetColors(_THIS, int firstcolor, int ncolors, SDL_Color * colors) +{ + int i; + __u16 r[256]; + __u16 g[256]; + __u16 b[256]; + struct fb_cmap cmap; + + /* Set up the colormap */ + for (i = 0; i < ncolors; i++) { + r[i] = colors[i].r << 8; + g[i] = colors[i].g << 8; + b[i] = colors[i].b << 8; + } + cmap.start = firstcolor; + cmap.len = ncolors; + cmap.red = r; + cmap.green = g; + cmap.blue = b; + cmap.transp = NULL; + + if ((ioctl(console_fd, FBIOPUTCMAP, &cmap) < 0) || + !(_this->screen->flags & SDL_HWPALETTE)) { + colors = _this->screen->format->palette->colors; + ncolors = _this->screen->format->palette->ncolors; + cmap.start = 0; + cmap.len = ncolors; + memset(r, 0, sizeof(r)); + memset(g, 0, sizeof(g)); + memset(b, 0, sizeof(b)); + if (ioctl(console_fd, FBIOGETCMAP, &cmap) == 0) { + for (i = ncolors - 1; i >= 0; --i) { + colors[i].r = (r[i] >> 8); + colors[i].g = (g[i] >> 8); + colors[i].b = (b[i] >> 8); + } + } + return (0); + } + return (1); +} + + +/* + * + * Blitters. + */ + +/* + * + */ static void GC_UpdateRectRGB16(_THIS, SDL_Rect * rect, int pitch) { int width, height, left, i, mod, mod32; @@ -681,7 +819,8 @@ /* in bytes, src and dest are 16bpp */ src = _this->hidden->buffer + (rect->y * pitch) + left * 2; - dst = mapped_mem + mapped_offset + (rect->y * pitch) + left * 2; + dst = page_address[back_page] + page_offset + + (rect->y * pitch) + left * 2; mod = pitch - width * 2; src32 = (Uint32 *) src; @@ -696,96 +835,14 @@ *dst32++ = rgbrgb16toyuy2(rgb[0], rgb[1]); src32++; } - dst32 += mod32; src32 += mod32; + dst32 += mod32; } } -static inline unsigned long rgbrgbtoyuy2(register int r1, register int g1, - register int b1, register int r2, - register int g2, register int b2) -{ - register int r, g, b; - register int Y1, Cb, Y2, Cr; - - r = (r1 + r2) >> 1; - g = (g1 + g2) >> 1; - b = (b1 + b2) >> 1; - - Y1 = clamp(16, 235, (r_Yr[r1] + g_Yg_[g1] + b_Yb[b1]) >> RGB2YUV_SHIFT); - Y2 = clamp(16, 235, (r_Yr[r2] + g_Yg_[g2] + b_Yb[b2]) >> RGB2YUV_SHIFT); - Cb = (r_Ur[r] + g_Ug_[g] + b_Ub[b]) >> RGB2YUV_SHIFT; - Cr = (r_Vr[r] + g_Vg_[g] + b_Vb[b]) >> RGB2YUV_SHIFT; - - return (((((char)Y1) << 24) | (((char)Cb) << 16) | (((char)Y2) << 8) - | (((char)Cr) << 0))); -} - -static void GC_UpdateRectRGB24(_THIS, SDL_Rect * rect, int pitch) -{ - int width, height, left, i, srcmod, dstmod; - Uint8 *src, *dst; - - /* XXX case width < 2 needs special treatment */ - - /* in pixel units */ - left = rect->x & ~1; /* 2 pixel align */ - width = (rect->w + 1) & ~1; /* 2 pixel align in excess */ - height = rect->h; - - /* in bytes, src is 24bpp (3 bytes) and dst is 16bpp */ - src = _this->hidden->buffer + (rect->y * pitch) + left * 3; - srcmod = pitch - width * 3; - dst = mapped_mem + mapped_offset + (rect->y * pitch) + left * 2; - dstmod = _this->screen->w * 2 - width * 2; - - while (height--) { - i = width / 2; - while (i--) { - *(unsigned long *)dst = - rgbrgbtoyuy2(src[0], src[1], src[2], src[3], src[4], - src[5]); - dst += 4; - src += 6; - } - dst += dstmod; - src += srcmod; - } -} - -static void GC_UpdateRectRGB32(_THIS, SDL_Rect * rect, int pitch) -{ - int width, height, left, i, srcmod, dstmod; - Uint8 *src, *dst; - -/* DOESN'T WORK, WRONG COLORS */ - - /* XXX case width < 2 needs special treatment */ - - /* in pixel units */ - left = rect->x & ~1; /* 2 pixel align */ - width = (rect->w + 1) & ~1; /* 2 pixel align in excess */ - height = rect->h; - - /* in bytes, src is 32bpp (4 bytes) and dst is 16bpp */ - src = _this->hidden->buffer + (rect->y * pitch) + left * 4; - srcmod = pitch - width * 4; - dst = mapped_mem + mapped_offset + (rect->y * pitch) + left * 2; - dstmod = _this->screen->w * 2 - width * 2; - - while (height--) { - i = width / 2; - while (i--) { - *(Uint32 *) dst = rgbrgbtoyuy2(src[2], src[1], src[0], - src[6], src[5], src[4]); - dst += 4; - src += 8; - } - dst += dstmod; - src += srcmod; - } -} - +/* + * + */ static void GC_UpdateRects(_THIS, int numrects, SDL_Rect * rects) { SDL_Surface *screen; @@ -797,6 +854,7 @@ pitch = screen->pitch; /* this is the pitch of the shadow buffer */ if (_this->hidden->UpdateRect) { + GC_WaitForFlipCompletion(_this); while (numrects--) { if (rects->w <= 0 || rects->h <= 0) continue; @@ -806,94 +864,3 @@ } } -#if 0 -static int GC_SetColors(_THIS, int firstcolor, int ncolors, SDL_Color * colors) -{ - /* do nothing of note. */ - return (1); -} -#endif - -static int GC_SetColors(_THIS, int firstcolor, int ncolors, SDL_Color * colors) -{ - int i; - __u16 r[256]; - __u16 g[256]; - __u16 b[256]; - struct fb_cmap cmap; - - /* Set up the colormap */ - for (i = 0; i < ncolors; i++) { - r[i] = colors[i].r << 8; - g[i] = colors[i].g << 8; - b[i] = colors[i].b << 8; - } - cmap.start = firstcolor; - cmap.len = ncolors; - cmap.red = r; - cmap.green = g; - cmap.blue = b; - cmap.transp = NULL; - - if ((ioctl(console_fd, FBIOPUTCMAP, &cmap) < 0) || - !(_this->screen->flags & SDL_HWPALETTE)) { - colors = _this->screen->format->palette->colors; - ncolors = _this->screen->format->palette->ncolors; - cmap.start = 0; - cmap.len = ncolors; - memset(r, 0, sizeof(r)); - memset(g, 0, sizeof(g)); - memset(b, 0, sizeof(b)); - if (ioctl(console_fd, FBIOGETCMAP, &cmap) == 0) { - for (i = ncolors - 1; i >= 0; --i) { - colors[i].r = (r[i] >> 8); - colors[i].g = (g[i] >> 8); - colors[i].b = (b[i] >> 8); - } - } - return (0); - } - return (1); -} - -/* Note: If we are terminated, this could be called in the middle of - another SDL video routine -- notably UpdateRects. -*/ -static void GC_VideoQuit(_THIS) -{ - if (_this->hidden->buffer) { - free(_this->hidden->buffer); - _this->hidden->buffer = NULL; - } - if (_this->screen) { - Uint32 *rowp = (Uint32 *) (mapped_mem + mapped_offset); - int left = - (_this->screen->pitch * _this->screen->h) / sizeof(Uint32); - while (left--) { - *rowp++ = GC_BLACK; - } - if (_this->screen->pixels != NULL) { - /* already freed above */ - _this->screen->pixels = NULL; - } - } - /* Close console and input file descriptors */ - if (console_fd > 0) { - /* Unmap the video framebuffer and I/O registers */ - if (mapped_mem) { - munmap(mapped_mem, mapped_memlen); - mapped_mem = NULL; - } - - /* Restore the original video mode and palette */ - if (GC_InGraphicsMode(_this)) { - //FB_RestorePalette(_this); - ioctl(console_fd, FBIOPUT_VSCREENINFO, &saved_vinfo); - } - - /* We're all done with the framebuffer */ - close(console_fd); - console_fd = -1; - } - GC_CloseKeyboard(_this); -} Index: SDL_gcvideo.h =================================================================== RCS file: /cvsroot/gc-linux/libsdl/src/video/gc/SDL_gcvideo.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- SDL_gcvideo.h 23 Jun 2005 18:18:34 -0000 1.1.1.1 +++ SDL_gcvideo.h 17 Mar 2006 22:32:02 -0000 1.2 @@ -40,9 +40,14 @@ #include "SDL_sysvideo.h" #include "SDL_mutex.h" +#define FBIOFLIPHACK 0x4623 /* gc-linux */ + + /* Hidden "this" pointer for the video functions */ #define _THIS SDL_VideoDevice *_this +extern void GC_WaitForFlipCompletion(_THIS); + /* Private display data */ struct SDL_PrivateVideoData { @@ -54,62 +59,46 @@ int console_fd; struct fb_var_screeninfo cache_vinfo; struct fb_var_screeninfo saved_vinfo; - //int saved_cmaplen; - //__u16 *saved_cmap; int current_vt; int saved_vt; int keyboard_fd; int in_graphics_mode; - //int saved_kbd_mode; - //struct termios saved_kbd_termios; //int mouse_fd; char *mapped_mem; int mapped_memlen; - int mapped_offset; - //char *mapped_io; - //long mapped_iolen; - //int flip_page; - //char *flip_address[2]; + int flip_pending; + int back_page; + char *page_address[2]; + int page_offset; #define NUM_MODELISTS 4 /* 8, 16, 24, and 32 bits-per-pixel */ int SDL_nummodes[NUM_MODELISTS]; SDL_Rect **SDL_modelist[NUM_MODELISTS]; - void (*wait_vbl) (_THIS); - void (*wait_idle) (_THIS); +// SDL_mutex *hw_lock; }; /* Old variable names */ #define console_fd (_this->hidden->console_fd) +#define cache_vinfo (_this->hidden->cache_vinfo) +#define saved_vinfo (_this->hidden->saved_vinfo) #define current_vt (_this->hidden->current_vt) #define saved_vt (_this->hidden->saved_vt) #define keyboard_fd (_this->hidden->keyboard_fd) #define in_graphics_mode (_this->hidden->in_graphics_mode) -//#define saved_kbd_mode (_this->hidden->saved_kbd_mode) -//#define saved_kbd_termios (_this->hidden->saved_kbd_termios) //#define mouse_fd (_this->hidden->mouse_fd) -#define cache_vinfo (_this->hidden->cache_vinfo) -#define saved_vinfo (_this->hidden->saved_vinfo) -#define saved_cmaplen (_this->hidden->saved_cmaplen) -#define saved_cmap (_this->hidden->saved_cmap) #define mapped_mem (_this->hidden->mapped_mem) #define mapped_memlen (_this->hidden->mapped_memlen) -#define mapped_offset (_this->hidden->mapped_offset) -#define mapped_io (_this->hidden->mapped_io) -#define mapped_iolen (_this->hidden->mapped_iolen) -#define flip_page (_this->hidden->flip_page) -#define flip_address (_this->hidden->flip_address) +#define flip_pending (_this->hidden->flip_pending) +#define back_page (_this->hidden->back_page) +#define page_address (_this->hidden->page_address) +#define page_offset (_this->hidden->page_offset) #define SDL_nummodes (_this->hidden->SDL_nummodes) #define SDL_modelist (_this->hidden->SDL_modelist) -#define surfaces (_this->hidden->surfaces) -#define surfaces_memtotal (_this->hidden->surfaces_memtotal) -#define surfaces_memleft (_this->hidden->surfaces_memleft) -#define hw_lock (_this->hidden->hw_lock) -#define wait_vbl (_this->hidden->wait_vbl) -#define wait_idle (_this->hidden->wait_idle) +//#define hw_lock (_this->hidden->hw_lock) #endif /* _SDL_gcvideo_h */ |
|
From: Arthur O. <aot...@us...> - 2006-02-13 16:06:15
|
Update of /cvsroot/gc-linux/linux/drivers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13137/drivers Modified Files: Makefile Log Message: Move CONFIG_GAMECUBE_{SI,EXI} back to bottom of list. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/Makefile,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Makefile 18 Jan 2006 23:41:52 -0000 1.13 +++ Makefile 13 Feb 2006 16:05:58 -0000 1.14 @@ -64,11 +64,11 @@ obj-$(CONFIG_MCA) += mca/ obj-$(CONFIG_EISA) += eisa/ obj-$(CONFIG_CPU_FREQ) += cpufreq/ -obj-$(CONFIG_GAMECUBE_SI) += input/si/ -obj-$(CONFIG_GAMECUBE_EXI) += exi/ obj-$(CONFIG_MMC) += mmc/ obj-$(CONFIG_INFINIBAND) += infiniband/ obj-$(CONFIG_SGI_IOC4) += sn/ obj-y += firmware/ obj-$(CONFIG_CRYPTO) += crypto/ obj-$(CONFIG_SUPERH) += sh/ +obj-$(CONFIG_GAMECUBE_SI) += input/si/ +obj-$(CONFIG_GAMECUBE_EXI) += exi/ |
|
From: Arthur O. <aot...@us...> - 2006-02-13 16:03:16
|
Update of /cvsroot/gc-linux/linux/drivers/video In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12296/drivers/video Modified Files: gcnfb.c Log Message: diff-tree c465e05a03209651078b95686158648fd7ed84c5 (from e764a20196f4e1b497a42fdc6e9d254e7ec290f2) tree e1119586a567a9a6a5ad9bda43d3438772ecf5a4 parent e764a20196f4e1b497a42fdc6e9d254e7ec290f2 author Antonino A. Daplas <ad...@gm...> 1131354035 -0800 committer Linus Torvalds <tor...@g5...> 1131378830 -0800 [PATCH] fbcon/fbdev: Move softcursor out of fbdev to fbcon According to Jon Smirl, filling in the field fb_cursor with soft_cursor for drivers that do not support hardware cursors is redundant. The soft_cursor function is usable by all drivers because it is just a wrapper around fb_imageblit. And because soft_cursor is an fbcon-specific hook, the file is moved to the console directory. Thus, drivers that do not support hardware cursors can leave the fb_cursor field blank. For drivers that do, they can fill up this field with their own version. The end result is a smaller code size. And if the framebuffer console is not loaded, module/kernel size is also reduced because the soft_cursor module will also not be loaded. Signed-off-by: Antonino Daplas <ad...@po...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> :100644 100644 9c54695911c1468e181de9f60f98c3312a5a4d2f 44b6ca290ce36bdcde56a22a8ec13b02e5fa8fd8 M drivers/video/Kconfig Index: gcnfb.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/gcnfb.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- gcnfb.c 18 Jan 2006 23:41:53 -0000 1.11 +++ gcnfb.c 13 Feb 2006 16:03:07 -0000 1.12 @@ -568,9 +568,6 @@ .fb_fillrect = cfb_fillrect, .fb_copyarea = cfb_copyarea, .fb_imageblit = cfb_imageblit, -#ifdef CONFIG_FB_SOFT_CURSOR - .fb_cursor = soft_cursor, -#endif }; /** |
|
From: Albert H. <he...@us...> - 2006-01-18 23:42:34
|
Update of /cvsroot/gc-linux/linux/drivers/input/si In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10066/drivers/input/si Modified Files: gcn-si.c Log Message: Linux 2.6.15. Index: gcn-si.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/input/si/gcn-si.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gcn-si.c 9 Oct 2005 14:51:53 -0000 1.2 +++ gcn-si.c 18 Jan 2006 23:41:53 -0000 1.3 @@ -4,6 +4,7 @@ * Nintendo GameCube Serial Interface driver * Copyright (C) 2004 The GameCube Linux Team * Copyright (C) 2004 Steven Looman + * Copyright (C) 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 @@ -50,13 +51,14 @@ #define si_printk(level, format, arg...) \ printk(level PFX format , ## arg) - /* * This keymap is for a datel adapter + normal US keyboard. */ #include "gcn-keymap.h" +#define SI_MAX_PORTS 4 + #define REFRESH_TIME HZ/100 #define SICOUTBUF(x) ((void __iomem *)(0xcc006400 + (x)*12)) @@ -100,17 +102,12 @@ typedef enum {CTL_PAD,CTL_KEYBOARD,CTL_UNKNOWN} control_type; -struct { +struct si_device { control_type id; int si_id; unsigned int raw[2]; -#if 0 - unsigned char errStat:1; - unsigned char errLatch:1; -#endif - - struct input_dev idev; + struct input_dev *idev; struct timer_list timer; union { @@ -118,8 +115,9 @@ }; char name[32]; - /* char phys[32]; */ -} port[4]; +}; + +struct si_device port[SI_MAX_PORTS]; #ifdef HACK_FORCE_KEYBOARD_PORT @@ -263,6 +261,7 @@ */ static void gcn_si_timer(unsigned long portno) { + struct si_device *sdev = &port[portno]; unsigned long raw[2]; unsigned char key[3]; unsigned char oldkey; @@ -271,53 +270,53 @@ raw[0] = readl(SICINBUFH(portno)); raw[1] = readl(SICINBUFL(portno)); - switch (port[portno].id) { + switch (sdev->id) { case CTL_PAD: /* buttons */ - input_report_key(&port[portno].idev, BTN_A, raw[0] & PAD_A); - input_report_key(&port[portno].idev, BTN_B, raw[0] & PAD_B); - input_report_key(&port[portno].idev, BTN_X, raw[0] & PAD_X); - input_report_key(&port[portno].idev, BTN_Y, raw[0] & PAD_Y); - input_report_key(&port[portno].idev, BTN_Z, raw[0] & PAD_Z); - input_report_key(&port[portno].idev, BTN_TL, + input_report_key(sdev->idev, BTN_A, raw[0] & PAD_A); + input_report_key(sdev->idev, BTN_B, raw[0] & PAD_B); + input_report_key(sdev->idev, BTN_X, raw[0] & PAD_X); + input_report_key(sdev->idev, BTN_Y, raw[0] & PAD_Y); + input_report_key(sdev->idev, BTN_Z, raw[0] & PAD_Z); + input_report_key(sdev->idev, BTN_TL, raw[0] & PAD_LT); - input_report_key(&port[portno].idev, BTN_TR, + input_report_key(sdev->idev, BTN_TR, raw[0] & PAD_RT); - input_report_key(&port[portno].idev, BTN_START, + input_report_key(sdev->idev, BTN_START, raw[0] & PAD_START); /* axis */ /* a stick */ - input_report_abs(&port[portno].idev, ABS_X, + input_report_abs(sdev->idev, ABS_X, raw[0] >> 8 & 0xFF); - input_report_abs(&port[portno].idev, ABS_Y, + input_report_abs(sdev->idev, ABS_Y, 0xFF - (raw[0] >> 0 & 0xFF)); /* b pad */ if (raw[0] & PAD_RIGHT) - input_report_abs(&port[portno].idev, ABS_HAT0X, 1); + input_report_abs(sdev->idev, ABS_HAT0X, 1); else if (raw[0] & PAD_LEFT) - input_report_abs(&port[portno].idev, ABS_HAT0X, -1); + input_report_abs(sdev->idev, ABS_HAT0X, -1); else - input_report_abs(&port[portno].idev, ABS_HAT0X, 0); + input_report_abs(sdev->idev, ABS_HAT0X, 0); if (raw[0] & PAD_DOWN) - input_report_abs(&port[portno].idev, ABS_HAT0Y, 1); + input_report_abs(sdev->idev, ABS_HAT0Y, 1); else if (raw[0] & PAD_UP) - input_report_abs(&port[portno].idev, ABS_HAT0Y, -1); + input_report_abs(sdev->idev, ABS_HAT0Y, -1); else - input_report_abs(&port[portno].idev, ABS_HAT0Y, 0); + input_report_abs(sdev->idev, ABS_HAT0Y, 0); /* c stick */ - input_report_abs(&port[portno].idev, ABS_RX, + input_report_abs(sdev->idev, ABS_RX, raw[1] >> 24 & 0xFF); - input_report_abs(&port[portno].idev, ABS_RY, + input_report_abs(sdev->idev, ABS_RY, raw[1] >> 16 & 0xFF); /* triggers */ - input_report_abs(&port[portno].idev, ABS_BRAKE, + input_report_abs(sdev->idev, ABS_BRAKE, raw[1] >> 8 & 0xFF); - input_report_abs(&port[portno].idev, ABS_GAS, + input_report_abs(sdev->idev, ABS_GAS, raw[1] >> 0 & 0xFF); break; @@ -330,19 +329,19 @@ /* check if anything was released */ for (i = 0; i < 3; ++i) { - oldkey = port[portno].keyboard.old[i]; + oldkey = sdev->keyboard.old[i]; if (oldkey != key[0] && oldkey != key[1] && oldkey != key[2]) - input_report_key(&port[portno].idev, + input_report_key(sdev->idev, gamecube_keymap[oldkey], 0); } /* report keys */ for (i = 0; i < 3; ++i) { if (key[i]) - input_report_key(&port[portno].idev, + input_report_key(sdev->idev, gamecube_keymap[key[i]], 1); - port[portno].keyboard.old[i] = key[i]; + sdev->keyboard.old[i] = key[i]; } break; @@ -350,9 +349,9 @@ break; } - input_sync(&port[portno].idev); + input_sync(sdev->idev); - mod_timer(&port[portno].timer, jiffies + REFRESH_TIME); + mod_timer(&sdev->timer, jiffies + REFRESH_TIME); } /** @@ -361,12 +360,13 @@ static int gcn_si_open(struct input_dev *idev) { int portno = (int)idev->private; + struct si_device *sdev = &port[portno]; - init_timer(&port[portno].timer); - port[portno].timer.function = gcn_si_timer; - port[portno].timer.data = (int)idev->private; - port[portno].timer.expires = jiffies + REFRESH_TIME; - add_timer(&port[portno].timer); + init_timer(&sdev->timer); + sdev->timer.function = gcn_si_timer; + sdev->timer.data = (int)idev->private; + sdev->timer.expires = jiffies + REFRESH_TIME; + add_timer(&sdev->timer); return 0; } @@ -377,8 +377,9 @@ static void gcn_si_close(struct input_dev *idev) { int portno = (int)idev->private; + struct si_device *sdev = &port[portno]; - del_timer(&port[portno].timer); + del_timer(&sdev->timer); } /** @@ -401,151 +402,193 @@ /** * */ -static int __init gcn_si_init(void) +static void si_setup_pad(struct input_dev *input_dev) { - int i; - int j; - si_printk(KERN_INFO, "%s\n", DRV_DESCRIPTION); + set_bit(EV_KEY, input_dev->evbit); + set_bit(EV_ABS, input_dev->evbit); + set_bit(EV_FF, input_dev->evbit); - if (request_resource(&iomem_resource, &gcn_si_resources) < 0) { - printk(KERN_WARNING PFX "resource busy\n"); - return -EBUSY; - } + set_bit(BTN_A, input_dev->keybit); + set_bit(BTN_B, input_dev->keybit); + set_bit(BTN_X, input_dev->keybit); + set_bit(BTN_Y, input_dev->keybit); + set_bit(BTN_Z, input_dev->keybit); + set_bit(BTN_TL, input_dev->keybit); + set_bit(BTN_TR, input_dev->keybit); + set_bit(BTN_START, input_dev->keybit); - for (i = 0; i < 4; ++i) { - memset(&port[i], 0, sizeof(port[i])); + /* a stick */ + set_bit(ABS_X, input_dev->absbit); + input_dev->absmin[ABS_X] = 0; + input_dev->absmax[ABS_X] = 255; + input_dev->absfuzz[ABS_X] = 8; + input_dev->absflat[ABS_X] = 8; - /* probe ports */ - port[i].si_id = gcn_si_get_controller_id(i) >> 16; + set_bit(ABS_Y, input_dev->absbit); + input_dev->absmin[ABS_Y] = 0; + input_dev->absmax[ABS_Y] = 255; + input_dev->absfuzz[ABS_Y] = 8; + input_dev->absflat[ABS_Y] = 8; - /* convert si_id to id */ - if (port[i].si_id == ID_PAD) { - port[i].id = CTL_PAD; - strcpy(port[i].name,"Standard Pad"); - } else if (port[i].si_id & ID_WIRELESS_BIT) { - port[i].id = CTL_PAD; - strcpy(port[i].name,(port[i].si_id & ID_WAVEBIRD_BIT) ? - "Nintendo Wavebird" : "Wireless Pad"); - } else if (port[i].si_id == ID_KEYBOARD) { - port[i].id = CTL_KEYBOARD; - strcpy(port[i].name, "Keyboard"); - } else { - port[i].id = CTL_UNKNOWN; - if (port[i].si_id) { - sprintf(port[i].name, "Unknown (%x)", - port[i].si_id); -#ifdef HACK_FORCE_KEYBOARD_PORT - if (i+1 == gcn_si_force_keyboard_port) { - si_printk(KERN_WARNING, - "port %d forced to" - " keyboard mode\n", i+1); - port[i].si_id = ID_KEYBOARD; - port[i].id = CTL_KEYBOARD; - strcpy(port[i].name, "Keyboard" - " (forced)"); - } -#endif /* HACK_FORCE_KEYBOARD_PORT */ - } else { - strcpy(port[i].name, "Not Present"); - } - } - - init_input_dev(&port[i].idev); + /* b pad */ + set_bit(ABS_HAT0X, input_dev->absbit); + input_dev->absmin[ABS_HAT0X] = -1; + input_dev->absmax[ABS_HAT0X] = 1; - port[i].idev.open = gcn_si_open; - port[i].idev.close = gcn_si_close; - port[i].idev.private = (unsigned int *)i; - port[i].idev.name = port[i].name; - - switch (port[i].id) { - case CTL_PAD: - set_bit(EV_KEY, port[i].idev.evbit); - set_bit(EV_ABS, port[i].idev.evbit); - set_bit(EV_FF, port[i].idev.evbit); + set_bit(ABS_HAT0Y, input_dev->absbit); + input_dev->absmin[ABS_HAT0Y] = -1; + input_dev->absmax[ABS_HAT0Y] = 1; - set_bit(BTN_A, port[i].idev.keybit); - set_bit(BTN_B, port[i].idev.keybit); - set_bit(BTN_X, port[i].idev.keybit); - set_bit(BTN_Y, port[i].idev.keybit); - set_bit(BTN_Z, port[i].idev.keybit); - set_bit(BTN_TL, port[i].idev.keybit); - set_bit(BTN_TR, port[i].idev.keybit); - set_bit(BTN_START, port[i].idev.keybit); + /* c stick */ + set_bit(ABS_RX, input_dev->absbit); + input_dev->absmin[ABS_RX] = 0; + input_dev->absmax[ABS_RX] = 255; + input_dev->absfuzz[ABS_RX] = 8; + input_dev->absflat[ABS_RX] = 8; - /* a stick */ - set_bit(ABS_X, port[i].idev.absbit); - port[i].idev.absmin[ABS_X] = 0; - port[i].idev.absmax[ABS_X] = 255; - port[i].idev.absfuzz[ABS_X] = 8; - port[i].idev.absflat[ABS_X] = 8; + set_bit(ABS_RY, input_dev->absbit); + input_dev->absmin[ABS_RY] = 0; + input_dev->absmax[ABS_RY] = 255; + input_dev->absfuzz[ABS_RY] = 8; + input_dev->absflat[ABS_RY] = 8; - set_bit(ABS_Y, port[i].idev.absbit); - port[i].idev.absmin[ABS_Y] = 0; - port[i].idev.absmax[ABS_Y] = 255; - port[i].idev.absfuzz[ABS_Y] = 8; - port[i].idev.absflat[ABS_Y] = 8; + /* triggers */ + set_bit(ABS_GAS, input_dev->absbit); + input_dev->absmin[ABS_GAS] = -255; + input_dev->absmax[ABS_GAS] = 255; + input_dev->absfuzz[ABS_GAS] = 16; + input_dev->absflat[ABS_GAS] = 16; - /* b pad */ - set_bit(ABS_HAT0X, port[i].idev.absbit); - port[i].idev.absmin[ABS_HAT0X] = -1; - port[i].idev.absmax[ABS_HAT0X] = 1; + set_bit(ABS_BRAKE, input_dev->absbit); + input_dev->absmin[ABS_BRAKE] = -255; + input_dev->absmax[ABS_BRAKE] = 255; + input_dev->absfuzz[ABS_BRAKE] = 16; + input_dev->absflat[ABS_BRAKE] = 16; - set_bit(ABS_HAT0Y, port[i].idev.absbit); - port[i].idev.absmin[ABS_HAT0Y] = -1; - port[i].idev.absmax[ABS_HAT0Y] = 1; + /* rumbling */ + set_bit(FF_RUMBLE, input_dev->ffbit); + input_dev->event = gcn_si_event; - /* c stick */ - set_bit(ABS_RX, port[i].idev.absbit); - port[i].idev.absmin[ABS_RX] = 0; - port[i].idev.absmax[ABS_RX] = 255; - port[i].idev.absfuzz[ABS_RX] = 8; - port[i].idev.absflat[ABS_RX] = 8; + input_dev->ff_effects_max = 1; +} - set_bit(ABS_RY, port[i].idev.absbit); - port[i].idev.absmin[ABS_RY] = 0; - port[i].idev.absmax[ABS_RY] = 255; - port[i].idev.absfuzz[ABS_RY] = 8; - port[i].idev.absflat[ABS_RY] = 8; +/** + * + */ +static void si_setup_keyboard(struct input_dev *input_dev) +{ + int i; - /* triggers */ - set_bit(ABS_GAS, port[i].idev.absbit); - port[i].idev.absmin[ABS_GAS] = -255; - port[i].idev.absmax[ABS_GAS] = 255; - port[i].idev.absfuzz[ABS_GAS] = 16; - port[i].idev.absflat[ABS_GAS] = 16; + set_bit(EV_KEY, input_dev->evbit); + set_bit(EV_REP, input_dev->evbit); - set_bit(ABS_BRAKE, port[i].idev.absbit); - port[i].idev.absmin[ABS_BRAKE] = -255; - port[i].idev.absmax[ABS_BRAKE] = 255; - port[i].idev.absfuzz[ABS_BRAKE] = 16; - port[i].idev.absflat[ABS_BRAKE] = 16; + for (i = 0; i < 255; ++i) + set_bit(gamecube_keymap[i], input_dev->keybit); +} - /* rumbling */ - set_bit(FF_RUMBLE, port[i].idev.ffbit); - port[i].idev.event = gcn_si_event; +/** + * + */ +static int si_setup_device(struct si_device *sdev, int idx) +{ + struct input_dev *input_dev; + int result = 0; - port[i].idev.ff_effects_max = 1; + memset(sdev, 0, sizeof(*sdev)); - input_register_device(&port[i].idev); + /* probe port */ + sdev->si_id = gcn_si_get_controller_id(idx) >> 16; - break; + /* convert si_id to id */ + if (sdev->si_id == ID_PAD) { + sdev->id = CTL_PAD; + strcpy(sdev->name, "standard pad"); + } else if (sdev->si_id & ID_WIRELESS_BIT) { + sdev->id = CTL_PAD; + strcpy(sdev->name,(sdev->si_id & ID_WAVEBIRD_BIT) ? + "Nintendo Wavebird" : "wireless pad"); + } else if (sdev->si_id == ID_KEYBOARD) { + sdev->id = CTL_KEYBOARD; + strcpy(sdev->name, "keyboard"); + } else { + sdev->id = CTL_UNKNOWN; + if (sdev->si_id) { + sprintf(sdev->name, "unknown (%x)", + sdev->si_id); +#ifdef HACK_FORCE_KEYBOARD_PORT + if (idx+1 == gcn_si_force_keyboard_port) { + si_printk(KERN_WARNING, + "port %d forced to keyboard mode\n", + idx+1); + sdev->si_id = ID_KEYBOARD; + sdev->id = CTL_KEYBOARD; + strcpy(sdev->name, "keyboard (forced)"); + } +#endif /* HACK_FORCE_KEYBOARD_PORT */ + } else { + strcpy(sdev->name, "Not Present"); + } + } - case CTL_KEYBOARD: - set_bit(EV_KEY, port[i].idev.evbit); - set_bit(EV_REP, port[i].idev.evbit); + if (sdev->id == CTL_UNKNOWN) { + result = -ENODEV; + goto done; + } - for (j = 0; j < 255; ++j) - set_bit(gamecube_keymap[j], - port[i].idev.keybit); + input_dev = input_allocate_device(); + if (!input_dev) { + si_printk(KERN_ERR, "not enough memory for input device\n"); + result = -ENOMEM; + goto done; + } - input_register_device(&port[i].idev); + input_dev->open = gcn_si_open; + input_dev->close = gcn_si_close; + input_dev->private = (unsigned int *)idx; + input_dev->name = sdev->name; + + switch (sdev->id) { + case CTL_PAD: + si_setup_pad(input_dev); + break; + case CTL_KEYBOARD: + si_setup_keyboard(input_dev); + break; + default: + /* this is here to avoid compiler warnings */ + break; + } - break; - default: - /* this is here to avoid compiler warnings */ - break; - } - si_printk(KERN_INFO, "Port %d: %s\n", i+1, port[i].name); + sdev->idev = input_dev; + +done: + return result; +} + +/** + * + */ +static int __init gcn_si_init(void) +{ + struct si_device *sdev; + int idx; + int result; + + si_printk(KERN_INFO, "%s\n", DRV_DESCRIPTION); + + if (request_resource(&iomem_resource, &gcn_si_resources) < 0) { + printk(KERN_WARNING PFX "resource busy\n"); + return -EBUSY; + } + + for (idx = 0; idx < SI_MAX_PORTS; ++idx) { + sdev = &port[idx]; + + result = si_setup_device(sdev, idx); + if (!result) + input_register_device(sdev->idev); + + si_printk(KERN_INFO, "Port %d: %s\n", idx+1, sdev->name); } gcn_si_set_polling(); @@ -558,17 +601,21 @@ */ static void __exit gcn_si_exit(void) { - int i; + struct si_device *sdev; + int idx; si_printk(KERN_INFO, "exit\n"); - for (i = 0; i < 4; ++i) { - if (port[i].id != CTL_UNKNOWN) { - input_unregister_device(&port[i].idev); - } + for (idx = 0; idx < SI_MAX_PORTS; ++idx) { + sdev = &port[idx]; + if (sdev->idev) + input_unregister_device(sdev->idev); } + release_resource(&gcn_si_resources); } module_init(gcn_si_init); module_exit(gcn_si_exit); + + |
|
From: Albert H. <he...@us...> - 2006-01-18 23:42:34
|
Update of /cvsroot/gc-linux/linux/arch/ppc/platforms In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10066/arch/ppc/platforms Modified Files: Makefile gcn-con.c Log Message: Linux 2.6.15. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/Makefile,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Makefile 31 Oct 2005 00:31:02 -0000 1.20 +++ Makefile 18 Jan 2006 23:41:52 -0000 1.21 @@ -14,6 +14,9 @@ pmac_low_i2c.o pmac_cache.o obj-$(CONFIG_PPC_CHRP) += chrp_setup.o chrp_time.o chrp_pci.o \ chrp_pegasos_eth.o +ifeq ($(CONFIG_PPC_CHRP),y) +obj-$(CONFIG_NVRAM) += chrp_nvram.o +endif obj-$(CONFIG_PPC_PREP) += prep_pci.o prep_setup.o ifeq ($(CONFIG_PPC_PMAC),y) obj-$(CONFIG_NVRAM) += pmac_nvram.o Index: gcn-con.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gcn-con.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- gcn-con.c 10 Nov 2005 23:29:42 -0000 1.4 +++ gcn-con.c 18 Jan 2006 23:41:52 -0000 1.5 @@ -17,6 +17,7 @@ #include <linux/console.h> #include <linux/font.h> #include <linux/cache.h> +#include <asm/cacheflush.h> #include "gamecube.h" |
|
From: Albert H. <he...@us...> - 2006-01-18 23:42:33
|
Update of /cvsroot/gc-linux/linux/arch/ppc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10066/arch/ppc Modified Files: Kconfig Log Message: Linux 2.6.15. Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/Kconfig,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- Kconfig 31 Oct 2005 00:31:01 -0000 1.33 +++ Kconfig 18 Jan 2006 23:41:51 -0000 1.34 @@ -572,6 +572,7 @@ config SPRUCE bool "IBM-Spruce" + select PPC_INDIRECT_PCI config HDPU bool "Sky-HDPU" @@ -592,21 +593,28 @@ config LOPEC bool "Motorola-LoPEC" + select PPC_I8259 config MVME5100 bool "Motorola-MVME5100" + select PPC_INDIRECT_PCI config PPLUS bool "Motorola-PowerPlus" + select PPC_I8259 + select PPC_INDIRECT_PCI config PRPMC750 bool "Motorola-PrPMC750" + select PPC_INDIRECT_PCI config PRPMC800 bool "Motorola-PrPMC800" + select PPC_INDIRECT_PCI config SANDPOINT bool "Motorola-Sandpoint" + select PPC_I8259 help Select SANDPOINT if configuring for a Motorola Sandpoint X3 (any flavor). @@ -619,6 +627,7 @@ config RADSTONE_PPC7D bool "Radstone Technology PPC7D board" + select PPC_I8259 config PAL4 bool "SBS-Palomar4" @@ -626,6 +635,7 @@ config GEMINI bool "Synergy-Gemini" depends on BROKEN + select PPC_INDIRECT_PCI help Select Gemini if configuring for a Synergy Microsystems' Gemini series Single Board Computer. More information is available at: @@ -766,6 +776,16 @@ bool default y if MPC834x_SYS +config CPM1 + bool + depends on 8xx + default y + help + The CPM1 (Communications Processor Module) is a coprocessor on + embedded CPUs made by Motorola. Selecting this option means that + you wish to build a kernel for a machine with a CPM1 coprocessor + on it (8xx, 827x, 8560). + config CPM2 bool depends on 8260 || MPC8560 || MPC8555 @@ -779,11 +799,14 @@ config PPC_CHRP bool depends on PPC_MULTIPLATFORM + select PPC_I8259 + select PPC_INDIRECT_PCI default y config PPC_PMAC bool depends on PPC_MULTIPLATFORM + select PPC_INDIRECT_PCI default y config PPC_PMAC64 @@ -794,6 +817,8 @@ config PPC_PREP bool depends on PPC_MULTIPLATFORM + select PPC_I8259 + select PPC_INDIRECT_PCI default y config PPC_OF @@ -827,6 +852,7 @@ config MV64X60 bool depends on (GT64260 || MV64360) + select PPC_INDIRECT_PCI default y menu "Set bridge options" @@ -875,6 +901,7 @@ config MPC10X_BRIDGE bool depends on POWERPMC250 || LOPEC || SANDPOINT + select PPC_INDIRECT_PCI default y config MPC10X_OPENPIC @@ -900,6 +927,7 @@ config MVME5100_IPMC761_PRESENT bool "MVME5100 configured with an IPMC761" depends on MVME5100 + select PPC_I8259 config SPRUCE_BAUD_33M bool "Spruce baud clock support" @@ -1157,6 +1185,7 @@ config ISA bool "Support for ISA-bus hardware" depends on PPC_PREP || PPC_CHRP + select PPC_I8259 help Find out whether you have ISA slots on your motherboard. ISA is the name of a bus system, i.e. the way the CPU talks to the other stuff @@ -1169,6 +1198,17 @@ depends on POWER3 || POWER4 || 6xx && !CPM2 default y +config PPC_I8259 + bool + default y if 85xx + default n + +config PPC_INDIRECT_PCI + bool + depends on PCI + default y if 40x || 44x || 85xx || 83xx + default n + config EISA bool help @@ -1205,6 +1245,7 @@ config PCI_QSPAN bool "QSpan PCI" depends on !4xx && !CPM2 && 8xx + select PPC_I8259 help Say Y here if you have a system based on a Motorola 8xx-series embedded processor with a QSPAN PCI interface, otherwise say N. @@ -1212,6 +1253,7 @@ config PCI_8260 bool depends on PCI && 8260 + select PPC_INDIRECT_PCI default y config 8260_PCI9 @@ -1245,6 +1287,14 @@ source "drivers/pcmcia/Kconfig" +config RAPIDIO + bool "RapidIO support" if MPC8540 || MPC8560 + help + If you say Y here, the kernel will include drivers and + infrastructure code to support RapidIO interconnect devices. + +source "drivers/rapidio/Kconfig" + source "drivers/exi/Kconfig" endmenu @@ -1400,7 +1450,7 @@ source "lib/Kconfig" -source "arch/ppc/oprofile/Kconfig" +source "arch/powerpc/oprofile/Kconfig" source "arch/ppc/Kconfig.debug" |
|
From: Albert H. <he...@us...> - 2006-01-18 23:42:14
|
Update of /cvsroot/gc-linux/linux/drivers/video In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10066/drivers/video Modified Files: Kconfig Makefile gcnfb.c gcngx.c Log Message: Linux 2.6.15. Index: gcnfb.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/gcnfb.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- gcnfb.c 2 Oct 2005 18:10:00 -0000 1.10 +++ gcnfb.c 18 Jan 2006 23:41:53 -0000 1.11 @@ -568,7 +568,9 @@ .fb_fillrect = cfb_fillrect, .fb_copyarea = cfb_copyarea, .fb_imageblit = cfb_imageblit, +#ifdef CONFIG_FB_SOFT_CURSOR .fb_cursor = soft_cursor, +#endif }; /** Index: gcngx.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/gcngx.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- gcngx.c 7 Nov 2005 19:58:12 -0000 1.6 +++ gcngx.c 18 Jan 2006 23:41:53 -0000 1.7 @@ -25,6 +25,7 @@ #include <linux/wait.h> #include <asm/pgtable.h> #include <asm/atomic.h> +#include <asm/cacheflush.h> #include <platforms/gamecube.h> #include "gcngx.h" Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Makefile,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- Makefile 31 Oct 2005 00:31:02 -0000 1.16 +++ Makefile 18 Jan 2006 23:41:53 -0000 1.17 @@ -16,7 +16,6 @@ obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfillrect.o obj-$(CONFIG_FB_CFB_COPYAREA) += cfbcopyarea.o obj-$(CONFIG_FB_CFB_IMAGEBLIT) += cfbimgblt.o -obj-$(CONFIG_FB_SOFT_CURSOR) += softcursor.o obj-$(CONFIG_FB_MACMODES) += macmodes.o # Hardware specific drivers go first @@ -86,7 +85,7 @@ obj-$(CONFIG_FB_ASILIANT) += asiliantfb.o obj-$(CONFIG_FB_PXA) += pxafb.o obj-$(CONFIG_FB_W100) += w100fb.o -obj-$(CONFIG_FB_AU1100) += au1100fb.o fbgen.o +obj-$(CONFIG_FB_AU1100) += au1100fb.o obj-$(CONFIG_FB_PMAG_AA) += pmag-aa-fb.o obj-$(CONFIG_FB_PMAG_BA) += pmag-ba-fb.o obj-$(CONFIG_FB_PMAGB_B) += pmagb-b-fb.o Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- Kconfig 31 Oct 2005 00:31:02 -0000 1.15 +++ Kconfig 18 Jan 2006 23:41:53 -0000 1.16 @@ -65,15 +65,6 @@ blitting. This is used by drivers that don't provide their own (accelerated) version. -config FB_SOFT_CURSOR - tristate - depends on FB - default n - ---help--- - Include the soft_cursor function for generic software cursor support. - This is used by drivers that don't provide their own (accelerated) - version. - config FB_MACMODES tristate depends on FB @@ -114,7 +105,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR ---help--- This enables support for Cirrus Logic GD542x/543x based boards on Amiga: SD64, Piccolo, Picasso II/II+, Picasso IV, or EGS Spectrum. @@ -133,7 +123,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This is the frame buffer device driver for the Permedia2 AGP frame buffer card from ASK, aka `Graphic Blaster Exxtreme'. There is a @@ -152,7 +141,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This framebuffer device driver is for the ARM PrimeCell PL110 Colour LCD controller. ARM PrimeCells provide the building @@ -169,7 +157,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This is the frame buffer device driver for the Acorn VIDC graphics hardware found in Acorn RISC PCs and other ARM-based machines. If @@ -181,7 +168,9 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR + help + Say Y to enable the Framebuffer driver for the CLPS7111 and + EP7212 processors. config FB_SA1100 bool "SA-1100 LCD support" @@ -189,7 +178,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This is a framebuffer device for the SA-1100 LCD Controller. See <http://www.linux-fbdev.org/> for information on framebuffer @@ -204,7 +192,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR config FB_CYBER2000 tristate "CyberPro 2000/2010/5000 support" @@ -212,7 +199,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This enables support for the Integraphics CyberPro 20x0 and 5000 VGA chips used in the Rebel.com Netwinder and other machines. @@ -225,7 +211,6 @@ default y select FB_CFB_FILLRECT select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR config FB_Q40 bool @@ -234,12 +219,10 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR config FB_AMIGA tristate "Amiga native chipset support" depends on FB && AMIGA - select FB_SOFT_CURSOR help This is the frame buffer device driver for the builtin graphics chipset found in Amigas. @@ -279,7 +262,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This enables support for the Cybervision 64 graphics card from Phase5. Please note that its use is not all that intuitive (i.e. if @@ -294,7 +276,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This enables support for the Cybervision 64/3D graphics card from Phase5. Please note that its use is not all that intuitive (i.e. if @@ -317,7 +298,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This is the frame buffer device driver for the Amiga FrameMaster card from BSC (exhibited 1992 but not shipped as a CBM product). @@ -328,7 +308,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This enables support for the Arc Monochrome LCD board. The board is based on the KS-108 lcd controller and is typically a matrix @@ -351,7 +330,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR select FB_MACMODES help Say Y if you want support with Open Firmware for your graphics @@ -363,7 +341,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR select FB_MACMODES help This driver supports a frame buffer for the graphics adapter in the @@ -375,7 +352,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR select FB_MACMODES help This driver supports a frame buffer for the "platinum" graphics @@ -387,7 +363,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR select FB_MACMODES help This driver supports a frame buffer for the "valkyrie" graphics @@ -399,42 +374,32 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This is the frame buffer device driver for the Chips & Technologies 65550 graphics chip in PowerBooks. config FB_ASILIANT - bool "Chips 69000 display support" + bool "Asiliant (Chips) 69000 display support" depends on (FB = y) && PCI select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR config FB_IMSTT bool "IMS Twin Turbo display support" depends on (FB = y) && PCI select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR select FB_MACMODES if PPC help The IMS Twin Turbo is a PCI-based frame buffer card bundled with many Macintosh and compatible computers. -config FB_S3TRIO - bool "S3 Trio display support" - depends on (FB = y) && PPC && BROKEN - help - If you have a S3 Trio say Y. Say N for S3 Virge. - config FB_VGA16 tristate "VGA 16-color graphics support" depends on FB && (X86 || PPC) select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This is the frame buffer device driver for VGA 16 color graphic cards. Say Y if you have such a card. @@ -448,7 +413,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR default y ---help--- STI refers to the HP "Standard Text Interface" which is a set of @@ -469,7 +433,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR select FB_MACMODES # bool ' Apple DAFB display support' CONFIG_FB_DAFB @@ -478,7 +441,6 @@ depends on (FB = y) && HP300 select FB_CFB_FILLRECT select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR default y config FB_TGA @@ -487,18 +449,16 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This is the frame buffer device driver for generic TGA graphic cards. Say Y if you have one of those. config FB_VESA bool "VESA VGA graphics support" - depends on (FB = y) && (X86 || X86_64) + depends on (FB = y) && X86 select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This is the frame buffer device driver for generic VESA 2.0 compliant graphic cards. The older VESA 1.2 cards are not supported. @@ -516,7 +476,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help Say Y here if you have a Hercules mono graphics card. @@ -545,7 +504,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help SGI Visual Workstation support for framebuffer graphics. @@ -555,7 +513,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This is the frame buffer device driver for SGI Graphics Backend. This chip is used in SGI O2 and Visual Workstation 320/540. @@ -577,31 +534,35 @@ bool "Sun3 framebuffer support" depends on (FB = y) && (SUN3 || SUN3X) && BROKEN +config FB_SBUS + bool "SBUS and UPA framebuffers" + depends on (FB = y) && SPARC + help + Say Y if you want support for SBUS or UPA based frame buffer device. + config FB_BW2 bool "BWtwo support" - depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3) + depends on (FB = y) && (SPARC && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3) select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This is the frame buffer device driver for the BWtwo frame buffer. config FB_CG3 bool "CGthree support" - depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3) + depends on (FB = y) && (SPARC && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3) + select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This is the frame buffer device driver for the CGthree frame buffer. config FB_CG6 bool "CGsix (GX,TurboGX) support" - depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3) + depends on (FB = y) && (SPARC && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3) select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This is the frame buffer device driver for the CGsix (GX, TurboGX) frame buffer. @@ -612,7 +573,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR ---help--- Say Y here if you have a PowerVR 2 card in your box. If you plan to run linux on your Dreamcast, you will have to say Y here. @@ -634,13 +594,23 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help Build in support for the SED1355 Epson Research Embedded RAMDAC LCD/CRT Controller (since redesignated as the S1D13505) as a framebuffer. Product specs at <http://www.erd.epson.com/vdc/html/products.htm>. +config FB_S1D13XXX + tristate "Epson S1D13XXX framebuffer support" + depends on FB + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + help + Support for S1D13XXX framebuffer device family (currently only + working with S1D13806). Product specs at + <http://www.erd.epson.com/vdc/html/legacy_13xxx.htm> + config FB_NVIDIA tristate "nVidia Framebuffer Support" depends on FB && PCI @@ -650,7 +620,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This driver supports graphics boards with the nVidia chips, TNT and newer. For very old chipsets, such as the RIVA128, then use @@ -662,7 +631,7 @@ config FB_NVIDIA_I2C bool "Enable DDC Support" - depends on FB_NVIDIA && !PPC_OF + depends on FB_NVIDIA help This enables I2C support for nVidia Chipsets. This is used only for getting EDID information from the attached display @@ -712,7 +681,7 @@ config FB_I810 tristate "Intel 810/815 support (EXPERIMENTAL)" - depends on FB && EXPERIMENTAL && PCI && X86 && !X86_64 + depends on FB && EXPERIMENTAL && PCI && X86_32 select AGP select AGP_INTEL select FB_MODE_HELPERS @@ -761,14 +730,13 @@ config FB_INTEL tristate "Intel 830M/845G/852GM/855GM/865G support (EXPERIMENTAL)" - depends on FB && EXPERIMENTAL && PCI && X86 && !X86_64 + depends on FB && EXPERIMENTAL && PCI && X86_32 select AGP select AGP_INTEL select FB_MODE_HELPERS select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This driver supports the on-board graphics built in to the Intel 830M/845G/852GM/855GM/865G chipsets. @@ -791,7 +759,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR select FB_TILEBLITTING select FB_MACMODES if PPC_PMAC ---help--- @@ -932,7 +899,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR select FB_MACMODES if PPC help Choose this option if you want to use an ATI Radeon graphics card as @@ -950,7 +916,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR select FB_MACMODES if PPC_OF help Choose this option if you want to use an ATI Radeon graphics card as @@ -988,7 +953,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR select FB_MACMODES if PPC_PMAC help This driver supports graphics boards with the ATI Rage128 chips. @@ -1004,7 +968,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR select FB_MACMODES if PPC help This driver supports graphics boards with the ATI Mach64 chips. @@ -1047,6 +1010,12 @@ is at <http://support.ati.com/products/pc/mach64/graphics_xpression.html>. +config FB_S3TRIO + bool "S3 Trio display support" + depends on (FB = y) && PPC && BROKEN + help + If you have a S3 Trio say Y. Say N for S3 Virge. + config FB_SAVAGE tristate "S3 Savage support" depends on FB && PCI && EXPERIMENTAL @@ -1056,7 +1025,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This driver supports notebooks and computers with S3 Savage PCI/AGP chips. @@ -1093,7 +1061,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This is the frame buffer device driver for the SiS 300, 315, 330 and 340 series as well as XGI V3XT, V5, V8, Z7 graphics chipsets. @@ -1123,7 +1090,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This driver supports notebooks with NeoMagic PCI chips. Say Y if you have such a graphics card. @@ -1137,7 +1103,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help Say Y here if you have a STG4000 / Kyro / PowerVR 3 based graphics board. @@ -1151,7 +1116,6 @@ select FB_CFB_IMAGEBLIT select FB_CFB_FILLRECT select FB_CFB_COPYAREA - select FB_SOFT_CURSOR help This driver supports graphics boards with the 3Dfx Banshee/Voodoo3 chips. Say Y if you have such a graphics board. @@ -1173,7 +1137,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR ---help--- Say Y here if you have a 3Dfx Voodoo Graphics (Voodoo1/sst1) or Voodoo2 (cvg) based graphics card. @@ -1190,7 +1153,6 @@ tristate "Cyberblade/i1 support" depends on FB && PCI select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR select VIDEO_SELECT ---help--- This driver is supposed to support the Trident Cyberblade/i1 @@ -1218,7 +1180,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR ---help--- This driver is supposed to support graphics boards with the Trident CyberXXXX/Image/CyberBlade chips mostly found in laptops @@ -1256,60 +1217,20 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This is the frame buffer device driver for the Nintendo GameCube. -config FB_E1356 - tristate "Epson SED1356 framebuffer support" - depends on FB && EXPERIMENTAL && PCI && MIPS - -config PB1000_CRT - bool "Use CRT on Pb1000 (J65)" - depends on MIPS_PB1000=y && FB_E1356 - -config PB1000_NTSC - bool "Use Compsite NTSC on Pb1000 (J63)" - depends on MIPS_PB1000=y && FB_E1356 - -config PB1000_TFT - bool "Use TFT Panel on Pb1000 (J64)" - depends on MIPS_PB1000=y && FB_E1356 - -config PB1500_CRT - bool "Use CRT on Pb1500 " if MIPS_PB1500=y - depends on FB_E1356 - -config PB1500_CRT - prompt "Use CRT on Pb1100 " - depends on FB_E1356 && MIPS_PB1100=y - -config PB1500_TFT - bool "Use TFT Panel on Pb1500 " if MIPS_PB1500=y - depends on FB_E1356 - -config PB1500_TFT - prompt "Use TFT Panel on Pb1100 " - depends on FB_E1356 && MIPS_PB1100=y - config FB_AU1100 bool "Au1100 LCD Driver" depends on (FB = y) && EXPERIMENTAL && PCI && MIPS && MIPS_PB1100=y source "drivers/video/geode/Kconfig" -config FB_SBUS - bool "SBUS and UPA framebuffers" - depends on (FB = y) && (SPARC32 || SPARC64) - help - Say Y if you want support for SBUS or UPA based frame buffer device. - config FB_FFB bool "Creator/Creator3D/Elite3D support" depends on FB_SBUS && SPARC64 select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This is the frame buffer device driver for the Creator, Creator3D, and Elite3D graphics boards. @@ -1320,7 +1241,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This is the frame buffer device driver for the TCX 24/8bit frame buffer. @@ -1331,7 +1251,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This is the frame buffer device driver for the CGfourteen frame buffer on Desktop SPARCsystems with the SX graphics option. @@ -1342,7 +1261,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This is the frame buffer device driver for the P9100 card supported on Sparcbook 3 machines. @@ -1353,14 +1271,13 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This is the frame buffer device driver for the SBUS-based Sun ZX (leo) frame buffer cards. config FB_PCI bool "PCI framebuffers" - depends on (FB = y) && PCI && (SPARC64 || SPARC32) + depends on (FB = y) && PCI && SPARC config FB_IGA bool "IGA 168x display support" @@ -1368,7 +1285,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This is the framebuffer device for the INTERGRAPHICS 1680 and successor frame buffer cards. @@ -1379,40 +1295,36 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help This is the frame buffer device driver for the Hitachi HD64461 LCD frame buffer card. config FB_PMAG_AA bool "PMAG-AA TURBOchannel framebuffer support" - depends on (FB = y) && MACH_DECSTATION && TC + depends on (FB = y) && TC select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help Support for the PMAG-AA TURBOchannel framebuffer card (1280x1024x1) used mainly in the MIPS-based DECstation series. config FB_PMAG_BA bool "PMAG-BA TURBOchannel framebuffer support" - depends on (FB = y) && MACH_DECSTATION && TC + depends on (FB = y) && TC select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help Support for the PMAG-BA TURBOchannel framebuffer card (1024x864x8) used mainly in the MIPS-based DECstation series. config FB_PMAGB_B bool "PMAGB-B TURBOchannel framebuffer support" - depends on (FB = y) && MACH_DECSTATION && TC + depends on (FB = y) && TC select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help Support for the PMAGB-B TURBOchannel framebuffer card used mainly in the MIPS-based DECstation series. The card is currently only @@ -1420,11 +1332,10 @@ config FB_MAXINE bool "Maxine (Personal DECstation) onboard framebuffer support" - depends on (FB = y) && MACH_DECSTATION && TC + depends on (FB = y) && MACH_DECSTATION select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help Support for the onboard framebuffer (1024x768x8) in the Personal DECstation series (Personal DECstation 5000/20, /25, /33, /50, @@ -1436,7 +1347,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help The TX3912 is a Toshiba RISC processor based on the MIPS 3900 core see <http://www.toshiba.com/taec/components/Generic/risc/tx3912.htm>. @@ -1449,7 +1359,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help The G364 driver is the framebuffer used in MIPS Magnum 4000 and Olivetti M700-10 systems. @@ -1460,7 +1369,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR help Say Y here if you want to support the built-in frame buffer of the Motorola 68328 CPU family. @@ -1471,7 +1379,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR ---help--- Frame buffer driver for the built-in LCD controller in the Intel PXA2x0 processor. @@ -1483,23 +1390,6 @@ If unsure, say N. -config FB_W100 - tristate "W100 frame buffer support" - depends on FB && PXA_SHARPSL - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR - ---help--- - Frame buffer driver for the w100 as found on the Sharp SL-Cxx series. - - This driver is also available as a module ( = code which can be - inserted and removed from the running kernel whenever you want). The - module will be called vfb. If you want to compile it as a module, - say M here and read <file:Documentation/modules.txt>. - - If unsure, say N. - config FB_PXA_PARAMETERS bool "PXA LCD command line parameters" default n @@ -1517,17 +1407,21 @@ <file:Documentation/fb/pxafb.txt> describes the available parameters. -config FB_S1D13XXX - tristate "Epson S1D13XXX framebuffer support" - depends on FB - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR - help - Support for S1D13XXX framebuffer device family (currently only - working with S1D13806). Product specs at - <http://www.erd.epson.com/vdc/html/legacy_13xxx.htm> +config FB_W100 + tristate "W100 frame buffer support" + depends on FB && PXA_SHARPSL + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + ---help--- + Frame buffer driver for the w100 as found on the Sharp SL-Cxx series. + + This driver is also available as a module ( = code which can be + inserted and removed from the running kernel whenever you want). The + module will be called vfb. If you want to compile it as a module, + say M here and read <file:Documentation/modules.txt>. + + If unsure, say N. config FB_S3C2410 tristate "S3C2410 LCD framebuffer support" @@ -1535,7 +1429,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR ---help--- Frame buffer driver for the built-in LCD controller in the Samsung S3C2410 processor. @@ -1559,7 +1452,6 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_SOFT_CURSOR ---help--- This is a `virtual' frame buffer device. It operates on a chunk of unswappable kernel memory instead of on the memory of a graphics |
|
From: Albert H. <he...@us...> - 2006-01-18 23:42:13
|
Update of /cvsroot/gc-linux/linux/drivers/video/logo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10066/drivers/video/logo Modified Files: Kconfig Log Message: Linux 2.6.15. Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Kconfig,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Kconfig 29 Aug 2005 19:50:20 -0000 1.4 +++ Kconfig 18 Jan 2006 23:41:53 -0000 1.5 @@ -7,6 +7,8 @@ config LOGO bool "Bootup logo" depends on FB || SGI_NEWPORT_CONSOLE + help + Enable and select frame buffer bootup logos. config LOGO_LINUX_MONO bool "Standard black and white Linux logo" @@ -50,7 +52,7 @@ config LOGO_SUN_CLUT224 bool "224-color Sun Linux logo" - depends on LOGO && (SPARC32 || SPARC64) + depends on LOGO && SPARC default y config LOGO_SUPERH_MONO |
|
From: Albert H. <he...@us...> - 2006-01-18 23:42:13
|
Update of /cvsroot/gc-linux/linux/include/asm-ppc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10066/include/asm-ppc Modified Files: io.h ppcboot.h Log Message: Linux 2.6.15. Index: io.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/asm-ppc/io.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- io.h 31 Oct 2005 00:31:02 -0000 1.11 +++ io.h 18 Jan 2006 23:41:53 -0000 1.12 @@ -8,6 +8,7 @@ #include <asm/page.h> #include <asm/byteorder.h> +#include <asm/synch.h> #include <asm/mmu.h> #define SIO_CONFIG_RA 0x398 @@ -236,9 +237,9 @@ #define outsl(port, buf, nl) _outsl_ns((port)+___IO_BASE, (buf), (nl)) /* - * On powermacs, we will get a machine check exception if we - * try to read data from a non-existent I/O port. Because the - * machine check is an asynchronous exception, it isn't + * On powermacs and 8xx we will get a machine check exception + * if we try to read data from a non-existent I/O port. Because + * the machine check is an asynchronous exception, it isn't * well-defined which instruction SRR0 will point to when the * exception occurs. * With the sequence below (twi; isync; nop), we have found that @@ -257,7 +258,7 @@ { \ unsigned int x; \ __asm__ __volatile__( \ - op " %0,0,%1\n" \ + "0:" op " %0,0,%1\n" \ "1: twi 0,%0,0\n" \ "2: isync\n" \ "3: nop\n" \ @@ -268,6 +269,7 @@ ".previous\n" \ ".section __ex_table,\"a\"\n" \ " .align 2\n" \ + " .long 0b,5b\n" \ " .long 1b,5b\n" \ " .long 2b,5b\n" \ " .long 3b,5b\n" \ @@ -281,11 +283,12 @@ extern __inline__ void name(unsigned int val, unsigned int port) \ { \ __asm__ __volatile__( \ - op " %0,0,%1\n" \ + "0:" op " %0,0,%1\n" \ "1: sync\n" \ "2:\n" \ ".section __ex_table,\"a\"\n" \ " .align 2\n" \ + " .long 0b,2b\n" \ " .long 1b,2b\n" \ ".previous" \ : : "r" (val), "r" (port + ___IO_BASE)); \ @@ -440,16 +443,6 @@ #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) #define page_to_bus(page) (page_to_phys(page) + PCI_DRAM_OFFSET) -/* - * Enforce In-order Execution of I/O: - * Acts as a barrier to ensure all previous I/O accesses have - * completed before any further ones are issued. - */ -extern inline void eieio(void) -{ - __asm__ __volatile__ ("eieio" : : : "memory"); -} - /* Enforce in-order execution of data I/O. * No distinction between read/write on PPC; use eieio for all three. */ @@ -572,6 +565,23 @@ #include <asm/mpc8260_pci9.h> #endif +#ifdef CONFIG_NOT_COHERENT_CACHE + +#define dma_cache_inv(_start,_size) \ + invalidate_dcache_range(_start, (_start + _size)) +#define dma_cache_wback(_start,_size) \ + clean_dcache_range(_start, (_start + _size)) +#define dma_cache_wback_inv(_start,_size) \ + flush_dcache_range(_start, (_start + _size)) + +#else + +#define dma_cache_inv(_start,_size) do { } while (0) +#define dma_cache_wback(_start,_size) do { } while (0) +#define dma_cache_wback_inv(_start,_size) do { } while (0) + +#endif + /* * Convert a physical pointer to a virtual kernel pointer for /dev/mem * access Index: ppcboot.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/asm-ppc/ppcboot.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ppcboot.h 23 Jun 2005 20:02:21 -0000 1.4 +++ ppcboot.h 18 Jan 2006 23:41:53 -0000 1.5 @@ -76,8 +76,8 @@ #if defined(CONFIG_HYMOD) hymod_conf_t bi_hymod_conf; /* hymod configuration information */ #endif -#if defined(CONFIG_EVB64260) || defined(CONFIG_44x) || defined(CONFIG_85xx) ||\ - defined(CONFIG_83xx) +#if defined(CONFIG_EVB64260) || defined(CONFIG_405EP) || defined(CONFIG_44x) || \ + defined(CONFIG_85xx) || defined(CONFIG_83xx) /* second onboard ethernet port */ unsigned char bi_enet1addr[6]; #endif @@ -99,5 +99,7 @@ #endif } bd_t; +#define bi_tbfreq bi_intfreq + #endif /* __ASSEMBLY__ */ #endif /* __ASM_PPCBOOT_H__ */ |
|
From: Albert H. <he...@us...> - 2006-01-18 23:42:13
|
Update of /cvsroot/gc-linux/linux/drivers/block In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10066/drivers/block Modified Files: Kconfig Makefile gcn-aram.c Log Message: Linux 2.6.15. Index: gcn-aram.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-aram.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- gcn-aram.c 20 Nov 2005 20:37:45 -0000 1.9 +++ gcn-aram.c 18 Jan 2006 23:41:52 -0000 1.10 @@ -17,6 +17,7 @@ #include <linux/module.h> #include <linux/major.h> +#include <linux/platform_device.h> #include <linux/blkdev.h> #include <linux/fcntl.h> /* O_ACCMODE */ #include <linux/hdreg.h> /* HDIO_GETGEO */ Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/Kconfig,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- Kconfig 31 Oct 2005 00:31:02 -0000 1.19 +++ Kconfig 18 Jan 2006 23:41:52 -0000 1.20 @@ -471,16 +471,6 @@ for details. -#XXX - it makes sense to enable this only for 32-bit subarch's, not for x86_64 -#for instance. -config LBD - bool "Support for Large Block Devices" - depends on X86 || (MIPS && 32BIT) || PPC32 || ARCH_S390_31 || SUPERH || UML - help - Say Y here if you want to attach large (bigger than 2TB) discs to - 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" depends on !UML @@ -517,8 +507,6 @@ source "drivers/s390/block/Kconfig" -source "drivers/block/Kconfig.iosched" - config ATA_OVER_ETH tristate "ATA over Ethernet support" depends on NET Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- Makefile 14 May 2005 21:40:12 -0000 1.12 +++ Makefile 18 Jan 2006 23:41:52 -0000 1.13 @@ -4,21 +4,7 @@ # 12 June 2000, Christoph Hellwig <hc...@in...> # Rewritten to use lists instead of if-statements. # -# Note : at this point, these files are compiled on all systems. -# In the future, some of these should be built conditionally. -# - -# -# NOTE that ll_rw_blk.c must come early in linkage order - it starts the -# kblockd threads -# - -obj-y := elevator.o ll_rw_blk.o ioctl.o genhd.o scsi_ioctl.o -obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o -obj-$(CONFIG_IOSCHED_AS) += as-iosched.o -obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o -obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o obj-$(CONFIG_MAC_FLOPPY) += swim3.o obj-$(CONFIG_BLK_DEV_FD) += floppy.o obj-$(CONFIG_BLK_DEV_FD98) += floppy98.o |
|
From: Albert H. <he...@us...> - 2006-01-18 23:42:12
|
Update of /cvsroot/gc-linux/linux/arch/ppc/configs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10066/arch/ppc/configs Modified Files: gamecube_defconfig Log Message: Linux 2.6.15. Index: gamecube_defconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/configs/gamecube_defconfig,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- gamecube_defconfig 31 Oct 2005 00:31:02 -0000 1.36 +++ gamecube_defconfig 18 Jan 2006 23:41:52 -0000 1.37 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.14 -# Sun Oct 30 08:36:15 2005 +# Linux kernel version: 2.6.15 +# Wed Jan 18 23:25:21 2006 # CONFIG_MMU=y CONFIG_GENERIC_HARDIRQS=y @@ -36,6 +36,7 @@ CONFIG_KOBJECT_UEVENT=y # CONFIG_IKCONFIG is not set CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_EMBEDDED is not set CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_EXTRA_PASS is not set @@ -64,6 +65,24 @@ CONFIG_KMOD=y # +# Block layer +# +CONFIG_LBD=y + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" + +# # Processor # CONFIG_6xx=y @@ -135,6 +154,7 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_BINFMT_ELF=y CONFIG_BINFMT_MISC=m CONFIG_CMDLINE_BOOL=y @@ -148,6 +168,7 @@ # Bus options # CONFIG_GENERIC_ISA_DMA=y +# CONFIG_PPC_I8259 is not set # CONFIG_PCI_DOMAINS is not set # @@ -232,8 +253,11 @@ # CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# # CONFIG_NET_SCHED is not set -# CONFIG_NET_CLS_ROUTE is not set # # Network testing @@ -290,16 +314,7 @@ CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 CONFIG_BLK_DEV_INITRD=y -CONFIG_LBD=y # CONFIG_CDROM_PKTCDVD is not set - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y # CONFIG_ATA_OVER_ETH is not set # @@ -334,6 +349,7 @@ # # Macintosh device drivers # +# CONFIG_WINDFARM is not set # # Network device support @@ -476,6 +492,8 @@ # # TPM devices # +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set # # I2C support @@ -521,14 +539,13 @@ CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y -CONFIG_FB_SOFT_CURSOR=y # CONFIG_FB_MACMODES is not set CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_TILEBLITTING is not set # CONFIG_FB_CT65550 is not set # CONFIG_FB_VGA16 is not set -CONFIG_FB_GAMECUBE=y # CONFIG_FB_S1D13XXX is not set +CONFIG_FB_GAMECUBE=y # CONFIG_FB_VIRTUAL is not set # @@ -537,6 +554,7 @@ # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set # CONFIG_FONTS is not set CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y @@ -598,6 +616,10 @@ # CONFIG_USB_ARCH_HAS_OHCI is not set # +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# # USB Gadget Support # # CONFIG_USB_GADGET is not set @@ -749,10 +771,6 @@ # CONFIG_CRC16 is not set CONFIG_CRC32=y # CONFIG_LIBCRC32C is not set - -# -# Profiling support -# # CONFIG_PROFILING is not set # |
|
From: Albert H. <he...@us...> - 2006-01-18 23:42:12
|
Update of /cvsroot/gc-linux/linux/drivers/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10066/drivers/misc Modified Files: gcn-mi.c Log Message: Linux 2.6.15. Index: gcn-mi.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/misc/gcn-mi.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- gcn-mi.c 14 May 2005 21:32:52 -0000 1.3 +++ gcn-mi.c 18 Jan 2006 23:41:53 -0000 1.4 @@ -16,6 +16,7 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/device.h> +#include <linux/platform_device.h> #include <linux/ioport.h> #include <linux/interrupt.h> #include <linux/spinlock.h> |
|
From: Albert H. <he...@us...> - 2006-01-18 23:42:11
|
Update of /cvsroot/gc-linux/linux/drivers/block/gcn-di In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10066/drivers/block/gcn-di Modified Files: gcn-di.c Log Message: Linux 2.6.15. Index: gcn-di.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-di/gcn-di.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- gcn-di.c 20 Nov 2005 20:37:45 -0000 1.14 +++ gcn-di.c 18 Jan 2006 23:41:52 -0000 1.15 @@ -23,6 +23,7 @@ #include <linux/delay.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> +#include <linux/platform_device.h> #include <linux/blkdev.h> #include <linux/fcntl.h> #include <linux/hdreg.h> |
|
From: Albert H. <he...@us...> - 2006-01-18 23:42:11
|
Update of /cvsroot/gc-linux/linux/arch/ppc/boot/simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10066/arch/ppc/boot/simple Modified Files: Makefile Log Message: Linux 2.6.15. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/simple/Makefile,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- Makefile 31 Oct 2005 00:31:02 -0000 1.14 +++ Makefile 18 Jan 2006 23:41:52 -0000 1.15 @@ -67,6 +67,12 @@ entrypoint-$(CONFIG_BAMBOO) := 0x01000000 extra.o-$(CONFIG_BAMBOO) := pibs.o + zimage-$(CONFIG_BUBINGA) := zImage-TREE +zimageinitrd-$(CONFIG_BUBINGA) := zImage.initrd-TREE + end-$(CONFIG_BUBINGA) := bubinga + entrypoint-$(CONFIG_BUBINGA) := 0x01000000 + extra.o-$(CONFIG_BUBINGA) := openbios.o + zimage-$(CONFIG_EBONY) := zImage-TREE zimageinitrd-$(CONFIG_EBONY) := zImage.initrd-TREE end-$(CONFIG_EBONY) := ebony @@ -79,12 +85,30 @@ entrypoint-$(CONFIG_LUAN) := 0x01000000 extra.o-$(CONFIG_LUAN) := pibs.o + zimage-$(CONFIG_YUCCA) := zImage-TREE +zimageinitrd-$(CONFIG_YUCCA) := zImage.initrd-TREE + end-$(CONFIG_YUCCA) := yucca + entrypoint-$(CONFIG_YUCCA) := 0x01000000 + extra.o-$(CONFIG_YUCCA) := pibs.o + zimage-$(CONFIG_OCOTEA) := zImage-TREE zimageinitrd-$(CONFIG_OCOTEA) := zImage.initrd-TREE end-$(CONFIG_OCOTEA) := ocotea entrypoint-$(CONFIG_OCOTEA) := 0x01000000 extra.o-$(CONFIG_OCOTEA) := pibs.o + zimage-$(CONFIG_SYCAMORE) := zImage-TREE +zimageinitrd-$(CONFIG_SYCAMORE) := zImage.initrd-TREE + end-$(CONFIG_SYCAMORE) := sycamore + entrypoint-$(CONFIG_SYCAMORE) := 0x01000000 + extra.o-$(CONFIG_SYCAMORE) := openbios.o + + zimage-$(CONFIG_WALNUT) := zImage-TREE +zimageinitrd-$(CONFIG_WALNUT) := zImage.initrd-TREE + end-$(CONFIG_WALNUT) := walnut + entrypoint-$(CONFIG_WALNUT) := 0x01000000 + extra.o-$(CONFIG_WALNUT) := openbios.o + extra.o-$(CONFIG_EV64260) := misc-ev64260.o end-$(CONFIG_EV64260) := ev64260 cacheflag-$(CONFIG_EV64260) := -include $(clear_L2_L3) @@ -165,10 +189,11 @@ # head.o and relocate.o must be at the start. boot-y := head.o relocate.o $(extra.o-y) $(misc-y) -boot-$(CONFIG_40x) += embed_config.o -boot-$(CONFIG_GAMECUBE) += embed_config.o +boot-$(CONFIG_REDWOOD_5) += embed_config.o +boot-$(CONFIG_REDWOOD_6) += embed_config.o boot-$(CONFIG_8xx) += embed_config.o boot-$(CONFIG_8260) += embed_config.o +boot-$(CONFIG_GAMECUBE) += embed_config.o boot-$(CONFIG_BSEIP) += iic.o boot-$(CONFIG_MBX) += iic.o pci.o qspan_pci.o boot-$(CONFIG_MV64X60) += misc-mv64x60.o @@ -241,11 +266,11 @@ skip=64 bs=1k $(images)/zImage-TREE: $(obj)/zvmlinux $(MKTREE) - $(MKTREE) $(obj)/zvmlinux $(images)/zImage.$(end-y) $(ENTRYPOINT) + $(MKTREE) $(obj)/zvmlinux $(images)/zImage.$(end-y) $(entrypoint-y) $(images)/zImage.initrd-TREE: $(obj)/zvmlinux.initrd $(MKTREE) $(MKTREE) $(obj)/zvmlinux.initrd $(images)/zImage.initrd.$(end-y) \ - $(ENTRYPOINT) + $(entrypoint-y) $(images)/zImage-PPLUS: $(obj)/zvmlinux $(MKPREP) $(MKBUGBOOT) $(MKPREP) -pbp $(obj)/zvmlinux $(images)/zImage.$(end-y) |
|
From: Albert H. <he...@us...> - 2006-01-18 23:42:11
|
Update of /cvsroot/gc-linux/linux/drivers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10066/drivers Modified Files: Makefile Log Message: Linux 2.6.15. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- Makefile 31 Oct 2005 00:31:02 -0000 1.12 +++ Makefile 18 Jan 2006 23:41:52 -0000 1.13 @@ -7,6 +7,7 @@ obj-$(CONFIG_PCI) += pci/ obj-$(CONFIG_PARISC) += parisc/ +obj-$(CONFIG_RAPIDIO) += rapidio/ obj-y += video/ obj-$(CONFIG_ACPI) += acpi/ # PnP must come after ACPI since it will eventually need to check if acpi @@ -48,6 +49,7 @@ obj-$(CONFIG_PARIDE) += block/paride/ obj-$(CONFIG_TC) += tc/ obj-$(CONFIG_USB) += usb/ +obj-$(CONFIG_PCI) += usb/ obj-$(CONFIG_USB_GADGET) += usb/gadget/ obj-$(CONFIG_GAMEPORT) += input/gameport/ obj-$(CONFIG_INPUT) += input/ @@ -62,10 +64,11 @@ obj-$(CONFIG_MCA) += mca/ obj-$(CONFIG_EISA) += eisa/ obj-$(CONFIG_CPU_FREQ) += cpufreq/ +obj-$(CONFIG_GAMECUBE_SI) += input/si/ +obj-$(CONFIG_GAMECUBE_EXI) += exi/ obj-$(CONFIG_MMC) += mmc/ obj-$(CONFIG_INFINIBAND) += infiniband/ obj-$(CONFIG_SGI_IOC4) += sn/ obj-y += firmware/ obj-$(CONFIG_CRYPTO) += crypto/ -obj-$(CONFIG_GAMECUBE_SI) += input/si/ -obj-$(CONFIG_GAMECUBE_EXI) += exi/ +obj-$(CONFIG_SUPERH) += sh/ |
|
From: Albert H. <he...@us...> - 2006-01-18 23:42:09
|
Update of /cvsroot/gc-linux/linux/drivers/net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10066/drivers/net Modified Files: Kconfig Makefile Log Message: Linux 2.6.15. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- Makefile 31 Oct 2005 00:31:02 -0000 1.15 +++ Makefile 18 Jan 2006 23:41:53 -0000 1.16 @@ -13,7 +13,7 @@ obj-$(CONFIG_BONDING) += bonding/ obj-$(CONFIG_GIANFAR) += gianfar_driver.o -gianfar_driver-objs := gianfar.o gianfar_ethtool.o gianfar_phy.o +gianfar_driver-objs := gianfar.o gianfar_ethtool.o gianfar_mii.o # # link order important here @@ -64,6 +64,7 @@ obj-$(CONFIG_VIA_RHINE) += via-rhine.o obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o +obj-$(CONFIG_RIONET) += rionet.o # # end link order section @@ -111,6 +112,7 @@ obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o +obj-$(CONFIG_PPP_MPPE) += ppp_mppe.o obj-$(CONFIG_PPPOE) += pppox.o pppoe.o obj-$(CONFIG_SLIP) += slip.o @@ -166,6 +168,7 @@ obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o obj-$(CONFIG_MIPS_GT96100ETH) += gt96100eth.o obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o +obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o obj-$(CONFIG_DECLANCE) += declance.o obj-$(CONFIG_ATARILANCE) += atarilance.o @@ -202,3 +205,6 @@ obj-$(CONFIG_ETRAX_ETHERNET) += cris/ obj-$(CONFIG_NETCONSOLE) += netconsole.o + +obj-$(CONFIG_FS_ENET) += fs_enet/ + Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- Kconfig 31 Oct 2005 00:31:02 -0000 1.18 +++ Kconfig 18 Jan 2006 23:41:53 -0000 1.19 @@ -456,7 +456,7 @@ config SGI_IOC3_ETH bool "SGI IOC3 Ethernet" - depends on NET_ETHERNET && PCI && SGI_IP27 && BROKEN + depends on NET_ETHERNET && PCI && SGI_IP27 select CRC32 select MII help @@ -484,6 +484,14 @@ the moment only acceleration of IPv4 is supported. This option enables offloading for checksums on transmit. If unsure, say Y. +config MIPS_SIM_NET + tristate "MIPS simulator Network device (EXPERIMENTAL)" + depends on NETDEVICES && MIPS_SIM && EXPERIMENTAL + help + The MIPSNET device is a simple Ethernet network device which is + emulated by the MIPS Simulator. + If you are not using a MIPSsim or are unsure, say N. + config SGI_O2MACE_ETH tristate "SGI O2 MACE Fast Ethernet support" depends on NET_ETHERNET && SGI_IP32=y @@ -813,7 +821,7 @@ tristate "SMC 91C9x/91C1xxx support" select CRC32 select MII - depends on NET_ETHERNET && (ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH) + depends on NET_ETHERNET && (ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || SOC_AU1X00) help This is a driver for SMC's 91x series of Ethernet chipsets, including the SMC91C94 and the SMC91C111. Say Y if you want it @@ -1164,38 +1172,74 @@ be called ibmveth. config IBM_EMAC - bool "IBM PPC4xx EMAC driver support" + tristate "PowerPC 4xx on-chip Ethernet support" depends on 4xx - select CRC32 - ---help--- - This driver supports the IBM PPC4xx EMAC family of on-chip - Ethernet controllers. - -config IBM_EMAC_ERRMSG - bool "Verbose error messages" - depends on IBM_EMAC && BROKEN + help + This driver supports the PowerPC 4xx EMAC family of on-chip + Ethernet controllers. config IBM_EMAC_RXB int "Number of receive buffers" depends on IBM_EMAC - default "128" if IBM_EMAC4 - default "64" + default "128" config IBM_EMAC_TXB int "Number of transmit buffers" depends on IBM_EMAC - default "128" if IBM_EMAC4 - default "8" + default "64" -config IBM_EMAC_FGAP - int "Frame gap" +config IBM_EMAC_POLL_WEIGHT + int "MAL NAPI polling weight" depends on IBM_EMAC - default "8" + default "32" -config IBM_EMAC_SKBRES - int "Skb reserve amount" +config IBM_EMAC_RX_COPY_THRESHOLD + int "RX skb copy threshold (bytes)" + depends on IBM_EMAC + default "256" + +config IBM_EMAC_RX_SKB_HEADROOM + int "Additional RX skb headroom (bytes)" depends on IBM_EMAC default "0" + help + Additional receive skb headroom. Note, that driver + will always reserve at least 2 bytes to make IP header + aligned, so usualy there is no need to add any additional + headroom. + + If unsure, set to 0. + +config IBM_EMAC_PHY_RX_CLK_FIX + bool "PHY Rx clock workaround" + depends on IBM_EMAC && (405EP || 440GX || 440EP || 440GR) + help + Enable this if EMAC attached to a PHY which doesn't generate + RX clock if there is no link, if this is the case, you will + see "TX disable timeout" or "RX disable timeout" in the system + log. + + If unsure, say N. + +config IBM_EMAC_DEBUG + bool "Debugging" + depends on IBM_EMAC + default n + +config IBM_EMAC_ZMII + bool + depends on IBM_EMAC && (NP405H || NP405L || 44x) + default y + +config IBM_EMAC_RGMII + bool + depends on IBM_EMAC && 440GX + default y + +config IBM_EMAC_TAH + bool + depends on IBM_EMAC && 440GX + default y config NET_PCI bool "EISA, VLB, PCI and on board controllers" @@ -1776,6 +1820,7 @@ controller on the Renesas H8/300 processor. source "drivers/net/fec_8xx/Kconfig" +source "drivers/net/fs_enet/Kconfig" endmenu @@ -2092,6 +2137,7 @@ config GIANFAR tristate "Gianfar Ethernet" depends on 85xx || 83xx + select PHYLIB help This driver supports the Gigabit TSEC on the MPC85xx family of chips, and the FEC on the 8540 @@ -2201,8 +2247,8 @@ depends on PCI ---help--- This driver supports the 10Gbe XFrame NIC of S2IO. - For help regarding driver compilation, installation and - tuning please look into ~/drivers/net/s2io/README.txt. + More specific information on configuring the driver is in + <file:Documentation/networking/s2io.txt>. config S2IO_NAPI bool "Use Rx Polling (NAPI) (EXPERIMENTAL)" @@ -2221,17 +2267,6 @@ If in doubt, say N. -config 2BUFF_MODE - bool "Use 2 Buffer Mode on Rx side." - depends on S2IO - ---help--- - On enabling the 2 buffer mode, the received frame will be - split into 2 parts before being DMA'ed to the hosts memory. - The parts are the ethernet header and ethernet payload. - This is useful on systems where DMA'ing to to unaligned - physical memory loactions comes with a heavy price. - If not sure please say N. - endmenu if !UML @@ -2252,6 +2287,20 @@ tristate "iSeries Virtual Ethernet driver support" depends on PPC_ISERIES +config RIONET + tristate "RapidIO Ethernet over messaging driver support" + depends on NETDEVICES && RAPIDIO + +config RIONET_TX_SIZE + int "Number of outbound queue entries" + depends on RIONET + default "128" + +config RIONET_RX_SIZE + int "Number of inbound queue entries" + depends on RIONET + default "128" + config FDDI bool "FDDI driver support" depends on (PCI || EISA) @@ -2483,6 +2532,19 @@ module; it is called bsd_comp and will show up in the directory modules once you have said "make modules". If unsure, say N. +config PPP_MPPE + tristate "PPP MPPE compression (encryption) (EXPERIMENTAL)" + depends on PPP && EXPERIMENTAL + select CRYPTO + select CRYPTO_SHA1 + select CRYPTO_ARC4 + ---help--- + Support for the MPPE Encryption protocol, as employed by the + Microsoft Point-to-Point Tunneling Protocol. + + See http://pptpclient.sourceforge.net/ for information on + configuring PPTP clients and servers to utilize this method. + config PPPOE tristate "PPP over Ethernet (EXPERIMENTAL)" depends on EXPERIMENTAL && PPP |
|
From: Albert H. <he...@us...> - 2006-01-18 23:42:09
|
Update of /cvsroot/gc-linux/linux/sound/ppc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10066/sound/ppc Modified Files: gcn-ai.c Log Message: Linux 2.6.15. Index: gcn-ai.c =================================================================== RCS file: /cvsroot/gc-linux/linux/sound/ppc/gcn-ai.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- gcn-ai.c 13 Jan 2005 01:55:33 -0000 1.4 +++ gcn-ai.c 18 Jan 2006 23:41:54 -0000 1.5 @@ -21,6 +21,7 @@ #include <linux/module.h> #include <linux/kernel.h> #include <asm/io.h> +#include <asm/cacheflush.h> #include <sound/core.h> #include <sound/pcm.h> #define SNDRV_GET_ID |
|
From: Albert H. <he...@us...> - 2006-01-18 23:42:09
|
Update of /cvsroot/gc-linux/linux/include/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10066/include/linux Modified Files: fb.h Log Message: Linux 2.6.15. Index: fb.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- fb.h 31 Oct 2005 00:31:02 -0000 1.15 +++ fb.h 18 Jan 2006 23:41:54 -0000 1.16 @@ -204,6 +204,14 @@ #define FB_VMODE_SMOOTH_XPAN 512 /* smooth xpan possible (internally used) */ #define FB_VMODE_CONUPDATE 512 /* don't update x/yoffset */ +/* + * Display rotation support + */ +#define FB_ROTATE_UR 0 +#define FB_ROTATE_CW 1 +#define FB_ROTATE_UD 2 +#define FB_ROTATE_CCW 3 + #define PICOS2KHZ(a) (1000000000UL/(a)) #define KHZ2PICOS(a) (1000000000UL/(a)) @@ -492,9 +500,9 @@ #define FB_EVENT_MODE_DELETE 0x04 /* A driver registered itself */ #define FB_EVENT_FB_REGISTERED 0x05 -/* get console to framebuffer mapping */ +/* CONSOLE-SPECIFIC: get console to framebuffer mapping */ #define FB_EVENT_GET_CONSOLE_MAP 0x06 -/* set console to framebuffer mapping */ +/* CONSOLE-SPECIFIC: set console to framebuffer mapping */ #define FB_EVENT_SET_CONSOLE_MAP 0x07 /* A display blank is requested */ #define FB_EVENT_BLANK 0x08 @@ -503,6 +511,12 @@ /* The resolution of the passed in fb_info about to change and all vc's should be changed */ #define FB_EVENT_MODE_CHANGE_ALL 0x0A +/* CONSOLE-SPECIFIC: set console rotation */ +#define FB_EVENT_SET_CON_ROTATE 0x0B +/* CONSOLE-SPECIFIC: get console rotation */ +#define FB_EVENT_GET_CON_ROTATE 0x0C +/* CONSOLE-SPECIFIC: rotate all consoles */ +#define FB_EVENT_SET_CON_ROTATE_ALL 0x0D struct fb_event { struct fb_info *info; @@ -606,6 +620,12 @@ /* perform fb specific mmap */ int (*fb_mmap)(struct fb_info *info, struct file *file, struct vm_area_struct *vma); + + /* save current hardware state */ + void (*fb_save_state)(struct fb_info *info); + + /* restore saved state */ + void (*fb_restore_state)(struct fb_info *info); }; #ifdef CONFIG_FB_TILEBLITTING @@ -715,6 +735,18 @@ from userspace */ #define FBINFO_MISC_TILEBLITTING 0x20000 /* use tile blitting */ +/* A driver may set this flag to indicate that it does want a set_par to be + * called every time when fbcon_switch is executed. The advantage is that with + * this flag set you can really be shure that set_par is always called before + * any of the functions dependant on the correct hardware state or altering + * that state, even if you are using some broken X releases. The disadvantage + * is that it introduces unwanted delays to every console switch if set_par + * is slow. It is a good idea to try this flag in the drivers initialization + * code whenever there is a bug report related to switching between X and the + * framebuffer console. + */ +#define FBINFO_MISC_ALWAYS_SETPAR 0x40000 + struct fb_info { int node; int flags; @@ -812,6 +844,18 @@ #endif +#if defined (__BIG_ENDIAN) +#define FB_LEFT_POS(bpp) (32 - bpp) +#define FB_SHIFT_HIGH(val, bits) ((val) >> (bits)) +#define FB_SHIFT_LOW(val, bits) ((val) << (bits)) +#define FB_BIT_NR(b) (7 - (b)) +#else +#define FB_LEFT_POS(bpp) (0) +#define FB_SHIFT_HIGH(val, bits) ((val) << (bits)) +#define FB_SHIFT_LOW(val, bits) ((val) >> (bits)) +#define FB_BIT_NR(b) (b) +#endif + /* * `Generic' versions of the frame buffer device operations */ @@ -819,7 +863,6 @@ extern int fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var); extern int fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var); extern int fb_blank(struct fb_info *info, int blank); -extern int soft_cursor(struct fb_info *info, struct fb_cursor *cursor); extern void cfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect); extern void cfb_copyarea(struct fb_info *info, const struct fb_copyarea *area); extern void cfb_imageblit(struct fb_info *info, const struct fb_image *image); @@ -827,8 +870,8 @@ /* drivers/video/fbmem.c */ extern int register_framebuffer(struct fb_info *fb_info); extern int unregister_framebuffer(struct fb_info *fb_info); -extern int fb_prepare_logo(struct fb_info *fb_info); -extern int fb_show_logo(struct fb_info *fb_info); +extern int fb_prepare_logo(struct fb_info *fb_info, int rotate); +extern int fb_show_logo(struct fb_info *fb_info, int rotate); extern char* fb_get_buffer_offset(struct fb_info *info, struct fb_pixmap *buf, u32 size); extern void fb_pad_unaligned_buffer(u8 *dst, u32 d_pitch, u8 *src, u32 idx, u32 height, u32 shift_high, u32 shift_low, u32 mod); @@ -838,6 +881,7 @@ struct fb_fix_screeninfo *fix); extern int fb_get_options(char *name, char **option); extern int fb_new_modelist(struct fb_info *info); +extern int fb_con_duit(struct fb_info *info, int event, void *data); extern struct fb_info *registered_fb[FB_MAX]; extern int num_registered_fb; @@ -907,11 +951,13 @@ struct list_head *head); extern struct fb_videomode *fb_find_best_mode(struct fb_var_screeninfo *var, struct list_head *head); -extern struct fb_videomode *fb_find_nearest_mode(struct fb_var_screeninfo *var, +extern struct fb_videomode *fb_find_nearest_mode(struct fb_videomode *mode, struct list_head *head); extern void fb_destroy_modelist(struct list_head *head); extern void fb_videomode_to_modelist(struct fb_videomode *modedb, int num, struct list_head *head); +extern struct fb_videomode *fb_find_best_display(struct fb_monspecs *specs, + struct list_head *head); /* drivers/video/fbcmap.c */ extern int fb_alloc_cmap(struct fb_cmap *cmap, int len, int transp); |
|
From: Albert H. <he...@us...> - 2005-11-20 20:37:53
|
Update of /cvsroot/gc-linux/linux/drivers/block/gcn-di In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv445/drivers/block/gcn-di Modified Files: gcn-di.c Log Message: Uhmm... wait for 2.6.15 before commiting the platform_device.h includes... Index: gcn-di.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-di/gcn-di.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- gcn-di.c 20 Nov 2005 20:25:59 -0000 1.13 +++ gcn-di.c 20 Nov 2005 20:37:45 -0000 1.14 @@ -23,7 +23,6 @@ #include <linux/delay.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <linux/platform_device.h> #include <linux/blkdev.h> #include <linux/fcntl.h> #include <linux/hdreg.h> |
|
From: Albert H. <he...@us...> - 2005-11-20 20:37:53
|
Update of /cvsroot/gc-linux/linux/drivers/block In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv445/drivers/block Modified Files: gcn-aram.c Log Message: Uhmm... wait for 2.6.15 before commiting the platform_device.h includes... Index: gcn-aram.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-aram.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- gcn-aram.c 20 Nov 2005 20:27:55 -0000 1.8 +++ gcn-aram.c 20 Nov 2005 20:37:45 -0000 1.9 @@ -17,7 +17,6 @@ #include <linux/module.h> #include <linux/major.h> -#include <linux/platform_device.h> #include <linux/blkdev.h> #include <linux/fcntl.h> /* O_ACCMODE */ #include <linux/hdreg.h> /* HDIO_GETGEO */ |
|
From: Albert H. <he...@us...> - 2005-11-20 20:36:23
|
Update of /cvsroot/gc-linux/linux/arch/ppc/platforms In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32197 Modified Files: gcn-rtc.c Log Message: Added machdep.h for the ppc_md switch definition. Do not use the exi_dev_try_take for non-atomic functions, specially for rtc_get_time. Index: gcn-rtc.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gcn-rtc.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- gcn-rtc.c 7 Nov 2005 21:40:20 -0000 1.5 +++ gcn-rtc.c 20 Nov 2005 20:36:15 -0000 1.6 @@ -16,8 +16,8 @@ #include <linux/init.h> #include <linux/time.h> - #include <linux/exi.h> +#include <asm/machdep.h> #define DRV_MODULE_NAME "gcn-rtc" #define DRV_DESCRIPTION "Nintendo GameCube RTC/SRAM driver" @@ -70,22 +70,22 @@ struct gcn_sram *sram = &priv->sram; u32 req; - if (exi_dev_try_take(dev) == 0) { - /* select the SRAM device */ - exi_dev_select(dev); + exi_dev_take(dev); - /* send the appropriate command */ - req = 0x20000100; - exi_dev_write(dev, &req, sizeof(req)); + /* select the SRAM device */ + exi_dev_select(dev); - /* read the SRAM data */ - exi_dev_read(dev, sram, sizeof(*sram)); + /* send the appropriate command */ + req = 0x20000100; + exi_dev_write(dev, &req, sizeof(req)); - /* deselect the SRAM device */ - exi_dev_deselect(dev); + /* read the SRAM data */ + exi_dev_read(dev, sram, sizeof(*sram)); - exi_dev_give(dev); - } + /* deselect the SRAM device */ + exi_dev_deselect(dev); + + exi_dev_give(dev); return; } @@ -98,22 +98,22 @@ { unsigned long a = 0; - if (exi_dev_try_take(dev) == 0) { - /* select the SRAM device */ - exi_dev_select(dev); + exi_dev_take(dev); - /* send the appropriate command */ - a = 0x20000000; - exi_dev_write(dev, &a, sizeof(a)); + /* select the SRAM device */ + exi_dev_select(dev); - /* read the time and date value */ - exi_dev_read(dev, &a, sizeof(a)); + /* send the appropriate command */ + a = 0x20000000; + exi_dev_write(dev, &a, sizeof(a)); - /* deselect the RTC device */ - exi_dev_deselect(dev); + /* read the time and date value */ + exi_dev_read(dev, &a, sizeof(a)); - exi_dev_give(dev); - } + /* deselect the RTC device */ + exi_dev_deselect(dev); + + exi_dev_give(dev); return a; } |
|
From: Albert H. <he...@us...> - 2005-11-20 20:28:03
|
Update of /cvsroot/gc-linux/linux/drivers/block In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30116 Modified Files: gcn-aram.c Log Message: Added header file for platform device related definitions. Index: gcn-aram.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-aram.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- gcn-aram.c 22 Mar 2005 20:39:14 -0000 1.7 +++ gcn-aram.c 20 Nov 2005 20:27:55 -0000 1.8 @@ -17,6 +17,7 @@ #include <linux/module.h> #include <linux/major.h> +#include <linux/platform_device.h> #include <linux/blkdev.h> #include <linux/fcntl.h> /* O_ACCMODE */ #include <linux/hdreg.h> /* HDIO_GETGEO */ |
|
From: Albert H. <he...@us...> - 2005-11-20 20:26:11
|
Update of /cvsroot/gc-linux/linux/drivers/block/gcn-di In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29700 Modified Files: gcn-di.c Log Message: Whitespace damage. Index: gcn-di.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-di/gcn-di.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- gcn-di.c 20 Nov 2005 20:23:04 -0000 1.12 +++ gcn-di.c 20 Nov 2005 20:25:59 -0000 1.13 @@ -1657,7 +1657,7 @@ * If we have a pending command, that's a previously scheduled * motor off. Wait for it to terminate before going on. */ - spin_lock_irqsave(&ddev->lock, flags); + spin_lock_irqsave(&ddev->lock, flags); if (ddev->cmd && ddev->ref_count == 0) { cmd = ddev->cmd; cmd->done_data = &complete; |
165 messages has been excluded from this view by a project administrator.
