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: <aot...@us...> - 2004-02-18 20:11:49
|
Update of /cvsroot/gc-linux/linux/include/sound In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21902/include/sound Modified Files: asound.h Log Message: Merged 2.6.3 Index: asound.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/sound/asound.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- asound.h 4 Feb 2004 23:53:26 -0000 1.1 +++ asound.h 18 Feb 2004 20:01:58 -0000 1.2 @@ -108,9 +108,10 @@ SNDRV_HWDEP_IFACE_VX, /* Digigram VX cards */ SNDRV_HWDEP_IFACE_MIXART, /* Digigram miXart cards */ SNDRV_HWDEP_IFACE_USX2Y, /* Tascam US122, US224 & US428 usb */ + SNDRV_HWDEP_IFACE_EMUX_WAVETABLE, /* EmuX wavetable */ /* Don't forget to change the following: */ - SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_USX2Y, + SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_EMUX_WAVETABLE, }; struct sndrv_hwdep_info { @@ -273,6 +274,7 @@ #define SNDRV_PCM_INFO_HALF_DUPLEX 0x00100000 /* only half duplex */ #define SNDRV_PCM_INFO_JOINT_DUPLEX 0x00200000 /* playback and capture stream are somewhat correlated */ #define SNDRV_PCM_INFO_SYNC_START 0x00400000 /* pcm support some kind of sync go */ +#define SNDRV_PCM_INFO_NONATOMIC_OPS 0x00800000 /* non-atomic prepare callback */ enum sndrv_pcm_state { SNDRV_PCM_STATE_OPEN = 0, /* stream is open */ @@ -283,7 +285,8 @@ SNDRV_PCM_STATE_DRAINING, /* stream is draining */ SNDRV_PCM_STATE_PAUSED, /* stream is paused */ SNDRV_PCM_STATE_SUSPENDED, /* hardware is suspended */ - SNDRV_PCM_STATE_LAST = SNDRV_PCM_STATE_SUSPENDED, + SNDRV_PCM_STATE_DISCONNECTED, /* hardware is disconnected */ + SNDRV_PCM_STATE_LAST = SNDRV_PCM_STATE_DISCONNECTED, }; enum { @@ -684,7 +687,7 @@ * * ****************************************************************************/ -#define SNDRV_CTL_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 2) +#define SNDRV_CTL_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 3) struct sndrv_ctl_card_info { int card; /* card number */ @@ -729,6 +732,7 @@ #define SNDRV_CTL_ELEM_ACCESS_INACTIVE (1<<8) /* control does actually nothing, but may be updated */ #define SNDRV_CTL_ELEM_ACCESS_LOCK (1<<9) /* write lock */ #define SNDRV_CTL_ELEM_ACCESS_OWNER (1<<10) /* write lock owner */ +#define SNDRV_CTL_ELEM_ACCESS_USER (1<<29) /* user space element */ #define SNDRV_CTL_ELEM_ACCESS_DINDIRECT (1<<30) /* indirect access for matrix dimensions in the info structure */ #define SNDRV_CTL_ELEM_ACCESS_INDIRECT (1<<31) /* indirect access for element value in the value structure */ @@ -825,6 +829,9 @@ SNDRV_CTL_IOCTL_ELEM_LOCK = _IOW('U', 0x14, struct sndrv_ctl_elem_id), SNDRV_CTL_IOCTL_ELEM_UNLOCK = _IOW('U', 0x15, struct sndrv_ctl_elem_id), SNDRV_CTL_IOCTL_SUBSCRIBE_EVENTS = _IOWR('U', 0x16, int), + SNDRV_CTL_IOCTL_ELEM_ADD = _IOWR('U', 0x17, struct sndrv_ctl_elem_info), + SNDRV_CTL_IOCTL_ELEM_REPLACE = _IOWR('U', 0x18, struct sndrv_ctl_elem_info), + SNDRV_CTL_IOCTL_ELEM_REMOVE = _IOWR('U', 0x19, struct sndrv_ctl_elem_id), SNDRV_CTL_IOCTL_HWDEP_NEXT_DEVICE = _IOWR('U', 0x20, int), SNDRV_CTL_IOCTL_HWDEP_INFO = _IOR('U', 0x21, struct sndrv_hwdep_info), SNDRV_CTL_IOCTL_PCM_NEXT_DEVICE = _IOR('U', 0x30, int), |
|
From: <aot...@us...> - 2004-02-18 20:11:49
|
Update of /cvsroot/gc-linux/linux/init In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21902/init Modified Files: main.c Log Message: Merged 2.6.3 Index: main.c =================================================================== RCS file: /cvsroot/gc-linux/linux/init/main.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- main.c 14 Feb 2004 17:50:21 -0000 1.3 +++ main.c 18 Feb 2004 20:01:59 -0000 1.4 @@ -339,21 +339,21 @@ /* Called by boot processor to activate the rest. */ static void __init smp_init(void) { - unsigned int i, j=0; + unsigned int i; + unsigned j = 0; /* FIXME: This should be done in userspace --RR */ for (i = 0; i < NR_CPUS; i++) { if (num_online_cpus() >= max_cpus) break; if (cpu_possible(i) && !cpu_online(i)) { - printk("Bringing up %i\n", i); cpu_up(i); j++; } } /* Any cleanup work */ - printk("CPUS done %u\n", j); + printk("Brought up %u CPUs\n", j); smp_cpus_done(max_cpus); #if 0 /* Get other processors into their bootup holding patterns. */ |
|
From: <aot...@us...> - 2004-02-18 20:11:49
|
Update of /cvsroot/gc-linux/linux/include/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21902/include/linux Modified Files: fb.h Log Message: Merged 2.6.3 Index: fb.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- fb.h 29 Jan 2004 22:13:25 -0000 1.1 +++ fb.h 18 Feb 2004 20:01:58 -0000 1.2 @@ -1,10 +1,7 @@ #ifndef _LINUX_FB_H #define _LINUX_FB_H -#include <linux/tty.h> -#include <linux/workqueue.h> #include <asm/types.h> -#include <asm/io.h> /* Definitions of frame buffers */ @@ -326,32 +323,65 @@ struct fb_image image; /* Cursor image */ }; +#ifdef __KERNEL__ + +#include <linux/fs.h> +#include <linux/init.h> +#include <linux/tty.h> +#include <linux/device.h> +#include <linux/workqueue.h> +#include <linux/devfs_fs_kernel.h> +#include <linux/notifier.h> +#include <asm/io.h> + +struct vm_area_struct; +struct fb_info; +struct device; +struct file; + +/* + * Register/unregister for framebuffer events + */ + +/* The resolution of the passed in fb_info about to change */ +#define FB_EVENT_MODE_CHANGE 0x01 +/* The display on this fb_info is beeing suspended, no access to the + * framebuffer is allowed any more after that call returns + */ +#define FB_EVENT_SUSPEND 0x02 +/* The display on this fb_info was resumed, you can restore the display + * if you own it + */ +#define FB_EVENT_RESUME 0x03 + +extern int fb_register_client(struct notifier_block *nb); +extern int fb_unregister_client(struct notifier_block *nb); + +/* + * Pixmap structure definition + * + * The purpose of this structure is to translate data + * from the hardware independent format of fbdev to what + * format the hardware needs. + */ + #define FB_PIXMAP_DEFAULT 1 /* used internally by fbcon */ #define FB_PIXMAP_SYSTEM 2 /* memory is in system RAM */ #define FB_PIXMAP_IO 4 /* memory is iomapped */ #define FB_PIXMAP_SYNC 256 /* set if GPU can DMA */ struct fb_pixmap { - __u8 *addr; /* pointer to memory */ - __u32 size; /* size of buffer in bytes */ - __u32 offset; /* current offset to buffer */ - __u32 buf_align; /* byte alignment of each bitmap */ - __u32 scan_align; /* alignment per scanline */ - __u32 flags; /* see FB_PIXMAP_* */ + u8 *addr; /* pointer to memory */ + u32 size; /* size of buffer in bytes */ + u32 offset; /* current offset to buffer */ + u32 buf_align; /* byte alignment of each bitmap */ + u32 scan_align; /* alignment per scanline */ + u32 access_align; /* alignment per read/write */ + u32 flags; /* see FB_PIXMAP_* */ /* access methods */ void (*outbuf)(u8 *dst, u8 *addr, unsigned int size); u8 (*inbuf) (u8 *addr); - spinlock_t lock; /* spinlock */ - atomic_t count; }; -#ifdef __KERNEL__ - -#include <linux/fs.h> -#include <linux/init.h> - -struct fb_info; -struct vm_area_struct; -struct file; /* * Frame buffer operations @@ -362,58 +392,84 @@ struct module *owner; int (*fb_open)(struct fb_info *info, int user); int (*fb_release)(struct fb_info *info, int user); + /* For framebuffers with strange non linear layouts */ - ssize_t (*fb_read)(struct file *file, char *buf, size_t count, loff_t *ppos); - ssize_t (*fb_write)(struct file *file, const char *buf, size_t count, loff_t *ppos); - /* checks var and creates a par based on it */ - int (*fb_check_var)(struct fb_var_screeninfo *var, struct fb_info *info); - /* set the video mode according to par */ + ssize_t(*fb_read) (struct file * file, char *buf, size_t count, + loff_t * ppos); + ssize_t(*fb_write) (struct file * file, const char *buf, + size_t count, loff_t * ppos); + + /* checks var and eventually tweaks it to something supported, + * DO NOT MODIFY PAR */ + int (*fb_check_var) (struct fb_var_screeninfo * var, + struct fb_info * info); + /* set the video mode according to info->var */ int (*fb_set_par)(struct fb_info *info); + /* set color register */ int (*fb_setcolreg)(unsigned regno, unsigned red, unsigned green, - unsigned blue, unsigned transp, struct fb_info *info); + unsigned blue, unsigned transp, + struct fb_info * info); + /* blank display */ int (*fb_blank)(int blank, struct fb_info *info); + /* pan display */ - int (*fb_pan_display)(struct fb_var_screeninfo *var, struct fb_info *info); + int (*fb_pan_display) (struct fb_var_screeninfo * var, + struct fb_info * info); + /* draws a rectangle */ - void (*fb_fillrect)(struct fb_info *info, const struct fb_fillrect *rect); + void (*fb_fillrect) (struct fb_info * info, + const struct fb_fillrect * rect); /* Copy data from area to another */ - void (*fb_copyarea)(struct fb_info *info,const struct fb_copyarea *region); + void (*fb_copyarea) (struct fb_info * info, + const struct fb_copyarea * region); /* Draws a image to the display */ - void (*fb_imageblit)(struct fb_info *info, const struct fb_image *image); + void (*fb_imageblit) (struct fb_info * info, + const struct fb_image * image); + /* Draws cursor */ - int (*fb_cursor)(struct fb_info *info, struct fb_cursor *cursor); + int (*fb_cursor) (struct fb_info * info, + struct fb_cursor * cursor); + /* Rotates the display */ void (*fb_rotate)(struct fb_info *info, int angle); + /* wait for blit idle, optional */ int (*fb_sync)(struct fb_info *info); + /* perform fb specific ioctl (optional) */ - int (*fb_ioctl)(struct inode *inode, struct file *file, unsigned int cmd, - unsigned long arg, struct fb_info *info); + int (*fb_ioctl) (struct inode * inode, struct file * file, + unsigned int cmd, unsigned long arg, + struct fb_info * info); + /* perform fb specific mmap */ - int (*fb_mmap)(struct fb_info *info, struct file *file, struct vm_area_struct *vma); + int (*fb_mmap) (struct fb_info * info, struct file * file, + struct vm_area_struct * vma); }; struct fb_info { - int node; - int flags; - int open; /* Has this been open already ? */ + int node; + int flags; + int open; /* Has this been open already ? */ #define FBINFO_FLAG_MODULE 1 /* Low-level driver is a module */ - struct fb_var_screeninfo var; /* Current var */ - struct fb_fix_screeninfo fix; /* Current fix */ - struct fb_monspecs monspecs; /* Current Monitor specs */ - struct fb_cursor cursor; /* Current cursor */ - struct work_struct queue; /* Framebuffer event queue */ - struct fb_pixmap pixmap; /* Current pixmap */ - struct fb_cmap cmap; /* Current cmap */ - struct fb_ops *fbops; - char *screen_base; /* Virtual address */ - struct vc_data *display_fg; /* Console visible on this display */ - int currcon; /* Current VC. */ - void *pseudo_palette; /* Fake palette of 16 colors */ - /* From here on everything is device dependent */ - void *par; + struct fb_var_screeninfo var; /* Current var */ + struct fb_fix_screeninfo fix; /* Current fix */ + struct fb_monspecs monspecs; /* Current Monitor specs */ + struct fb_cursor cursor; /* Current cursor */ + struct work_struct queue; /* Framebuffer event queue */ + struct fb_pixmap pixmap; /* Image Hardware Mapper */ + struct fb_cmap cmap; /* Current cmap */ + struct fb_ops *fbops; + char *screen_base; /* Virtual address */ + struct vc_data *display_fg; /* Console visible on this display */ + int currcon; /* Current VC. */ + void *pseudo_palette; /* Fake palette of 16 colors */ +#define FBINFO_STATE_RUNNING 0 +#define FBINFO_STATE_SUSPENDED 1 + u32 state; /* Hardware state i.e suspend */ + /* From here on everything is device dependent */ + void *par; }; #ifdef MODULE @@ -438,7 +494,7 @@ #define fb_writeq sbus_writeq #define fb_memset sbus_memset_io -#elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) +#elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) || defined(__sh__) #define fb_readb __raw_readb #define fb_readw __raw_readw @@ -487,14 +543,20 @@ extern int fb_prepare_logo(struct fb_info *fb_info); extern int fb_show_logo(struct fb_info *fb_info); extern u32 fb_get_buffer_offset(struct fb_info *info, u32 size); -extern void move_buf_unaligned(struct fb_info *info, u8 *dst, u8 *src, u32 d_pitch, - u32 height, u32 mask, u32 shift_high, u32 shift_low, - u32 mod, u32 idx); -extern void move_buf_aligned(struct fb_info *info, u8 *dst, u8 *src, u32 d_pitch, - u32 s_pitch, u32 height); +extern void move_buf_unaligned(struct fb_info *info, u8 * dst, u8 * src, + u32 d_pitch, u32 height, u32 mask, + u32 shift_high, u32 shift_low, u32 mod, + u32 idx); +extern void move_buf_aligned(struct fb_info *info, u8 * dst, u8 * src, + u32 d_pitch, u32 s_pitch, u32 height); +extern void fb_set_suspend(struct fb_info *info, int state); extern struct fb_info *registered_fb[FB_MAX]; extern int num_registered_fb; +/* drivers/video/fbsysfs.c */ +extern struct fb_info *framebuffer_alloc(size_t size, struct device *dev); +extern void framebuffer_release(struct fb_info *info); + /* drivers/video/fbmon.c */ #define FB_MAXTIMINGS 0 #define FB_VSYNCTIMINGS 1 @@ -522,8 +584,7 @@ /* drivers/video/fbcmap.c */ extern int fb_alloc_cmap(struct fb_cmap *cmap, int len, int transp); extern void fb_dealloc_cmap(struct fb_cmap *cmap); -extern int fb_copy_cmap(struct fb_cmap *from, struct fb_cmap *to, - int fsfromto); +extern int fb_copy_cmap(struct fb_cmap *from, struct fb_cmap *to, int fsfromto); extern int fb_set_cmap(struct fb_cmap *cmap, int kspc, struct fb_info *fb_info); extern struct fb_cmap *fb_default_cmap(int len); extern void fb_invert_cmaps(void); @@ -546,7 +607,8 @@ #ifdef MODULE static inline int fb_find_mode(struct fb_var_screeninfo *var, - struct fb_info *info, const char *mode_option, + struct fb_info *info, + const char *mode_option, const struct fb_videomode *db, unsigned int dbsize, const struct fb_videomode *default_mode, @@ -573,7 +635,8 @@ } #else extern int __init fb_find_mode(struct fb_var_screeninfo *var, - struct fb_info *info, const char *mode_option, + struct fb_info *info, + const char *mode_option, const struct fb_videomode *db, unsigned int dbsize, const struct fb_videomode *default_mode, |
|
From: <aot...@us...> - 2004-02-18 20:11:49
|
Update of /cvsroot/gc-linux/linux/drivers/video In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21902/drivers/video Modified Files: Kconfig Makefile fbmem.c Log Message: Merged 2.6.3 Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Kconfig 14 Feb 2004 17:50:21 -0000 1.2 +++ Kconfig 18 Feb 2004 20:01:58 -0000 1.3 @@ -462,6 +462,7 @@ config FB_MATROX tristate "Matrox acceleration" depends on FB && PCI + select I2C_ALGOBIT if FB_MATROX_I2C ---help--- Say Y here if you have a Matrox Millennium, Matrox Millennium II, Matrox Mystique, Matrox Mystique 220, Matrox Productiva G100, Matrox @@ -549,7 +550,6 @@ config FB_MATROX_I2C tristate "Matrox I2C support" depends on FB_MATROX && I2C - select I2C_ALGOBIT ---help--- This drivers creates I2C buses which are needed for accessing the DDC (I2C) bus present on all Matroxes, an I2C bus which @@ -614,16 +614,51 @@ There is no need for enabling 'Matrox multihead support' if you have only one Matrox card in the box. +config FB_RADEON_OLD + tristate "ATI Radeon display support (Old driver)" + depends on FB && PCI + help + Choose this option if you want to use an ATI Radeon graphics card as + a framebuffer device. There are both PCI and AGP versions. You + don't need to choose this to run the Radeon in plain VGA mode. + There is a product page at + <http://www.ati.com/na/pages/products/pc/radeon32/index.html>. + config FB_RADEON tristate "ATI Radeon display support" depends on FB && PCI + select I2C_ALGOBIT if FB_RADEON_I2C help Choose this option if you want to use an ATI Radeon graphics card as a framebuffer device. There are both PCI and AGP versions. You don't need to choose this to run the Radeon in plain VGA mode. + + If you say Y here and want DDC/I2C support you must first say Y to + "I2C support" and "I2C bit-banging support" in the character devices + section. + + If you say M here then "I2C support" and "I2C bit-banging support" + can be build either as modules or built-in. + There is a product page at <http://www.ati.com/na/pages/products/pc/radeon32/index.html>. +config FB_RADEON_I2C + bool "DDC/I2C for ATI Radeon support" + depends on FB_RADEON && I2C + default y + help + Say Y here if you want DDC/I2C support for your Radeon board. + +config FB_RADEON_DEBUG + bool "Lots of debug output from Radeon driver" + depends on FB_RADEON + default n + help + Say Y here if you want the Radeon driver to output all sorts + of debugging informations to provide to the maintainer when + something goes wrong. + config FB_ATY128 tristate "ATI Rage128 display support" depends on FB && PCI @@ -673,26 +708,27 @@ Say Y here to support booting a Rage XL without BIOS support. config FB_SIS - tristate "SIS acceleration" + tristate "SiS acceleration" depends on FB && PCI help - This is the frame buffer device driver for the SiS 630 and 640 Super - Socket 7 UMA cards. Specs available at <http://www.sis.com.tw/>. + This is the frame buffer device driver for the SiS 300, 315 and + 330 series VGA chipsets. Specs available at http://www.sis.com + + To compile this driver as a module, choose M here; the module + will be called sisfb. config FB_SIS_300 - bool "SIS 630/540/730 support" + bool "SiS 300 series support" depends on FB_SIS help - This is the frame buffer device driver for the SiS 630 and related - Super Socket 7 UMA cards. Specs available at - <http://www.sis.com.tw/>. + Say Y here to support use of the SiS 300/305, 540, 630 and 730. config FB_SIS_315 - bool "SIS 315H/315 support" + bool "SiS 315/330 series support" depends on FB_SIS help - This is the frame buffer device driver for the SiS 315 graphics - card. Specs available at <http://www.sis.com.tw/>. + Say Y here to support use of the SiS 315 and 330 series + (315/H/PRO, 55x, 650, 651, 740, 330, 661, 741, 760). config FB_NEOMAGIC tristate "NeoMagic display support" Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 14 Feb 2004 17:50:21 -0000 1.2 +++ Makefile 18 Feb 2004 20:01:58 -0000 1.3 @@ -7,7 +7,7 @@ obj-$(CONFIG_VT) += console/ obj-$(CONFIG_LOGO) += logo/ -obj-$(CONFIG_FB) += fbmem.o fbmon.o fbcmap.o modedb.o softcursor.o +obj-$(CONFIG_FB) += fbmem.o fbmon.o fbcmap.o fbsysfs.o modedb.o softcursor.o # Only include macmodes.o if we have FB support and are PPC ifeq ($(CONFIG_FB),y) obj-$(CONFIG_PPC) += macmodes.o @@ -21,7 +21,7 @@ obj-$(CONFIG_FB_Q40) += q40fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_ATARI) += atafb.o obj-$(CONFIG_FB_68328) += 68328fb.o -obj-$(CONFIG_FB_RADEON) += radeonfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o +obj-$(CONFIG_FB_RADEON_OLD) += radeonfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_NEOMAGIC) += neofb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_IGA) += igafb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_CONTROL) += controlfb.o macmodes.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o @@ -60,6 +60,7 @@ obj-$(CONFIG_FB_SIS) += sis/ cfbcopyarea.o cfbfillrect.o cfbimgblt.o obj-$(CONFIG_FB_ATY) += aty/ cfbcopyarea.o cfbfillrect.o cfbimgblt.o obj-$(CONFIG_FB_ATY128) += aty/ cfbcopyarea.o cfbfillrect.o cfbimgblt.o +obj-$(CONFIG_FB_RADEON) += aty/ cfbcopyarea.o cfbfillrect.o cfbimgblt.o obj-$(CONFIG_FB_I810) += i810/ cfbfillrect.o cfbcopyarea.o \ cfbimgblt.o vgastate.o @@ -67,7 +68,7 @@ obj-$(CONFIG_FB_HGA) += hgafb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_SA1100) += sa1100fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_VIRTUAL) += vfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o -obj-$(CONFIG_FB_HIT) += hitfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o +obj-$(CONFIG_FB_HIT) += hitfb.o cfbfillrect.o cfbimgblt.o obj-$(CONFIG_FB_E1355) += epson1355fb.o obj-$(CONFIG_FB_PVR2) += pvr2fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_KYRO) += kyro/ cfbfillrect.o cfbcopyarea.o cfbimgblt.o Index: fbmem.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/fbmem.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- fbmem.c 14 Feb 2004 17:50:21 -0000 1.2 +++ fbmem.c 18 Feb 2004 20:01:58 -0000 1.3 @@ -27,6 +27,7 @@ #include <linux/init.h> #include <linux/linux_logo.h> #include <linux/proc_fs.h> +#include <linux/console.h> #ifdef CONFIG_KMOD #include <linux/kmod.h> #endif @@ -102,10 +103,10 @@ extern int matroxfb_init(void); extern int matroxfb_setup(char*); extern int hpfb_init(void); +extern int platinumfb_init(void); +extern int platinumfb_setup(char*); extern int control_init(void); extern int control_setup(char*); -extern int platinum_init(void); -extern int platinum_setup(char*); extern int valkyriefb_init(void); extern int valkyriefb_setup(char*); extern int chips_init(void); @@ -135,6 +136,8 @@ extern int tx3912fb_setup(char*); extern int radeonfb_init(void); extern int radeonfb_setup(char*); +extern int radeonfb_old_init(void); +extern int radeonfb_old_setup(char*); extern int e1355fb_init(void); extern int e1355fb_setup(char*); extern int pvr2fb_init(void); @@ -222,11 +225,14 @@ #ifdef CONFIG_FB_RADEON { "radeonfb", radeonfb_init, radeonfb_setup }, #endif +#ifdef CONFIG_FB_RADEON_OLD + { "radeonfb_old", radeonfb_old_init, radeonfb_old_setup }, +#endif #ifdef CONFIG_FB_CONTROL { "controlfb", control_init, control_setup }, #endif #ifdef CONFIG_FB_PLATINUM - { "platinumfb", platinum_init, platinum_setup }, + { "platinumfb", platinumfb_init, platinumfb_setup }, #endif #ifdef CONFIG_FB_VALKYRIE { "valkyriefb", valkyriefb_init, valkyriefb_setup }, @@ -398,6 +404,7 @@ static initcall_t pref_init_funcs[FB_MAX]; static int num_pref_init_funcs __initdata = 0; +static struct notifier_block *fb_notifier_list; struct fb_info *registered_fb[FB_MAX]; int num_registered_fb; @@ -466,23 +473,32 @@ */ u32 fb_get_buffer_offset(struct fb_info *info, u32 size) { - u32 align = info->pixmap.buf_align - 1; - u32 offset, count = 1000; + struct fb_pixmap *buf = &info->pixmap; + u32 align = buf->buf_align - 1, offset; - spin_lock(&info->pixmap.lock); - offset = info->pixmap.offset + align; + /* If IO mapped, we need to sync before access, no sharing of + * the pixmap is done + */ + if (buf->flags & FB_PIXMAP_IO) { + if (info->fbops->fb_sync && (buf->flags & FB_PIXMAP_SYNC)) + info->fbops->fb_sync(info); + return 0; + } + + /* See if we fit in the remaining pixmap space */ + offset = buf->offset + align; offset &= ~align; - if (offset + size > info->pixmap.size) { - while (atomic_read(&info->pixmap.count) && count--); - if (info->fbops->fb_sync && - info->pixmap.flags & FB_PIXMAP_SYNC) + if (offset + size > buf->size) { + /* We do not fit. In order to be able to re-use the buffer, + * we must ensure no asynchronous DMA'ing or whatever operation + * is in progress, we sync for that. + */ + if (info->fbops->fb_sync && (buf->flags & FB_PIXMAP_SYNC)) info->fbops->fb_sync(info); offset = 0; } - info->pixmap.offset = offset + size; - atomic_inc(&info->pixmap.count); - smp_mb__after_atomic_inc(); - spin_unlock(&info->pixmap.lock); + buf->offset = offset + size; + return offset; } @@ -688,8 +704,8 @@ struct fb_image image; int x; - /* Return if the frame buffer is not mapped */ - if (fb_logo.logo == NULL) + /* Return if the frame buffer is not mapped or suspended */ + if (fb_logo.logo == NULL || info->state != FBINFO_STATE_RUNNING) return 0; image.depth = fb_logo.depth; @@ -735,8 +751,6 @@ x <= info->var.xres-fb_logo.logo->width; x += (fb_logo.logo->width + 8)) { image.dx = x; info->fbops->fb_imageblit(info, &image); - //atomic_dec(&info->pixmap.count); - //smp_mb__after_atomic_dec(); } if (palette != NULL) @@ -783,6 +797,9 @@ if (!info || ! info->screen_base) return -ENODEV; + if (info->state != FBINFO_STATE_RUNNING) + return -EPERM; + if (info->fbops->fb_read) return info->fbops->fb_read(file, buf, count, ppos); @@ -818,6 +835,9 @@ if (!info || !info->screen_base) return -ENODEV; + if (info->state != FBINFO_STATE_RUNNING) + return -EPERM; + if (info->fbops->fb_write) return info->fbops->fb_write(file, buf, count, ppos); @@ -944,6 +964,8 @@ fb_pan_display(info, &info->var); fb_set_cmap(&info->cmap, 1, info); + + notifier_call_chain(&fb_notifier_list, FB_EVENT_MODE_CHANGE, info); } } return 0; @@ -982,7 +1004,7 @@ struct fb_con2fbmap con2fb; #endif struct fb_cmap cmap; - int i; + int i, rc; if (!fb) return -ENODEV; @@ -993,7 +1015,9 @@ case FBIOPUT_VSCREENINFO: if (copy_from_user(&var, (void *) arg, sizeof(var))) return -EFAULT; + acquire_console_sem(); i = fb_set_var(info, &var); + release_console_sem(); if (i) return i; if (copy_to_user((void *) arg, &var, sizeof(var))) return -EFAULT; @@ -1012,13 +1036,19 @@ case FBIOPAN_DISPLAY: if (copy_from_user(&var, (void *) arg, sizeof(var))) return -EFAULT; - if ((i = fb_pan_display(info, &var))) + acquire_console_sem(); + i = fb_pan_display(info, &var); + release_console_sem(); + if (i) return i; if (copy_to_user((void *) arg, &var, sizeof(var))) return -EFAULT; return 0; case FBIO_CURSOR: - return (fb_cursor(info, (struct fb_cursor *) arg)); + acquire_console_sem(); + rc = fb_cursor(info, (struct fb_cursor *) arg); + release_console_sem(); + return rc; #ifdef CONFIG_FRAMEBUFFER_CONSOLE case FBIOGET_CON2FBMAP: if (copy_from_user(&con2fb, (void *)arg, sizeof(con2fb))) @@ -1048,7 +1078,10 @@ return 0; #endif /* CONFIG_FRAMEBUFFER_CONSOLE */ case FBIOBLANK: - return fb_blank(info, arg); + acquire_console_sem(); + i = fb_blank(info, arg); + release_console_sem(); + return i; default: if (fb->fb_ioctl == NULL) return -EINVAL; @@ -1245,7 +1278,6 @@ fb_info->pixmap.outbuf = sys_outbuf; if (fb_info->pixmap.inbuf == NULL) fb_info->pixmap.inbuf = sys_inbuf; - spin_lock_init(&fb_info->pixmap.lock); registered_fb[i] = fb_info; @@ -1282,6 +1314,43 @@ return 0; } +/** + * fb_register_client - register a client notifier + * @nb: notifier block to callback on events + */ +int fb_register_client(struct notifier_block *nb) +{ + return notifier_chain_register(&fb_notifier_list, nb); +} + +/** + * fb_unregister_client - unregister a client notifier + * @nb: notifier block to callback on events + */ +int fb_unregister_client(struct notifier_block *nb) +{ + return notifier_chain_unregister(&fb_notifier_list, nb); +} + +/** + * fb_set_suspend - low level driver signals suspend + * @info: framebuffer affected + * @state: 0 = resuming, !=0 = suspending + * + * This is meant to be used by low level drivers to + * signal suspend/resume to the core & clients. + * It must be called with the console semaphore held + */ +void fb_set_suspend(struct fb_info *info, int state) +{ + if (state) { + notifier_call_chain(&fb_notifier_list, FB_EVENT_SUSPEND, info); + info->state = FBINFO_STATE_SUSPENDED; + } else { + info->state = FBINFO_STATE_RUNNING; + notifier_call_chain(&fb_notifier_list, FB_EVENT_RESUME, info); + } +} /** * fbmem_init - init frame buffer subsystem @@ -1396,5 +1465,8 @@ EXPORT_SYMBOL(fb_get_buffer_offset); EXPORT_SYMBOL(move_buf_unaligned); EXPORT_SYMBOL(move_buf_aligned); +EXPORT_SYMBOL(fb_set_suspend); +EXPORT_SYMBOL(fb_register_client); +EXPORT_SYMBOL(fb_unregister_client); MODULE_LICENSE("GPL"); |
|
From: <aot...@us...> - 2004-02-18 20:11:49
|
Update of /cvsroot/gc-linux/linux/drivers/net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21902/drivers/net Modified Files: Kconfig Makefile Log Message: Merged 2.6.3 Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Kconfig 14 Feb 2004 17:50:21 -0000 1.2 +++ Kconfig 18 Feb 2004 20:01:58 -0000 1.3 @@ -1583,6 +1583,24 @@ experience problems, you can enable this option to restore the old RX-reset behavior. If unsure, say N. +config 8139_RXBUF_IDX + int "Receive ring size (0 => 8K, 1 => 16K, 2 => 32K, 3 => 64K)" + depends on 8139TOO + range 0 3 + default 1 if EMBEDDED || SH_DREAMCAST + default 2 + help + The 8139too driver has a fixed area of memory for receiving data. + The default value is adequate for most systems. The 64KB + ring size has hardware issues that may cause problems. + Values: + 0 => 8 KB + 1 => 16 KB embedded systems + 2 => 32 KB default for most systems + 3 => 64 KB + If unsure, use the default 2. + + config SIS900 tristate "SiS 900/7016 PCI Fast Ethernet Adapter support" depends on NET_PCI && PCI Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 14 Feb 2004 17:50:21 -0000 1.2 +++ Makefile 18 Feb 2004 20:01:58 -0000 1.3 @@ -112,7 +112,6 @@ obj-$(CONFIG_DUMMY) += dummy.o obj-$(CONFIG_DE600) += de600.o obj-$(CONFIG_DE620) += de620.o -obj-$(CONFIG_AT1500) += lance.o obj-$(CONFIG_LANCE) += lance.o obj-$(CONFIG_SUN3_82586) += sun3_82586.o obj-$(CONFIG_SUN3LANCE) += sun3lance.o |
|
From: <aot...@us...> - 2004-02-18 20:11:48
|
Update of /cvsroot/gc-linux/linux/arch/ppc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21902/arch/ppc Modified Files: Kconfig Log Message: Merged 2.6.3 Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/Kconfig,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Kconfig 14 Feb 2004 17:50:21 -0000 1.6 +++ Kconfig 18 Feb 2004 20:01:57 -0000 1.7 @@ -30,6 +30,10 @@ bool default y +# All PPCs use generic nvram driver through ppc_md +config GENERIC_NVRAM + bool + default y source "init/Kconfig" @@ -181,7 +185,7 @@ config PPC601_SYNC_FIX bool "Workarounds for PPC601 bugs" - depends on 6xx + depends on 6xx && (PPC_PREP || PPC_PMAC) help Some versions of the PPC601 (the first PowerPC chip) have bugs which mean that extra synchronization instructions are required near @@ -608,14 +612,14 @@ depends on PPC_MULTIPLATFORM default y -config PPC_GEN550 +config PPC_PMAC bool - depends on SANDPOINT + depends on PPC_MULTIPLATFORM default y -config PPC_PMAC +config PPC_PMAC64 bool - depends on PPC_MULTIPLATFORM + depends on PPC_PMAC && POWER4 default y config PPC_PREP @@ -628,6 +632,11 @@ depends on PPC_PMAC || PPC_CHRP default y +config PPC_GEN550 + bool + depends on SANDPOINT || MCPN765 || SPRUCE + default y + config FORCE bool depends on 6xx && (PCORE || POWERPMC250) @@ -1020,8 +1029,6 @@ source "drivers/pcmcia/Kconfig" -source "drivers/parport/Kconfig" - endmenu menu "Advanced setup" @@ -1120,179 +1127,10 @@ depends on ADVANCED_OPTIONS && 8xx endmenu -source "drivers/base/Kconfig" - -source "drivers/mtd/Kconfig" - -source "drivers/pnp/Kconfig" - -source "drivers/block/Kconfig" - -source "drivers/md/Kconfig" - -source "drivers/ide/Kconfig" - -source "drivers/scsi/Kconfig" - -source "drivers/message/fusion/Kconfig" - -source "drivers/ieee1394/Kconfig" - -source "drivers/message/i2o/Kconfig" - -source "net/Kconfig" - -source "drivers/isdn/Kconfig" - -source "drivers/video/Kconfig" - -source "drivers/cdrom/Kconfig" - -source "drivers/input/Kconfig" - - -menu "Macintosh device drivers" - -# we want to change this to something like CONFIG_SYSCTRL_CUDA/PMU -config ADB_CUDA - bool "Support for CUDA based PowerMacs" - depends on PPC_PMAC - help - This provides support for CUDA based Power Macintosh systems. This - includes most OldWorld PowerMacs, the first generation iMacs, the - Blue&White G3 and the "Yikes" G4 (PCI Graphics). All later models - should use CONFIG_ADB_PMU instead. It is safe to say Y here even if - your machine doesn't have a CUDA. - - If unsure say Y. - -config ADB_PMU - bool "Support for PMU based PowerMacs" - depends on PPC_PMAC - help - On PowerBooks, iBooks, and recent iMacs and Power Macintoshes, the - PMU is an embedded microprocessor whose primary function is to - control system power, and battery charging on the portable models. - The PMU also controls the ADB (Apple Desktop Bus) which connects to - the keyboard and mouse on some machines, as well as the non-volatile - RAM and the RTC (real time clock) chip. Say Y to enable support for - this device; you should do so if your machine is one of those - mentioned above. - -config PMAC_PBOOK - bool "Power management support for PowerBooks" - depends on ADB_PMU - ---help--- - This provides support for putting a PowerBook to sleep; it also - enables media bay support. Power management works on the - PB2400/3400/3500, Wallstreet, Lombard, and Bronze PowerBook G3 and - the Titanium Powerbook G4, as well as the iBooks. You should get - the power management daemon, pmud, to make it work and you must have - the /dev/pmu device (see the pmud README). - - Get pmud from <ftp://ftp.samba.org/pub/ppclinux/pmud/>. - - If you have a PowerBook, you should say Y here. - - You may also want to compile the dma sound driver as a module and - have it autoloaded. The act of removing the module shuts down the - sound hardware for more power savings. - -config PM - bool - depends on PPC_PMAC && ADB_PMU && PMAC_PBOOK - default y - -config PMAC_APM_EMU - tristate "APM emulation" - depends on PMAC_PBOOK - -# made a separate option since backlight may end up beeing used -# on non-powerbook machines (but only on PMU based ones AFAIK) -config PMAC_BACKLIGHT - bool "Backlight control for LCD screens" - depends on ADB_PMU - help - Say Y here to build in code to manage the LCD backlight on a - Macintosh PowerBook. With this code, the backlight will be turned - on and off appropriately on power-management and lid-open/lid-closed - events; also, the PowerBook button device will be enabled so you can - change the screen brightness. - -config MAC_FLOPPY - bool "Support for PowerMac floppy" - depends on PPC_PMAC - help - If you have a SWIM-3 (Super Woz Integrated Machine 3; from Apple) - floppy controller, say Y here. Most commonly found in PowerMacs. - -config MAC_SERIAL - tristate "Support for PowerMac serial ports (OBSOLETE DRIVER)" - depends on PPC_PMAC - help - This driver is obsolete. Use CONFIG_SERIAL_PMACZILOG in - "Character devices --> Serial drivers --> PowerMac z85c30" option. - -config ADB - bool "Apple Desktop Bus (ADB) support" - depends on PPC_PMAC - help - Apple Desktop Bus (ADB) support is for support of devices which - are connected to an ADB port. ADB devices tend to have 4 pins. - If you have an Apple Macintosh prior to the iMac, an iBook or - PowerBook, or a "Blue and White G3", you probably want to say Y - here. Otherwise say N. - -config ADB_MACIO - bool "Include MacIO (CHRP) ADB driver" - depends on ADB - help - Say Y here to include direct support for the ADB controller in the - Hydra chip used on PowerPC Macintoshes of the CHRP type. (The Hydra - also includes a MESH II SCSI controller, DBDMA controller, VIA chip, - OpenPIC controller and two RS422/Geoports.) - -config INPUT_ADBHID - bool "Support for ADB input devices (keyboard, mice, ...)" - depends on ADB && INPUT=y - help - Say Y here if you want to have ADB (Apple Desktop Bus) HID devices - such as keyboards, mice, joysticks, trackpads or graphic tablets - handled by the input layer. If you say Y here, make sure to say Y to - the corresponding drivers "Keyboard support" (CONFIG_INPUT_KEYBDEV), - "Mouse Support" (CONFIG_INPUT_MOUSEDEV) and "Event interface - support" (CONFIG_INPUT_EVDEV) as well. - - If unsure, say Y. - -config MAC_EMUMOUSEBTN - bool "Support for mouse button 2+3 emulation" - depends on INPUT_ADBHID - help - This provides generic support for emulating the 2nd and 3rd mouse - button with keypresses. If you say Y here, the emulation is still - disabled by default. The emulation is controlled by these sysctl - entries: - /proc/sys/dev/mac_hid/mouse_button_emulation - /proc/sys/dev/mac_hid/mouse_button2_keycode - /proc/sys/dev/mac_hid/mouse_button3_keycode - - If you have an Apple machine with a 1-button mouse, say Y here. - -config ANSLCD - bool "Support for ANS LCD display" - depends on ADB_CUDA - -endmenu - -source "drivers/char/Kconfig" - -source "drivers/media/Kconfig" +source "drivers/Kconfig" source "fs/Kconfig" -source "sound/Kconfig" - source "arch/ppc/8xx_io/Kconfig" source "arch/ppc/8260_io/Kconfig" @@ -1317,8 +1155,6 @@ endmenu -source "drivers/usb/Kconfig" - source "lib/Kconfig" @@ -1436,7 +1272,7 @@ config SERIAL_TEXT_DEBUG bool "Support for early boot texts over serial port" - depends on 4xx || GT64260 || LOPEC || MCPN765 || PPLUS || PRPMC800 || SANDPOINT + depends on 4xx || GT64260 || LOPEC || PPLUS || PRPMC800 || PPC_GEN550 config OCP bool |
|
From: <aot...@us...> - 2004-02-18 20:11:48
|
Update of /cvsroot/gc-linux/linux/arch/ppc/platforms In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21902/arch/ppc/platforms Modified Files: Makefile Log Message: Merged 2.6.3 Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile 30 Jan 2004 14:59:15 -0000 1.4 +++ Makefile 18 Feb 2004 20:01:58 -0000 1.5 @@ -17,9 +17,10 @@ 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_feature.o pmac_pci.o pmac_sleep.o \ + pmac_low_i2c.o obj-$(CONFIG_PPC_CHRP) += chrp_setup.o chrp_time.o chrp_pci.o -obj-$(CONFIG_PPC_PREP) += prep_pci.o prep_time.o prep_setup.o +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 |
|
From: <aot...@us...> - 2004-02-18 20:11:48
|
Update of /cvsroot/gc-linux/linux/arch/ppc/configs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21902/arch/ppc/configs Modified Files: gamecube_defconfig Log Message: Merged 2.6.3 Index: gamecube_defconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/configs/gamecube_defconfig,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- gamecube_defconfig 14 Feb 2004 17:50:21 -0000 1.12 +++ gamecube_defconfig 18 Feb 2004 20:01:58 -0000 1.13 @@ -6,6 +6,7 @@ CONFIG_HAVE_DEC_LOCK=y CONFIG_PPC=y CONFIG_PPC32=y +CONFIG_GENERIC_NVRAM=y # # Code maturity level options @@ -63,7 +64,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y # CONFIG_CPU_FREQ_24_API is not set -# CONFIG_PPC601_SYNC_FIX is not set CONFIG_EMBEDDEDBOOT=y CONFIG_PPC_STD_MMU=y @@ -116,11 +116,6 @@ # CONFIG_HOTPLUG is not set # -# Parallel port support -# -# CONFIG_PARPORT is not set - -# # Advanced setup # CONFIG_ADVANCED_OPTIONS=y @@ -135,6 +130,10 @@ CONFIG_BOOT_LOAD=0x400000 # +# Device Drivers +# + +# # Generic Driver Options # @@ -144,6 +143,11 @@ # CONFIG_MTD is not set # +# Parallel port support +# +# CONFIG_PARPORT is not set + +# # Plug and Play support # @@ -164,11 +168,6 @@ CONFIG_LBD=y # -# Multi-device support (RAID and LVM) -# -# CONFIG_MD is not set - -# # ATA/ATAPI/MFM/RLL support # # CONFIG_IDE is not set @@ -179,6 +178,11 @@ # CONFIG_SCSI is not set # +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# # Fusion MPT device support # @@ -193,6 +197,10 @@ # CONFIG_I2O is not set # +# Macintosh device drivers +# + +# # Networking support # CONFIG_NET=y @@ -341,47 +349,9 @@ # CONFIG_ISDN_BOOL is not set # -# Graphics support -# -CONFIG_FB=y -# CONFIG_FB_CYBER2000 is not set -# CONFIG_FB_CT65550 is not set -# CONFIG_FB_IMSTT is not set -# CONFIG_FB_S3TRIO is not set -# CONFIG_FB_VGA16 is not set -# CONFIG_FB_RIVA is not set -# CONFIG_FB_MATROX is not set -# CONFIG_FB_RADEON is not set -# CONFIG_FB_ATY128 is not set -# CONFIG_FB_ATY is not set -# CONFIG_FB_SIS is not set -# CONFIG_FB_NEOMAGIC is not set -# CONFIG_FB_KYRO is not set -# CONFIG_FB_3DFX is not set -# CONFIG_FB_VOODOO1 is not set -# CONFIG_FB_TRIDENT is not set -CONFIG_FB_GAMECUBE=y -# CONFIG_FB_VIRTUAL is not set - -# -# Console display driver support -# -# CONFIG_VGA_CONSOLE is not set -# CONFIG_MDA_CONSOLE is not set -CONFIG_DUMMY_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_PCI_CONSOLE=y -# CONFIG_FONTS is not set -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y - -# -# Logo configuration +# Telephony Support # -CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_VGA16=y -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_PHONE is not set # # Input device support @@ -426,10 +396,6 @@ # CONFIG_INPUT_MISC is not set # -# Macintosh device drivers -# - -# # Character devices # CONFIG_VT=y @@ -479,6 +445,11 @@ # CONFIG_RAW_DRIVER is not set # +# I2C support +# +# CONFIG_I2C is not set + +# # Multimedia devices # # CONFIG_VIDEO_DEV is not set @@ -489,6 +460,127 @@ # CONFIG_DVB is not set # +# Graphics support +# +CONFIG_FB=y +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_CT65550 is not set +# CONFIG_FB_IMSTT is not set +# CONFIG_FB_S3TRIO is not set +# CONFIG_FB_VGA16 is not set +# CONFIG_FB_RIVA is not set +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON_OLD is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +# CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_TRIDENT is not set +CONFIG_FB_GAMECUBE=y +# CONFIG_FB_VIRTUAL is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +# CONFIG_MDA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_PCI_CONSOLE=y +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y + +# +# Logo configuration +# +CONFIG_LOGO=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y +CONFIG_LOGO_LINUX_CLUT224=y + +# +# Sound +# +CONFIG_SOUND=y + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=y +# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_OSSEMUL=y +# CONFIG_SND_MIXER_OSS is not set +CONFIG_SND_PCM_OSS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# PCI devices +# +# CONFIG_SND_ALI5451 is not set +# CONFIG_SND_AZT3328 is not set +# CONFIG_SND_BT87X is not set +# CONFIG_SND_CS46XX is not set +# CONFIG_SND_CS4281 is not set +# CONFIG_SND_EMU10K1 is not set +# CONFIG_SND_KORG1212 is not set +# CONFIG_SND_NM256 is not set +# CONFIG_SND_RME32 is not set +# CONFIG_SND_RME96 is not set +# CONFIG_SND_RME9652 is not set +# CONFIG_SND_HDSP is not set +# CONFIG_SND_TRIDENT is not set +# CONFIG_SND_YMFPCI is not set +# CONFIG_SND_ALS4000 is not set +# CONFIG_SND_CMIPCI is not set +# CONFIG_SND_ENS1370 is not set +# CONFIG_SND_ENS1371 is not set +# CONFIG_SND_ES1938 is not set +# CONFIG_SND_ES1968 is not set +# CONFIG_SND_MAESTRO3 is not set +# CONFIG_SND_FM801 is not set +# CONFIG_SND_ICE1712 is not set +# CONFIG_SND_ICE1724 is not set +# CONFIG_SND_INTEL8X0 is not set +# CONFIG_SND_SONICVIBES is not set +# CONFIG_SND_VIA82XX is not set +# CONFIG_SND_VX222 is not set + +# +# ALSA PPC devices +# +# CONFIG_SND_POWERMAC is not set +CONFIG_SND_GAMECUBE=y + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set + +# +# USB support +# +# CONFIG_USB is not set + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set + +# # File systems # CONFIG_EXT2_FS=y @@ -628,82 +720,6 @@ # CONFIG_NLS_UTF8 is not set # -# Sound -# -CONFIG_SOUND=y - -# -# Advanced Linux Sound Architecture -# -CONFIG_SND=y -# CONFIG_SND_SEQUENCER is not set -CONFIG_SND_OSSEMUL=y -# CONFIG_SND_MIXER_OSS is not set -CONFIG_SND_PCM_OSS=y -# CONFIG_SND_VERBOSE_PRINTK is not set -# CONFIG_SND_DEBUG is not set - -# -# Generic devices -# -# CONFIG_SND_DUMMY is not set -# CONFIG_SND_MTPAV is not set -# CONFIG_SND_SERIAL_U16550 is not set -# CONFIG_SND_MPU401 is not set - -# -# PCI devices -# -# CONFIG_SND_ALI5451 is not set -# CONFIG_SND_AZT3328 is not set -# CONFIG_SND_CS46XX is not set -# CONFIG_SND_CS4281 is not set -# CONFIG_SND_EMU10K1 is not set -# CONFIG_SND_KORG1212 is not set -# CONFIG_SND_NM256 is not set -# CONFIG_SND_RME32 is not set -# CONFIG_SND_RME96 is not set -# CONFIG_SND_RME9652 is not set -# CONFIG_SND_HDSP is not set -# CONFIG_SND_TRIDENT is not set -# CONFIG_SND_YMFPCI is not set -# CONFIG_SND_ALS4000 is not set -# CONFIG_SND_CMIPCI is not set -# CONFIG_SND_ENS1370 is not set -# CONFIG_SND_ENS1371 is not set -# CONFIG_SND_ES1938 is not set -# CONFIG_SND_ES1968 is not set -# CONFIG_SND_MAESTRO3 is not set -# CONFIG_SND_FM801 is not set -# CONFIG_SND_ICE1712 is not set -# CONFIG_SND_ICE1724 is not set -# CONFIG_SND_INTEL8X0 is not set -# CONFIG_SND_SONICVIBES is not set -# CONFIG_SND_VIA82XX is not set -# CONFIG_SND_VX222 is not set - -# -# ALSA PPC devices -# -# CONFIG_SND_POWERMAC is not set -CONFIG_SND_GAMECUBE=y - -# -# Open Sound System -# -# CONFIG_SOUND_PRIME is not set - -# -# USB support -# -# CONFIG_USB is not set - -# -# USB Gadget Support -# -# CONFIG_USB_GADGET is not set - -# # Library routines # CONFIG_CRC32=y |
|
From: <aot...@us...> - 2004-02-18 20:11:48
|
Update of /cvsroot/gc-linux/linux/arch/ppc/boot/simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21902/arch/ppc/boot/simple Modified Files: Makefile Log Message: Merged 2.6.3 Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/simple/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 29 Jan 2004 23:08:15 -0000 1.3 +++ Makefile 18 Feb 2004 20:01:57 -0000 1.4 @@ -30,7 +30,7 @@ # Normally, we use the 'misc.c' file for decompress_kernel and # whatnot. Sometimes we need to override this however. -misc-y := misc.o +misc-y := misc.o ../common/bootinfo.o # Normally, we have our images end in .elf, but something we want to # change this. @@ -103,7 +103,7 @@ zimageinitrd-$(CONFIG_SPRUCE) := zImage.initrd-TREE end-$(CONFIG_SPRUCE) := spruce entrypoint-$(CONFIG_SPRUCE) := 0x00800000 - misc-$(CONFIG_SPRUCE) := misc-spruce.o + misc-$(CONFIG_SPRUCE) += misc-spruce.o # SMP images should have a '.smp' suffix. end-$(CONFIG_SMP) += .smp |
|
From: <aot...@us...> - 2004-02-18 20:11:48
|
Update of /cvsroot/gc-linux/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21902 Modified Files: Makefile Log Message: Merged 2.6.3 Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 14 Feb 2004 17:50:20 -0000 1.2 +++ Makefile 18 Feb 2004 20:01:57 -0000 1.3 @@ -1,6 +1,6 @@ VERSION = 2 PATCHLEVEL = 6 -SUBLEVEL = 2 +SUBLEVEL = 3 EXTRAVERSION = NAME=Feisty Dunnart @@ -832,7 +832,7 @@ cmd_cscope-file = $(all-sources) > cscope.files quiet_cmd_cscope = MAKE cscope.out - cmd_cscope = cscope -k -b + cmd_cscope = cscope -k -b -q cscope: FORCE $(call cmd,cscope-file) |
|
From: <aot...@us...> - 2004-02-14 17:57:10
|
Update of /cvsroot/gc-linux/linux/init In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25980/init Modified Files: main.c Log Message: Merge 2.6.2 Index: main.c =================================================================== RCS file: /cvsroot/gc-linux/linux/init/main.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- main.c 29 Jan 2004 01:02:50 -0000 1.2 +++ main.c 14 Feb 2004 17:50:21 -0000 1.3 @@ -105,7 +105,7 @@ extern void time_init(void); /* Default late time init is NULL. archs can override this later. */ -void (*late_time_init)(void) = NULL; +void (*late_time_init)(void); extern void softirq_init(void); static char *execute_command; @@ -339,7 +339,7 @@ /* Called by boot processor to activate the rest. */ static void __init smp_init(void) { - unsigned int i; + unsigned int i, j=0; /* FIXME: This should be done in userspace --RR */ for (i = 0; i < NR_CPUS; i++) { @@ -348,11 +348,12 @@ if (cpu_possible(i) && !cpu_online(i)) { printk("Bringing up %i\n", i); cpu_up(i); + j++; } } /* Any cleanup work */ - printk("CPUS done %u\n", max_cpus); + printk("CPUS done %u\n", j); smp_cpus_done(max_cpus); #if 0 /* Get other processors into their bootup holding patterns. */ @@ -411,6 +412,7 @@ parse_args("Booting kernel", command_line, __start___param, __stop___param - __start___param, &unknown_bootoption); + sort_main_extable(); trap_init(); rcu_init(); init_IRQ(); |
|
From: <aot...@us...> - 2004-02-14 17:57:10
|
Update of /cvsroot/gc-linux/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25980 Modified Files: Makefile Log Message: Merge 2.6.2 Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- Makefile 23 Jan 2004 03:26:07 -0000 1.1.1.1 +++ Makefile 14 Feb 2004 17:50:20 -0000 1.2 @@ -1,7 +1,8 @@ VERSION = 2 PATCHLEVEL = 6 -SUBLEVEL = 1 +SUBLEVEL = 2 EXTRAVERSION = +NAME=Feisty Dunnart ARCH=ppc CROSS_COMPILE=powerpc-eabi-elf- @@ -692,7 +693,7 @@ _modinst_: @if [ -z "`$(DEPMOD) -V | grep module-init-tools`" ]; then \ echo "Warning: you may need to install module-init-tools"; \ - echo "See http://www.codemonkey.org.uk/post-halloween-2.5.txt";\ + echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt";\ sleep 1; \ fi @rm -rf $(MODLIB)/kernel @@ -827,8 +828,15 @@ -name '*.[chS]' -print ) endef -quiet_cmd_cscope = MAKE $@ -cmd_cscope = $(all-sources) | cscope -k -b -i - +quiet_cmd_cscope-file = FILELST cscope.files + cmd_cscope-file = $(all-sources) > cscope.files + +quiet_cmd_cscope = MAKE cscope.out + cmd_cscope = cscope -k -b + +cscope: FORCE + $(call cmd,cscope-file) + $(call cmd,cscope) quiet_cmd_TAGS = MAKE $@ cmd_TAGS = $(all-sources) | etags - @@ -842,9 +850,6 @@ $(all-sources) | xargs ctags $$CTAGSF -a endef -cscope: FORCE - $(call cmd,cscope) - TAGS: FORCE $(call cmd,TAGS) |
|
From: <aot...@us...> - 2004-02-14 17:57:10
|
Update of /cvsroot/gc-linux/linux/drivers/net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25980/drivers/net Modified Files: Kconfig Makefile Log Message: Merge 2.6.2 Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Kconfig 31 Jan 2004 02:47:01 -0000 1.1 +++ Kconfig 14 Feb 2004 17:50:21 -0000 1.2 @@ -663,7 +663,7 @@ config ELMC_II tristate "3c527 \"EtherLink/MC 32\" support (EXPERIMENTAL)" - depends on NET_VENDOR_3COM && MCA && EXPERIMENTAL && BROKEN_ON_SMP + depends on NET_VENDOR_3COM && MCA && MCA_LEGACY help If you have a network (Ethernet) card of this type, say Y and read the Ethernet-HOWTO, available from @@ -1289,6 +1289,19 @@ <file:Documentation/networking/net-modules.txt>. The module will be called b44. +config FORCEDETH + tristate "Reverse Engineered nForce Ethernet support (EXPERIMENTAL)" + depends on NET_PCI && PCI && EXPERIMENTAL + help + If you have a network (Ethernet) controller of this type, say Y and + read the Ethernet-HOWTO, available from + <http://www.tldp.org/docs.html#howto>. + + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module will be + called forcedeth. + + config CS89x0 tristate "CS89x0 support" depends on NET_PCI && ISA @@ -1690,7 +1703,7 @@ <file:Documentation/Changes>) and you can say N here. Laptop users should read the Linux Laptop home page at - <http://www.cs.utexas.edu/users/kharker/linux-laptop/>. + <http://www.linux-on-laptops.com/>. Note that the answer to this question doesn't directly affect the kernel: saying N will just cause the configurator to skip all @@ -1963,9 +1976,11 @@ - EG1032 v2 Instant Gigabit Network Adapter - EG1064 v2 Instant Gigabit Network Adapter - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Abit) + - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Albatron) - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Asus) - Marvell 88E8001 Gigabit LOM Ethernet Adapter (ECS) - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Epox) + - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Foxconn) - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Gigabyte) - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Iwill) - Marvell RDK-8001 Adapter @@ -2011,8 +2026,10 @@ Questions concerning this driver may be addressed to: li...@sy... - To compile this driver as a module, choose M here: the module - will be called sk98lin. This is recommended. + If you want to compile this driver as a module ( = code which can be + inserted in and removed from the running kernel whenever you want), + say M here and read Documentation/modules.txt. This is recommended. + The module will be called sk98lin. This is recommended. config TIGON3 tristate "Broadcom Tigon3 support" Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 31 Jan 2004 02:47:01 -0000 1.1 +++ Makefile 14 Feb 2004 17:50:21 -0000 1.2 @@ -95,6 +95,7 @@ obj-$(CONFIG_NE3210) += ne3210.o 8390.o obj-$(CONFIG_NET_SB1250_MAC) += sb1250-mac.o obj-$(CONFIG_B44) += b44.o +obj-$(CONFIG_FORCEDETH) += forcedeth.o obj-$(CONFIG_PPP) += ppp_generic.o slhc.o obj-$(CONFIG_PPP_ASYNC) += ppp_async.o |
|
From: <aot...@us...> - 2004-02-14 17:57:10
|
Update of /cvsroot/gc-linux/linux/drivers/video In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25980/drivers/video Modified Files: Kconfig Makefile fbmem.c Log Message: Merge 2.6.2 Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Kconfig 26 Jan 2004 20:07:01 -0000 1.1 +++ Kconfig 14 Feb 2004 17:50:21 -0000 1.2 @@ -109,29 +109,6 @@ If you plan to use the LCD display with your SA-1100 system, say Y here. -choice - prompt "CerfBoard LCD Display Size" - depends on FB_SA1100 && SA1100_CERF - default CERF_LCD_57_A - -config CERF_LCD_38_A - bool "3.8_Color" - -config CERF_LCD_38_B - bool "3.8_Mono" - -config CERF_LCD_57_A - bool "5.7" - -config CERF_LCD_72_A - bool "7.2" - -endchoice - -config SA1100_CERF_LCD_BACKLIGHT - bool "Cerfboard Backlight (CerfPDA)" - depends on FB_SA1100 && SA1100_CERF_CPLD - config FB_CYBER2000 tristate "CyberPro 2000/2010/5000 support" depends on FB && PCI @@ -406,14 +383,6 @@ (<file:drivers/video/pvr2fb.c>). Please see the file <file:Documentation/fb/pvr2fb.txt>. -config FB_PVR2_DEBUG - bool "Debug pvr2fb" - depends on FB_PVR2=y - help - Say Y here if you wish for the pvr2fb driver to print out debugging - messages. Most people will want to say N here. If unsure, you will - also want to say N. - config FB_E1355 bool "Epson 1355 framebuffer support" depends on FB && SUPERH @@ -579,7 +548,8 @@ config FB_MATROX_I2C tristate "Matrox I2C support" - depends on FB_MATROX && I2C_ALGOBIT + depends on FB_MATROX && I2C + select I2C_ALGOBIT ---help--- This drivers creates I2C buses which are needed for accessing the DDC (I2C) bus present on all Matroxes, an I2C bus which @@ -734,6 +704,16 @@ To compile this driver as a module, choose M here: the module will be called neofb. +config FB_KYRO + tristate "IMG Kyro support" + depends on FB && PCI + help + Say Y here if you have a STG4000 / Kyro / PowerVR 3 based + graphics board. + + To compile this driver as a module, choose M here: the + module will be called kyrofb. + config FB_3DFX tristate "3Dfx Banshee/Voodoo3 display support" depends on FB && PCI Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 26 Jan 2004 20:07:01 -0000 1.1 +++ Makefile 14 Feb 2004 17:50:21 -0000 1.2 @@ -70,6 +70,7 @@ obj-$(CONFIG_FB_HIT) += hitfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_E1355) += epson1355fb.o obj-$(CONFIG_FB_PVR2) += pvr2fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o +obj-$(CONFIG_FB_KYRO) += kyro/ cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_VOODOO1) += sstfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_FFB) += ffb.o sbuslib.o cfbimgblt.o cfbcopyarea.o Index: fbmem.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/fbmem.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- fbmem.c 26 Jan 2004 20:07:01 -0000 1.1 +++ fbmem.c 14 Feb 2004 17:50:21 -0000 1.2 @@ -365,6 +365,10 @@ #ifdef CONFIG_FB_GAMECUBE { "gamecubefb", gamecubefb_init, gamecubefb_setup }, #endif +#ifdef CONFIG_FB_KYRO + { "kyrofb", kyrofb_init, kyrofb_setup }, +#endif + /* * Generic drivers that don't use resource management (yet) */ |
|
From: <aot...@us...> - 2004-02-14 17:57:10
|
Update of /cvsroot/gc-linux/linux/arch/ppc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25980/arch/ppc Modified Files: Kconfig Log Message: Merge 2.6.2 Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/Kconfig,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Kconfig 30 Jan 2004 14:59:14 -0000 1.5 +++ Kconfig 14 Feb 2004 17:50:21 -0000 1.6 @@ -706,6 +706,7 @@ config NR_CPUS int "Maximum number of CPUs (2-32)" + range 2 32 depends on SMP default "4" |
|
From: <aot...@us...> - 2004-02-14 17:57:10
|
Update of /cvsroot/gc-linux/linux/arch/ppc/boot/simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25980/arch/ppc/boot/simple Modified Files: embed_config.c Log Message: Merge 2.6.2 Index: embed_config.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/simple/embed_config.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- embed_config.c 23 Jan 2004 03:26:19 -0000 1.1.1.1 +++ embed_config.c 14 Feb 2004 17:50:21 -0000 1.2 @@ -51,7 +51,7 @@ { u_char *mp; u_char eebuf[128]; - int i; + int i = 8; bd_t *bd; bd = *bdp; @@ -63,11 +63,21 @@ /* All we are looking for is the Ethernet MAC address. The * first 8 bytes are 'MOTOROLA', so check for part of that. + * Next, the VPD describes a MAC 'packet' as being of type 08 + * and size 06. So we look for that and the MAC must follow. + * If there are more than one, we still only care about the first. * If it's there, assume we have a valid MAC address. If not, * grab our default one. */ - if ((*(uint *)eebuf) == 0x4d4f544f) - mp = &eebuf[0x4c]; + if ((*(uint *)eebuf) == 0x4d4f544f) { + while (i < 127 && !(eebuf[i] == 0x08 && eebuf[i + 1] == 0x06)) + i += eebuf[i + 1] + 2; /* skip this packet */ + + if (i == 127) /* Couldn't find. */ + mp = (u_char *)def_enet_addr; + else + mp = &eebuf[i + 2]; + } else mp = (u_char *)def_enet_addr; |
|
From: <aot...@us...> - 2004-02-14 17:57:10
|
Update of /cvsroot/gc-linux/linux/arch/ppc/configs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25980/arch/ppc/configs Modified Files: gamecube_defconfig Log Message: Merge 2.6.2 Index: gamecube_defconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/configs/gamecube_defconfig,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- gamecube_defconfig 6 Feb 2004 11:12:52 -0000 1.11 +++ gamecube_defconfig 14 Feb 2004 17:50:21 -0000 1.12 @@ -146,7 +146,6 @@ # # Plug and Play support # -# CONFIG_PNP is not set # # Block devices @@ -357,6 +356,7 @@ # CONFIG_FB_ATY is not set # CONFIG_FB_SIS is not set # CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_TRIDENT is not set @@ -449,48 +449,6 @@ CONFIG_UNIX98_PTY_COUNT=256 # -# I2C support -# -CONFIG_I2C=m -CONFIG_I2C_CHARDEV=m - -# -# I2C Algorithms -# -# CONFIG_I2C_ALGOBIT is not set -# CONFIG_I2C_ALGOPCF is not set - -# -# I2C Hardware Bus support -# -# CONFIG_I2C_ALI1535 is not set -# CONFIG_I2C_ALI15X3 is not set -# CONFIG_I2C_AMD756 is not set -# CONFIG_I2C_AMD8111 is not set -# CONFIG_I2C_I801 is not set -# CONFIG_I2C_NFORCE2 is not set -# CONFIG_I2C_PIIX4 is not set -# CONFIG_SCx200_ACB is not set -# CONFIG_I2C_SIS5595 is not set -# CONFIG_I2C_SIS630 is not set -# CONFIG_I2C_SIS96X is not set -# CONFIG_I2C_VIAPRO is not set - -# -# I2C Hardware Sensors Chip support -# -# CONFIG_I2C_SENSOR is not set -# CONFIG_SENSORS_ADM1021 is not set -# CONFIG_SENSORS_EEPROM is not set -# CONFIG_SENSORS_IT87 is not set -# CONFIG_SENSORS_LM75 is not set -# CONFIG_SENSORS_LM78 is not set -# CONFIG_SENSORS_LM83 is not set -# CONFIG_SENSORS_LM85 is not set -# CONFIG_SENSORS_VIA686A is not set -# CONFIG_SENSORS_W83781D is not set - -# # Mice # CONFIG_BUSMOUSE=y @@ -739,6 +697,10 @@ # USB support # # CONFIG_USB is not set + +# +# USB Gadget Support +# # CONFIG_USB_GADGET is not set # |
|
From: <ham...@us...> - 2004-02-11 20:19:52
|
Update of /cvsroot/gc-linux/linux/drivers/net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15400/linux/drivers/net Modified Files: gc-net.c Log Message: small changes, little bit better now Index: gc-net.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/gc-net.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- gc-net.c 8 Feb 2004 22:13:22 -0000 1.16 +++ gc-net.c 11 Feb 2004 20:15:27 -0000 1.17 @@ -22,6 +22,9 @@ * $Id$ * * $Log$ + * Revision 1.17 2004/02/11 20:15:27 hamtitampti + * small changes, little bit better now + * * Revision 1.16 2004/02/08 22:13:22 hamtitampti * added log tag * @@ -448,7 +451,8 @@ spin_lock_irqsave(&priv->lock, priv->lockflags); ret = adapter_init(dev); spin_unlock_irqrestore(&priv->lock, priv->lockflags); - + netif_start_queue(dev); + return ret; } @@ -601,7 +605,16 @@ size=0; eth_ins(p_read << 8, descr, 4); + + next_receive_frame = descr[0]; + next_receive_frame |= (descr[1] & 0x0f) << 8; + if (next_receive_frame>0xf) next_receive_frame = 1; + + eth_outb(0x18, next_receive_frame&0xff); + eth_outb(0x19, (next_receive_frame&0x0f00)>>8); + + /* Size Looks Crazy, but ok, the Packet Lenght is indeed 3 nibbles = 12 bits and shifed with 4 bit to the top. @@ -647,8 +660,6 @@ /* We update the Read Page Pointer with the next pointer, which was given to us */ - eth_outb(0x18, descr[0] & 0xFF); - eth_outb(0x19, descr[1] & 0x0F); netif_rx(skb); @@ -669,6 +680,8 @@ if (next_receive_frame != p_write) printk("Multipacket Seen\n"); if (next_receive_frame != p_write) gc_input(dev); */ + gc_input(dev); + return ; } @@ -710,9 +723,9 @@ { // We clear the IRQ eth_outb(9, 2); - //spin_lock_irqsave(&priv->lock, priv->lockflags); + spin_lock_irqsave(&priv->lock, priv->lockflags); gc_input(dev); - //spin_unlock_irqrestore(&priv->lock, priv->lockflags); + spin_unlock_irqrestore(&priv->lock, priv->lockflags); } @@ -1024,8 +1037,6 @@ BBA_DBG("after all: irq mask %x %x\n", eth_inb(8), eth_inb(9)); - netif_start_queue(dev); - return 0; /* OK */ } |
|
From: <ki...@us...> - 2004-02-10 22:51:15
|
Update of /cvsroot/gc-linux/linux/sound/ppc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16253 Modified Files: gamecube.c Log Message: Some real output now, but still doesn't sound right. Index: gamecube.c =================================================================== RCS file: /cvsroot/gc-linux/linux/sound/ppc/gamecube.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gamecube.c 4 Feb 2004 23:53:27 -0000 1.1 +++ gamecube.c 10 Feb 2004 22:47:34 -0000 1.2 @@ -10,6 +10,7 @@ #include <sound/initval.h> #define DSP_IRQ 6 +/* #define GAMECUBE_AUDIO_DEBUG */ #if 0 #include <asm/io.h> @@ -60,7 +61,12 @@ snd_pcm_substream_t *playback_substream; snd_pcm_substream_t *capture_substream; spinlock_t reg_lock; - int irq; + int dma_size; + int period_size; + int nperiods; + int cur_period; + volatile int start_play; + volatile int stop_play; } gamecube_t; static gamecube_t *gamecube_audio = NULL; @@ -69,11 +75,11 @@ .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID), - .formats = /* SNDRV_PCM_FMTBIT_S16_LE,*/ - SNDRV_PCM_FMTBIT_S16 /*| SNDRV_PCM_FMTBIT_IMA_ADPCM*/, - .rates = SNDRV_PCM_RATE_8000_48000, - .rate_min = 8000, - .rate_max = 48000, + .formats = SNDRV_PCM_FMTBIT_S16_BE, + .rates = /* SNDRV_PCM_RATE_8000_48000, */ + SNDRV_PCM_RATE_32000, + .rate_min = /* 8000 */ 32000, + .rate_max = /* 48000 */ 32000, .channels_min = 2, .channels_max = 2, .buffer_bytes_max = 32768, @@ -91,6 +97,7 @@ printk(KERN_ALERT "pcm open\n"); chip->playback_substream = substream; runtime->hw = snd_gamecube_playback; + return 0; } @@ -124,10 +131,11 @@ /* printk(KERN_ALERT "snd_gamecube_prepare\n"); */ printk("prepare: rate=%i, channels=%i, sample_bits=%i\n", runtime->rate, runtime->channels, runtime->sample_bits); - + printk("prepare: format=%i, access=%i\n", + runtime->format, runtime->access); + SetFreq32KHz(); #if 0 /* set requested samplerate */ - sa11xx_uda1341_set_samplerate(chip, runtime->rate); /* set requestd format when available */ /* set FMT here !!! FIXME */ @@ -138,8 +146,6 @@ return 0; } -/* #include "notify.h" */ - static int snd_gamecube_trigger(snd_pcm_substream_t * substream, int cmd) { gamecube_t *chip = snd_pcm_substream_chip(substream); @@ -151,29 +157,29 @@ /* do something to start the PCM engine */ printk(KERN_ALERT "PCM_TRIGGER_START\n"); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - unsigned int i, dma_size, period_size; + chip->dma_size = snd_pcm_lib_buffer_bytes(substream); + chip->period_size = snd_pcm_lib_period_bytes(substream); + chip->nperiods = chip->dma_size / chip->period_size; + chip->cur_period = 0; + chip->stop_play = 0; + chip->start_play = 1; + + printk(KERN_ALERT "stream is PCM_PLAYBACK, dma_area=0x%p dma_size=%i\n", + runtime->dma_area, chip->dma_size); + printk(KERN_ALERT "%i periods of %i bytes\n", + chip->nperiods, chip->period_size); - dma_size = snd_pcm_lib_buffer_bytes(substream); - period_size = snd_pcm_lib_period_bytes(substream); - /* printk(KERN_ALERT "stream is PCM_PLAYBACK, dma_area=0x%p dma_size=%i\n", - runtime->dma_area, dma_size); - printk(KERN_ALERT "period_size=%i\n", period_size); */ - /* for (i = 0; i < 10; i++) printk("0x%.4x ", ((u_int16_t *) runtime->dma_area)[i]); */ - printk("\n"); - /* for (i = 0; i < dma_size; i++) runtime->dma_area[i] = notify[i]; */ - /* LoadSample((u_int32_t) notify, dma_size); */ - LoadSample((u_int32_t) runtime->dma_area, dma_size); - printk("STARTH=%x, STARTL=%x, LENGTH=%x, LEFT=%x\n", - AUDIO_DMA_STARTH, AUDIO_DMA_STARTL, AUDIO_DMA_LENGTH, AUDIO_DMA_LEFT); + flush_dcache_range(runtime->dma_area, runtime->dma_area + chip->period_size); + LoadSample((u_int32_t) runtime->dma_area, chip->period_size); StartSample(); - printk("STARTH=%x, STARTL=%x, LENGTH=%x, LEFT=%x\n", - AUDIO_DMA_STARTH, AUDIO_DMA_STARTL, AUDIO_DMA_LENGTH, AUDIO_DMA_LEFT); } break; case SNDRV_PCM_TRIGGER_STOP: /* do something to stop the PCM engine */ printk(KERN_ALERT "PCM_TRIGGER_STOP\n"); - StopSample(); + + chip->stop_play = 1; + /* StopSample(); */ break; default: return -EINVAL; @@ -187,13 +193,15 @@ gamecube_t *chip = snd_pcm_substream_chip(substream); snd_pcm_runtime_t *runtime = substream->runtime; int left, bytes; - + /* printk(KERN_ALERT "snd_gamecube_pointer\n"); */ left = AUDIO_DMA_LEFT << 5; - bytes = snd_pcm_lib_buffer_bytes(substream); - printk(KERN_ALERT "pointer: %i of %i bytes left\n", left, bytes); + bytes = chip->period_size * (chip->cur_period + 1); + /* bytes = snd_pcm_lib_buffer_bytes(substream); */ - /* underrun all the time? */ +#ifdef GAMECUBE_AUDIO_DEBUG + printk("pointer: %i of %i bytes left, period #%i\n", left, bytes, chip->cur_period); +#endif return bytes_to_frames(runtime, bytes - left); } @@ -201,14 +209,40 @@ { gamecube_t *chip = (gamecube_t *) dev; unsigned long val = AUDIO_DSP_CONTROL; - + if (val & 0x100) { - AUDIO_DSP_CONTROL = (val | 0x100); - printk("DSP interrupt!\n"); + int i; + u_int32_t addr; + +#ifdef GAMECUBE_AUDIO_DEBUG + printk("DSP interrupt! period #%i\n", chip->cur_period); +#endif + if (chip->start_play) { + chip->start_play = 0; + } else if (chip->stop_play) { + StopSample(); + } else { + StopSample(); + + if (chip->cur_period < (chip->nperiods - 1)) { + chip->cur_period++; + } else chip->cur_period = 0; - snd_pcm_period_elapsed(chip->playback_substream); + addr = (u_int32_t) chip->playback_substream->runtime->dma_area + (chip->cur_period * chip->period_size); + /* addr = (u_int32_t) sega + (chip->cur_period * chip->period_size); */ + + flush_dcache_range(addr, addr + chip->period_size); + LoadSample(addr, chip->period_size); + + StartSample(); + chip->start_play = 1; + + snd_pcm_period_elapsed(chip->playback_substream); + } + + AUDIO_DSP_CONTROL = (val | 0x100); /* clear DSP interrupt */ } - + return IRQ_HANDLED; } @@ -259,8 +293,9 @@ static int __init alsa_card_gamecube_init(void) { - int err; + int i, err; snd_card_t *card; + unsigned char *buf1; /* if (!is_gamecube()) return -ENODEV; */ @@ -274,8 +309,10 @@ if (gamecube_audio == NULL) return -ENOMEM; + memset(gamecube_audio, 0, sizeof(gamecube_t)); gamecube_audio->card = card; - + gamecube_audio->stop_play = 1; + strcpy(card->driver, "GAMECUBE"); strcpy(card->shortname, "GameCube audio"); sprintf(card->longname, "GameCube audio"); @@ -284,6 +321,7 @@ snd_printk(KERN_ERR "%s: unable to grab IRQ %d\n", card->shortname, DSP_IRQ); return -EBUSY; } + #if 0 if (request_region(AUDIO_INTERFACE_ADDR, 0x200, card->shortname) == NULL) { printk("unable to grab memory region 0x%lx-0x%lx\n", |
|
From: <ham...@us...> - 2004-02-08 22:16:28
|
Update of /cvsroot/gc-linux/linux/drivers/net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26627/linux/drivers/net Modified Files: gc-net.c Log Message: added log tag Index: gc-net.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/gc-net.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- gc-net.c 8 Feb 2004 22:05:30 -0000 1.15 +++ gc-net.c 8 Feb 2004 22:13:22 -0000 1.16 @@ -18,6 +18,16 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* ------------------------------------------------------------------------- */ +/* + * $Id$ + * + * $Log$ + * Revision 1.16 2004/02/08 22:13:22 hamtitampti + * added log tag + * + * + */ + #include <linux/module.h> #include <linux/kernel.h> #include <linux/types.h> |
|
From: <ham...@us...> - 2004-02-08 22:08:40
|
Update of /cvsroot/gc-linux/linux/drivers/net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24779/linux/drivers/net Modified Files: gc-net.c Log Message: ping now works with 4000 bytes packtes, delay times much more better, but still some :-) packet losses , but this is logical... (missing buffer manager) but it is alraedy cool thx. to steve for doing the compleate testing work remote for me hamtitampti Index: gc-net.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/gc-net.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- gc-net.c 8 Feb 2004 21:26:28 -0000 1.14 +++ gc-net.c 8 Feb 2004 22:05:30 -0000 1.15 @@ -42,6 +42,8 @@ #define BBA_DBG(format, arg...); { } //#define BBA_DBG(format, arg...) printk(f,## arg) +//#define PACKETS_PER_IRQ (0x40) // 2 packets / irq +#define PACKETS_PER_IRQ 0 // IRQ / packet #define BBA_IRQ 4 #define IRQ_EXI 4 @@ -645,15 +647,18 @@ priv->stats.rx_packets ++; /* count all receives */ priv->stats.rx_bytes ++; /* count all received bytes */ - + /* next_receive_frame = descr[0]; next_receive_frame |= (descr[1] & 0x0f) << 8; - //printk("Current Framepointer: %d\n",p_read); - //printk("Next Framepointer: %d\n",next_receive_frame); - //printk("Write Framepointer: %d\n",p_write); - //printk("Recieved Len: %d\n",skb->len); + printk("Current Framepointer: %d\n",p_read); + printk("Next Framepointer: %d\n",next_receive_frame); + printk("Write Framepointer: %d\n",p_write); + printk("Recieved Len: %d\n",skb->len); + if (next_receive_frame != p_write) printk("Multipacket Seen\n"); + if (next_receive_frame != p_write) gc_input(dev); + */ return ; } @@ -695,8 +700,9 @@ { // We clear the IRQ eth_outb(9, 2); - + //spin_lock_irqsave(&priv->lock, priv->lockflags); gc_input(dev); + //spin_unlock_irqrestore(&priv->lock, priv->lockflags); } @@ -721,6 +727,7 @@ { eth_outb(9, 0x80); BBA_DBG("rx overflow!\n"); + gc_input(dev); // RWP eth_outb(0x16, 0x1); @@ -841,8 +848,8 @@ eth_outb(0x5b, eth_inb(0x5b)&~(1<<7)); eth_outb(0x5e, 1); eth_outb(0x5c, eth_inb(0x5c)|4); - eth_outb(1, 0x11); -// eth_outb(1, 0); + eth_outb(1, 0x11 | PACKETS_PER_IRQ); + eth_outb(0x50, 0x80); udelay(10000); @@ -866,7 +873,7 @@ eth_outb(0x1a, 0xF); eth_outb(0x1b, 0); - eth_outb(1, (eth_inb(1) & 0xFE) | 0x12); + eth_outb(1, (eth_inb(1) & 0xFE) | 0x12| PACKETS_PER_IRQ); eth_outb(0, 8); eth_outb(0x32, 8); @@ -946,8 +953,8 @@ eth_outb(0x5b, eth_inb(0x5b)&~(1<<7)); eth_outb(0x5e, 1); eth_outb(0x5c, eth_inb(0x5c)|4); - eth_outb(1, 0x11); -// eth_outb(1, 0); + eth_outb(1, 0x11|PACKETS_PER_IRQ); + eth_outb(0x50, 0x80); udelay(10000); @@ -969,7 +976,7 @@ eth_outb(0x1a, 0xF); eth_outb(0x1b, 0); - eth_outb(1, (eth_inb(1) & 0xFE) | 0x12); + eth_outb(1, (eth_inb(1) & 0xFE) | 0x12| PACKETS_PER_IRQ); eth_outb(0, 8); eth_outb(0x32, 8); |
|
From: <ham...@us...> - 2004-02-08 21:29:34
|
Update of /cvsroot/gc-linux/linux/drivers/net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17081/linux/drivers/net Modified Files: gc-net.c Log Message: much more better network now Index: gc-net.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/gc-net.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- gc-net.c 7 Feb 2004 23:07:35 -0000 1.13 +++ gc-net.c 8 Feb 2004 21:26:28 -0000 1.14 @@ -483,37 +483,20 @@ static int gc_bba_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct gc_private *priv = (struct gc_private *)dev->priv; - int transmit_from; - int tickssofar; - int i; - - if (free_tx_pages <= 0) { /* Do timeouts, to avoid hangs. */ - tickssofar = jiffies - dev->trans_start; - if (tickssofar < 5) { - priv->stats.tx_carrier_errors++; - return 1; - } - /* else */ - BBA_DBG(KERN_WARNING "%s: transmit timed out (%d), %s?\n", dev->name, tickssofar, "network cable problem"); - /* Restart the adapter. */ - spin_lock_irqsave(&priv->lock, priv->lockflags); - if (adapter_init(dev)) { - spin_unlock_irqrestore(&priv->lock, priv->lockflags); - priv->stats.tx_carrier_errors++; - return 1; - } - spin_unlock_irqrestore(&priv->lock, priv->lockflags); - } - + unsigned char Reg0; + + spin_lock_irqsave(&priv->lock, priv->lockflags); netif_stop_queue(dev); - + + //printk("XMIT packet : len %d\n",skb->len); + /* + We send using the FIFO mode + */ /* Start real output */ BBA_DBG("gc_bba_start_xmit:len=%d, page %d/%d\n", skb->len, tx_fifo_in, free_tx_pages); - spin_lock_irqsave(&priv->lock, priv->lockflags); - - dev->trans_start = jiffies; - + // We set the packetbuffer to beginning... + unsigned int val=0xC0004800; // register 0x48 is the output queue exi_select(0, 2, 5); @@ -527,6 +510,7 @@ The Network Drivers wants a minium of 60bytes to be filled into, so we check if we have at leaset 60 bytes */ + if ( skb->len < RUNT) { char buf0[60+4]; memset(buf0, 0, 60+4); @@ -535,45 +519,16 @@ exi_deselect(0); - + // Start Hard Send val = eth_inb(0); - if (val & 4) - { - BBA_DBG("err USE!\n"); - netif_start_queue(dev); /* allow more packets into adapter */ - spin_unlock_irqrestore(&priv->lock, priv->lockflags); - dev_kfree_skb(skb); - return 1; - } - val|=4; + val |=4; eth_outb(0, val); - BBA_DBG("DEBUG: waiting for tx done!\n"); - - while (!(eth_inb(9)&0x14)); - - if (eth_inb(9) & 0x10) - { - BBA_DBG("TRANSMIT ERROR!\n"); - priv->stats.tx_errors++; -// eth_outb(9, 0x10); - } - -// if (eth_inb(9) & 0x4) -// eth_outb(9, 0x4); -// while (!(eth_inb(0)&0x02)); - -// int s = eth_inb(4); -// if (s) - - BBA_DBG("tx error %02x\n", s); - - netif_start_queue(dev); /* allow more packets into adapter */ - spin_unlock_irqrestore(&priv->lock, priv->lockflags); + dev->trans_start = jiffies; dev_kfree_skb(skb); - + priv->stats.tx_bytes++; priv->stats.tx_packets++; @@ -590,13 +545,20 @@ unsigned short size, p_read, p_write; unsigned short next_receive_frame; - int i; int ptr; - + /* Input Flow concept: Take a look to Hardware spec page 35 */ + eth_outb(0x3a, 2); + if (eth_inb(0x3a) & 2) + { + BBA_DBG("NO DATA AVAILABLE!\n"); + priv->stats.rx_missed_errors++; + return ; + } + /* Receive Buffer Write Page Pointer: Current receive write page pointer. The MSB is the Reg17h.3 bit. The LSB is the Reg16h.0 bit. This register is controlled by @@ -615,24 +577,14 @@ p_read = eth_inb(0x18); p_read |= (eth_inb(0x19)&0x0f) << 8; - + + if (p_read == p_write) return; + + //printk("Received a packet .. (start)\n"); + BBA_DBG("Receive Buffer Page Pointer: %x\n", p_read); - if (p_read == p_write) - { - BBA_DBG("nothing left.\n"); - priv->stats.rx_missed_errors++; - return ; - } - unsigned char descr[4]; - eth_outb(0x3a, 2); - if (eth_inb(0x3a) & 2) - { - BBA_DBG("NO DATA AVAILABLE!\n"); - priv->stats.rx_missed_errors++; - return ; - } size=0; @@ -697,12 +649,10 @@ next_receive_frame = descr[0]; next_receive_frame |= (descr[1] & 0x0f) << 8; - /* - do we have additional packages ? - Hopefully, i understood the documentation correct. - We call Recurse the compleate gc_input() again, and do as long - */ - if (next_receive_frame != p_write) gc_input(dev); + //printk("Current Framepointer: %d\n",p_read); + //printk("Next Framepointer: %d\n",next_receive_frame); + //printk("Write Framepointer: %d\n",p_write); + //printk("Recieved Len: %d\n",skb->len); return ; } @@ -710,11 +660,8 @@ static void inline gcif_service(struct net_device *dev) { -// struct gcif *gcif; -// gcif = netif->state; + struct gc_private *priv = (struct gc_private *)dev->priv; - - unsigned short p_read, p_write; int inb9 = eth_inb(9); int inb8 = eth_inb(8); @@ -731,38 +678,39 @@ if (status & 4) { eth_outb(9, 4); + // We clear the IRQ + netif_wake_queue(dev); /* allow more packets into adapter */ + + // TX Transmisstion compleated ... + + /* int s = eth_inb(4); if (s) // should not occur, since 4 == TX OK BBA_DBG("tx error %02x\n", s); + */ } if (status & 2) { + // We clear the IRQ eth_outb(9, 2); - while (1) - { - p_write = eth_inb(0x16); - p_write |= eth_inb(0x17) << 8; - - p_read = eth_inb(0x18); - p_read |= eth_inb(0x19) << 8; - - if (p_write == p_read) - break; - gc_input(dev); - } + + gc_input(dev); + } + if (status & 8) { eth_outb(9, 8); - BBA_DBG("receive error :(\n"); + //printk("receive error :(\n"); } if (status & 0x10) { eth_outb(9, 0x10); - BBA_DBG("tx error\n"); + netif_wake_queue(dev); /* allow more packets into adapter */ + //printk("tx error\n"); } if (status & 0x20) { @@ -773,6 +721,20 @@ { eth_outb(9, 0x80); BBA_DBG("rx overflow!\n"); + + // RWP + eth_outb(0x16, 0x1); + eth_outb(0x17, 0x0); + + // RRP + eth_outb(0x18, 0x1); + eth_outb(0x19, 0x0); + + // RHBP + eth_outb(0x1a, 0xF); + eth_outb(0x1b, 0); + + } if (status & ~(0xBE)) @@ -795,9 +757,7 @@ struct net_device *dev = (struct net_device *)dev_id; struct gc_private *priv = (struct gc_private *)dev->priv; - u8 irq_status; int retrig = 0; - int boguscount = 0; /* This might just as well be deleted now, no crummy drivers present :-) */ if ((dev == NULL) || (dev->irq != irq)) { @@ -805,9 +765,8 @@ return IRQ_NONE; } - spin_lock(&priv->lock); - - + spin_lock(&priv->lock); + int ch; for (ch = 0; ch < 3; ++ch) { @@ -825,7 +784,9 @@ if (retrig) trigger_interrupt(dev); + spin_unlock(&priv->lock); + return IRQ_HANDLED; } @@ -886,14 +847,22 @@ udelay(10000); - // recvinit + + + + // BP eth_outb(0xA, 0x1); eth_outb(0xB, 0x0); + + // RWP eth_outb(0x16, 0x1); eth_outb(0x17, 0x0); + + // RRP eth_outb(0x18, 0x1); eth_outb(0x19, 0x0); - + + // RHBP eth_outb(0x1a, 0xF); eth_outb(0x1b, 0); @@ -949,12 +918,16 @@ static int adapter_init(struct net_device *dev) { int i; - + + struct gc_private *priv = (struct gc_private *)dev->priv; + //select_nic(); rx_page = 0; /* used by RESET */ BBA_DBG("initializing BBA...\n"); + + eth_outb(0x60, 0); // unknown udelay(10000); eth_exi_inb_slow(0xF); @@ -979,17 +952,23 @@ udelay(10000); - // recvinit + + // BP eth_outb(0xA, 0x1); eth_outb(0xB, 0x0); + + // RWP eth_outb(0x16, 0x1); eth_outb(0x17, 0x0); + + // RRP eth_outb(0x18, 0x1); eth_outb(0x19, 0x0); - + + // RHBP eth_outb(0x1a, 0xF); eth_outb(0x1b, 0); - + eth_outb(1, (eth_inb(1) & 0xFE) | 0x12); eth_outb(0, 8); @@ -1010,9 +989,10 @@ BBA_DBG("MAC ADDRESS %02x:%02x:%02x:%02x:%02x:%02x\n", gcif->ethaddr->addr[0], gcif->ethaddr->addr[1], gcif->ethaddr->addr[2], gcif->ethaddr->addr[3], gcif->ethaddr->addr[4], gcif->ethaddr->addr[5]); - + /* strncpy(dev->name,"GameCube BBA",IFNAMSIZ); dev->name[IFNAMSIZ-1]= 0; + */ exi_request_irq(2, EXI_EVENT_IRQ, gcif_irq_handler, NULL); @@ -1022,9 +1002,12 @@ eth_outb(8, 0xFF); // enable all IRQs eth_outb(9, 0xFF); // clear all irqs +// eth_outb(0x30, (eth_inb(0x30) | 0x2)); // 100 Mbit ? + + BBA_DBG("after all: irq mask %x %x\n", eth_inb(8), eth_inb(9)); -// netif_start_queue(dev); + netif_start_queue(dev); return 0; /* OK */ } |
|
From: <mi...@us...> - 2004-02-08 01:06:29
|
Update of /cvsroot/gc-linux/htdocs/xml/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18667/xml/en Modified Files: download.xml news.xml Log Message: ... Index: download.xml =================================================================== RCS file: /cvsroot/gc-linux/htdocs/xml/en/download.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- download.xml 3 Feb 2004 09:48:35 -0000 1.6 +++ download.xml 8 Feb 2004 01:03:31 -0000 1.7 @@ -9,6 +9,10 @@ <p>Linux on the GameCube can't do much yet. It is only suited to demonstraltional purposed right now.</p> + <h2>Latest Kernel Build</h2> + <p>This build always has the latest features, but might not work reliably.</p> + <p><a href="../down/zImage.dol">zImage.dol</a></p> + <h2>GameCube Linux Alpha</h2> <p>This Linux image shows a screen with kernel messages, and, if your computer's network settings are correct, allows telnet connections to 192.168.0.47 (user: root, password: gc) and serves a webpage (<a href="http://192.168.0.47/">http://192.168.0.47/</a>).</p> Index: news.xml =================================================================== RCS file: /cvsroot/gc-linux/htdocs/xml/en/news.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- news.xml 6 Feb 2004 13:39:48 -0000 1.12 +++ news.xml 8 Feb 2004 01:03:31 -0000 1.13 @@ -2,6 +2,11 @@ <?xml-stylesheet href="news.xsl" type="text/xsl"?> <news> <item> + <date>6 February 2004</date> + <title>First steps towards a full Linux system</title> + <text>Jon Masters has contributed a workaround for the NFS problem, so that it now possible to boot a full system over NFS - though very slowly. hamtitampti is currently rewriting the network driver.</text> + </item> + <item> <date>5 February 2004</date> <title>Even more driver work</title> <text>The keyboard driver works reliably now, and groepaz has contributed improved framebuffer code as well as a fricker-free framebuffer font.</text> |
|
From: <a.o...@bl...> - 2004-02-08 00:41:02
|
On Sat, Feb 07, 2004 at 02:58:55PM -0800, ham...@us... wrote: > Update of /cvsroot/gc-linux/linux/drivers/net > In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29185/linux/drivers/net > > Modified Files: > gc-net.c > Log Message: > mamybe it works now > > > Index: gc-net.c > =================================================================== > RCS file: /cvsroot/gc-linux/linux/drivers/net/gc-net.c,v > retrieving revision 1.11 > retrieving revision 1.12 > diff -u -d -r1.11 -r1.12 > --- gc-net.c 7 Feb 2004 00:24:29 -0000 1.11 > +++ gc-net.c 7 Feb 2004 22:58:52 -0000 1.12 > @@ -39,6 +39,10 @@ > > #include "exi.h" > > +#define BBA_DBG(format, arg...); { } > +//#define BBA_DBG(format, arg...) printk(f,## arg) > + > + Just a FYI - no need to #define Yet Another Debug Macro (TM). pr_debug() is your friend. |
|
From: <ham...@us...> - 2004-02-07 23:10:32
|
Update of /cvsroot/gc-linux/linux/drivers/net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30810/linux/drivers/net Modified Files: gc-net.c Log Message: fixed compile Index: gc-net.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/gc-net.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- gc-net.c 7 Feb 2004 22:58:52 -0000 1.12 +++ gc-net.c 7 Feb 2004 23:07:35 -0000 1.13 @@ -581,12 +581,11 @@ } -static char *gc_input(struct net_device *dev) +static void gc_input(struct net_device *dev) { struct gc_private *priv = (struct gc_private *)dev->priv; struct sk_buff *skb; - char *p, *q; unsigned short size, p_read, p_write; unsigned short next_receive_frame; @@ -623,7 +622,7 @@ { BBA_DBG("nothing left.\n"); priv->stats.rx_missed_errors++; - return 0; + return ; } unsigned char descr[4]; @@ -632,7 +631,7 @@ { BBA_DBG("NO DATA AVAILABLE!\n"); priv->stats.rx_missed_errors++; - return 0; + return ; } size=0; @@ -696,7 +695,7 @@ priv->stats.rx_bytes ++; /* count all received bytes */ next_receive_frame = descr[0]; - next_receive_frame |= (descr[1]0x0f) << 8; + next_receive_frame |= (descr[1] & 0x0f) << 8; /* do we have additional packages ? @@ -705,7 +704,7 @@ */ if (next_receive_frame != p_write) gc_input(dev); - return p; + return ; } |
165 messages has been excluded from this view by a project administrator.