/shark/trunk/drivers/fb/logo_vga16.c |
---|
File deleted |
/shark/trunk/drivers/fb/logo_bmp.c |
---|
597,7 → 597,7 |
0x59, 0x51, 0x42, 0x64, 0x52, 0x34, 0x5e, 0x56, 0x42 |
}; |
struct linux_logo linux_logo_test __initdata = { |
struct linux_logo linux_logo __initdata = { |
.type = LINUX_LOGO_CLUT224, |
.width = 80, |
.height = 80, |
/shark/trunk/drivers/fb/logo.c |
---|
23,7 → 23,7 |
#endif |
extern const struct linux_logo logo_linux_mono; |
extern const struct linux_logo linux_logo_vga16; |
extern const struct linux_logo logo_linux_vga16; |
extern const struct linux_logo logo_linux_clut224; |
extern const struct linux_logo logo_dec_clut224; |
extern const struct linux_logo logo_mac_clut224; |
33,7 → 33,7 |
extern const struct linux_logo logo_superh_mono; |
extern const struct linux_logo logo_superh_vga16; |
extern const struct linux_logo logo_superh_clut224; |
extern const struct linux_logo linux_logo_test; |
extern const struct linux_logo linux_logo_data; |
const struct linux_logo *fb_find_logo(int depth) |
{ |
51,8 → 51,10 |
} |
if (depth >= 4) { |
#ifdef CONFIG_LOGO_LINUX_VGA16 |
/* Generic Linux logo */ |
logo = &linux_logo_vga16; |
logo = &logo_linux_vga16; |
#endif |
#ifdef CONFIG_LOGO_SUPERH_VGA16 |
/* SuperH Linux logo */ |
logo = &logo_superh_vga16; |
61,7 → 63,7 |
if (depth >= 8) { |
/* Generic Linux logo */ |
logo = &linux_logo_test; |
logo = &linux_logo_data; |
#ifdef CONFIG_LOGO_DEC_CLUT224 |
/* DEC Linux logo on MIPS/MIPS64 */ |
if (mips_machgroup == MACH_GROUP_DEC) |
/shark/trunk/drivers/fb/makefile |
---|
12,12 → 12,12 |
OBJS = fbmem.o fbcmap.o cfbfillrect.o softcursor.o cfbcopyarea.o cfbimgblt.o\ |
modedb.o vga16fb.o vgastate.o vesafb.o radeonfb.o shark_fb26.o\ |
logo.o logo_bmp.o logo_vga16.o\ |
logo.o logo_bmp.o\ |
./riva/fbdev.o ./riva/nv_driver.o ./riva/riva_hw.o |
OTHERINCL += -I$(BASE)/drivers/linuxc26/include |
C_OPT += -D__KERNEL__ -D__i386__ -DCONFIG_FB_RADEON -DCONFIG_FB_RIVA -DCONFIG_LOGO |
C_OPT += -D__KERNEL__ -D__i386__ -DCONFIG_FB_RIVA -DCONFIG_LOGO |
include $(BASE)/config/lib.mk |
/shark/trunk/drivers/fb/riva/fbdev.c |
---|
1881,7 → 1881,7 |
pci_set_drvdata(pd, info); |
printk(KERN_INFO PFX |
"PCI nVidia NV%x framebuffer ver %s (%s, %dMB @ 0x%x)\n", |
"PCI nVidia NV%x framebuffer ver %s (%s, %dMB @ 0x%lX)\n", |
default_par->riva.Architecture, |
RIVAFB_VERSION, |
info->fix.id, |
/shark/trunk/drivers/fb/radeonfb.c |
---|
1545,7 → 1545,7 |
} |
rc = 0; |
value = *(__u32*)arg; //get_user(value, (__u32*)arg); |
value = (__u32*)arg; //get_user(value, (__u32*)arg); |
if (rc) |
return rc; |
1599,8 → 1599,7 |
if (CRTC_CRT_ON & tmp) |
value |= 0x02; |
(__u32*)arg = value; |
return 0; |
return put_user(value, (__u32*)arg); |
default: |
return -EINVAL; |
} |
/shark/trunk/drivers/fb/fbmem.c |
---|
398,8 → 398,6 |
static int ofonly __initdata = 0; |
#endif |
int debx,deby,debb; |
/* |
* Drawing helpers. |
*/ |
1155,7 → 1153,7 |
{ |
int fbidx = iminor(inode); |
struct fb_info *info; |
int res = 0,i; |
int res = 0; |
if (fbidx >= FB_MAX) |
return -ENODEV; |
1172,12 → 1170,6 |
if (res) |
module_put(info->fbops->owner); |
} |
debx = info->var.xres; |
deby = info->var.yres; |
debb = info->fix.smem_start; |
for (i=0;i<639;i++) *(unsigned char *)(info->fix.smem_start+i) = 0x55; |
return res; |
} |
1193,9 → 1185,6 |
info->fbops->fb_release(info,1); |
module_put(info->fbops->owner); |
unlock_kernel(); |
cprintf("X %d Y %d B %x\n",debx,deby,debb); |
return 0; |
} |
1341,7 → 1330,8 |
return -1; |
} |
kfree(i); |
kfree(i); |
return 0; |
} |
/shark/trunk/drivers/linuxc26/linuxcomp.c |
---|
136,12 → 136,63 |
struct resource * __request_region(struct resource *parent, unsigned long start, unsigned long n, const char *name) |
{ |
return (void *)(0xFFFFFFFF); |
struct resource *res = kmalloc(sizeof(*res), GFP_KERNEL); |
if (res) { |
memset(res, 0, sizeof(*res)); |
res->name = name; |
res->start = start; |
res->end = start + n - 1; |
res->flags = IORESOURCE_BUSY; |
for (;;) { |
struct resource *conflict; |
conflict = __request_resource(parent, res); |
if (!conflict) |
break; |
if (conflict != parent) { |
parent = conflict; |
if (!(conflict->flags & IORESOURCE_BUSY)) |
continue; |
} |
/* Uhhuh, that didn't work out.. */ |
kfree(res); |
res = NULL; |
break; |
} |
} |
return res; |
} |
void __release_region(struct resource *parent, unsigned long start, unsigned long n) |
{ |
struct resource **p; |
unsigned long end; |
p = &parent->child; |
end = start + n - 1; |
for (;;) { |
struct resource *res = *p; |
if (!res) |
break; |
if (res->start <= start && res->end >= end) { |
if (!(res->flags & IORESOURCE_BUSY)) { |
p = &res->child; |
continue; |
} |
if (res->start != start || res->end != end) |
break; |
*p = res->sibling; |
kfree(res); |
return; |
} |
p = &res->sibling; |
} |
printk(KERN_WARNING "Trying to free nonexistent resource <%08lx-%08lx>\n", start, end); |
} |
static int find_resource(struct resource *root, struct resource *new, |
286,6 → 337,20 |
} |
unsigned long __copy_to_user_ll(void __user *to, const void *from, unsigned long n) { |
memcpy(to,from,n); |
return 0; |
} |
unsigned long __copy_from_user_ll(void *to, const void __user *from, unsigned long n) { |
memcpy(to,from,n); |
return 0; |
} |
void complete(struct completion *c) { |
} |
/shark/trunk/drivers/linuxc26/include/asm/uaccess.h |
---|
470,8 → 470,10 |
static inline unsigned long |
copy_to_user(void __user *to, const void *from, unsigned long n) |
{ |
memcpy(to, from, n); |
return 0; |
might_sleep(); |
if (access_ok(VERIFY_WRITE, to, n)) |
n = __copy_to_user(to, from, n); |
return n; |
} |
/** |
493,8 → 495,12 |
static inline unsigned long |
copy_from_user(void *to, const void __user *from, unsigned long n) |
{ |
memcpy(to, from, n); |
return 0; |
might_sleep(); |
if (access_ok(VERIFY_READ, from, n)) |
n = __copy_from_user(to, from, n); |
else |
memset(to, 0, n); |
return n; |
} |
long strncpy_from_user(char *dst, const char __user *src, long count); |