diff --git a/BaS_gcc/include/radeonfb.h b/BaS_gcc/include/radeonfb.h index d7d98cd..615c304 100644 --- a/BaS_gcc/include/radeonfb.h +++ b/BaS_gcc/include/radeonfb.h @@ -629,7 +629,7 @@ extern void radeon_setup_for_scanline_cpu_to_screen_color_expand_fill_mmio(struc int fg, int bg, int rop, unsigned int planemask); extern void radeon_subsequent_scanline_cpu_to_screen_color_expand_fill_mmio(struct fb_info *info, int x, int y, int w, int h, int skipleft); -extern void radeon_subsequent_scanline_mmio(struct fb_info *info, int *buf); +extern void radeon_subsequent_scanline_mmio(struct fb_info *info, unsigned long *buf); extern void radeon_setup_for_scanline_image_write_mmio(struct fb_info *info, int rop, unsigned int planemask, int trans_color, int bpp); extern void radeon_subsequent_scanline_image_write_rect_mmio(struct fb_info *info, @@ -652,11 +652,11 @@ extern void radeon_subsequent_cpu_to_screen_texture_mmio(struct fb_info *info, int32_t srcx, int32_t srcy, int32_t width, int32_t height); /* Cursor functions */ -extern void radeon_set_cursor_colors(struct fb_info *info, int32_t bg, int32_t fg); -extern void radeon_set_cursor_position(struct fb_info *info, int32_t x, int32_t y); -extern void radeon_load_cursor_image(struct fb_info *info, uint16_t *mask, uint16_t *data, int32_t zoom); +extern void radeon_set_cursor_colors(struct fb_info *info, int bg, int fg); +extern void radeon_set_cursor_position(struct fb_info *info, int x, int y); +extern void radeon_load_cursor_image(struct fb_info *info, unsigned short *mask, unsigned short *data, int zoom); extern void radeon_hide_cursor(struct fb_info *info); -extern void radeon_show_corsor(struct fb_info *info); +extern void radeon_show_cursor(struct fb_info *info); extern int32_t radeon_cursor_init(struct fb_info *info); /* Other functions */ diff --git a/BaS_gcc/radeon/radeon_base.c b/BaS_gcc/radeon/radeon_base.c index 61b0e06..92dde24 100644 --- a/BaS_gcc/radeon/radeon_base.c +++ b/BaS_gcc/radeon/radeon_base.c @@ -1303,7 +1303,7 @@ static void radeon_timer_func(void) info->fbops->SubsequentScanlineCPUToScreenColorExpandFill(info,(int)dst_x,0,w,h,skipleft); while(--h >= 0) { - info->fbops->SubsequentScanline(info, (uint32_t *)src_buf); + info->fbops->SubsequentScanline(info, (unsigned long *) src_buf); src_buf += (info->var.xres_virtual >> 3); } // info->fbops->DisableClipping(info); @@ -2000,7 +2000,6 @@ int32_t radeonfb_pci_register(int32_t handle, const struct pci_device_id *ent) rinfo = info->par; rinfo->info = info; rinfo->handle = handle; - Funcs_copy("ATI Radeon XX ", rinfo->name); rinfo->name[11] = (char)(ent->device >> 8); rinfo->name[12] = (char)ent->device; rinfo->family = ent->driver_data & CHIP_FAMILY_MASK; @@ -2016,7 +2015,7 @@ int32_t radeonfb_pci_register(int32_t handle, const struct pci_device_id *ent) rinfo->mmio_base = rinfo->io_base = NULL; rinfo->bios_seg = NULL; - pci_rsc_desc = (struct pci_rd *) get_resource(handle); + pci_rsc_desc = (struct pci_rd *) pci_get_resource(handle); if ((int32_t)pci_rsc_desc >= 0) { uint16_t flags; diff --git a/BaS_gcc/radeon/radeon_cursor.c b/BaS_gcc/radeon/radeon_cursor.c index 61d8cba..b9c4da5 100644 --- a/BaS_gcc/radeon/radeon_cursor.c +++ b/BaS_gcc/radeon/radeon_cursor.c @@ -71,7 +71,7 @@ void radeon_set_cursor_colors(struct fb_info *info, int bg, int fg) { struct radeonfb_info *rinfo = info->par; - unsigned long *pixels = (unsigned long *)(pointer)((unsigned long)rinfo->fb_base+rinfo->cursor_start); + unsigned long *pixels = (unsigned long *)((unsigned long) rinfo->fb_base+rinfo->cursor_start); int pixel, i; CURSOR_SWAPPING_DECL_MMIO CURSOR_SWAPPING_DECL @@ -130,7 +130,7 @@ void radeon_set_cursor_position(struct fb_info *info, int x, int y) void radeon_load_cursor_image(struct fb_info *info, unsigned short *mask, unsigned short *data, int zoom) { struct radeonfb_info *rinfo = info->par; - unsigned long *d = (unsigned long *)(pointer)((unsigned long)rinfo->fb_base+rinfo->cursor_start); + unsigned long *d = (unsigned long *)((unsigned long)rinfo->fb_base+rinfo->cursor_start); unsigned long save = 0; unsigned short chunk, mchunk; unsigned long i, j, k; @@ -304,7 +304,7 @@ long radeon_cursor_init(struct fb_info *info) memset(mask, 0, sizeof(data)); rinfo->cursor_start = RADEON_ALIGN(fbarea - (unsigned long)rinfo->fb_base, 256); rinfo->cursor_end = rinfo->cursor_start + size_bytes; - RADEONLoadCursorImage(info, mask, data, 1); + radeon_load_cursor_image(info, mask, data, 1); } // DPRINTVALHEX(" cursor_start ",rinfo->cursor_start); // DPRINT("\r\n");