Firebee/FireBee_SVN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

finish radeon and USB card detect

Browse Source
This commit is contained in:
Markus Fröschle
2016-12-17 19:29:52 +00:00
parent 8e768bc746
commit 52d1d95814
14 changed files with 394 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
video/fbmem.c
View File

@@ -28,11 +28,11 @@
*/
int fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var)
int32_t fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var)
{
int xoffset = var->xoffset;
int yoffset = var->yoffset;
int err;
int32_t xoffset = var->xoffset;
int32_t yoffset = var->yoffset;
int32_t err;
dbg("\r\n");
if ((xoffset < 0) || (yoffset < 0)
@@ -58,9 +58,9 @@ int fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var)
return 0;
}
int fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
int32_t fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
{
int err;
int32_t err;
dbg("var->activate = 0x%x\r\n", var->activate);
@@ -91,7 +91,7 @@ int fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
return 0;
}
int fb_blank(struct fb_info *info, int blank)
int32_t fb_blank(struct fb_info *info, int32_t blank)
{
dbg("\r\n");
if (blank > FB_BLANK_POWERDOWN)
@@ -99,12 +99,12 @@ int fb_blank(struct fb_info *info, int blank)
return(info->fbops->fb_blank(blank, info));
}
int fb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
int32_t fb_ioctl(struct fb_info *info, uint32_t cmd, unsigned long arg)
{
struct fb_var_screeninfo var;
struct fb_fix_screeninfo fix;
void *argp = (void *) arg;
int i;
int32_t i;
dbg("\r\n");
switch(cmd)
@@ -138,10 +138,10 @@ int fb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
return i;
case FBIO_ALLOC:
return(offscreen_alloc(info,(long)arg));
return(offscreen_alloc(info, arg));
case FBIO_FREE:
return(offscreen_free(info,(long)arg));
return(offscreen_free(info, (void *) arg));
default:
return(info->fbops->fb_ioctl(cmd, arg, info));

28
video/fbmodedb.c
View File

@@ -407,10 +407,10 @@ const struct fb_videomode vesa_modes[] =
*
*/
static int fb_try_mode(struct fb_var_screeninfo *var, struct fb_info *info,
const struct fb_videomode *mode, unsigned int bpp)
static int32_t fb_try_mode(struct fb_var_screeninfo *var, struct fb_info *info,
const struct fb_videomode *mode, uint32_t bpp)
{
int err = 0;
int32_t err = 0;
dbg("Trying mode %d x %d - %d @ %d\r\n", mode->xres, mode->yres, bpp, mode->refresh);
var->xres = mode->xres;
@@ -470,16 +470,16 @@ static int fb_try_mode(struct fb_var_screeninfo *var, struct fb_info *info,
*
*/
int fb_find_mode(struct fb_var_screeninfo *var,
int32_t fb_find_mode(struct fb_var_screeninfo *var,
struct fb_info *info, struct mode_option *resolution ,
const struct fb_videomode *db, unsigned int dbsize,
const struct fb_videomode *db, uint32_t dbsize,
const struct fb_videomode *default_mode,
unsigned int default_bpp)
uint32_t default_bpp)
{
int i,abs;
int res_specified = 0, bpp_specified = 0, refresh_specified = 0;
unsigned int xres = 0, yres = 0, bpp = default_bpp, refresh = 0;
int yres_specified = 0;
int32_t i,abs;
int32_t res_specified = 0, bpp_specified = 0, refresh_specified = 0;
uint32_t xres = 0, yres = 0, bpp = default_bpp, refresh = 0;
int32_t yres_specified = 0;
unsigned long best, diff;
dbg("fb_find_mode\r\n");
@@ -513,18 +513,18 @@ int fb_find_mode(struct fb_var_screeninfo *var,
/* Did the user specify a video mode? */
if (resolution->used) /* fVDI mode */
{
refresh = (unsigned int)resolution->freq;
refresh = (uint32_t)resolution->freq;
if (refresh)
refresh_specified = 1;
bpp = (unsigned int)resolution->bpp;
bpp = (uint32_t)resolution->bpp;
if (resolution->flags & MODE_EMUL_MONO_FLAG)
bpp = 8;
if (bpp)
bpp_specified = 1;
yres = (unsigned int)resolution->height;
yres = (uint32_t)resolution->height;
if (yres)
yres_specified = 1;
xres = (unsigned int)resolution->width;
xres = (uint32_t)resolution->width;
if (xres)
res_specified = 1;
}

78
video/fbmon.c
View File

@@ -68,7 +68,7 @@ static const unsigned char edid_v1_header[] = { 0x00, 0xff, 0xff, 0xff,
static void copy_string(unsigned char *c, unsigned char *s)
{
int i;
int32_t i;
c = c + 5;
for (i = 0; (i < 13 && *c != 0x0A); i++)
*(s++) = *(c++);
@@ -76,12 +76,12 @@ static void copy_string(unsigned char *c, unsigned char *s)
while (i-- && (*--s == 0x20)) *s = 0;
}
static int check_edid(unsigned char *edid)
static int32_t check_edid(unsigned char *edid)
{
unsigned char *block = edid + ID_MANUFACTURER_NAME, manufacturer[4];
unsigned char *b;
unsigned long model;
int i, fix = 0, ret = 0;
int32_t i, fix = 0, ret = 0;
manufacturer[0] = ((block[0] & 0x7c) >> 2) + '@';
manufacturer[1] = ((block[0] & 0x03) << 3) + ((block[1] & 0xe0) >> 5) + '@';
manufacturer[2] = (block[1] & 0x1f) + '@';
@@ -119,7 +119,7 @@ static int check_edid(unsigned char *edid)
return ret;
}
static void fix_edid(unsigned char *edid, int fix)
static void fix_edid(unsigned char *edid, int32_t fix)
{
unsigned char *b;
switch(fix)
@@ -135,10 +135,10 @@ static void fix_edid(unsigned char *edid, int fix)
}
}
static int edid_checksum(unsigned char *edid)
static int32_t edid_checksum(unsigned char *edid)
{
unsigned char i, csum = 0, all_null = 0;
int err = 0, fix = check_edid(edid);
int32_t err = 0, fix = check_edid(edid);
if(fix)
fix_edid(edid, fix);
for(i = 0; i < EDID_LENGTH; i++)
@@ -154,9 +154,9 @@ static int edid_checksum(unsigned char *edid)
return err;
}
static int edid_check_header(unsigned char *edid)
static int32_t edid_check_header(unsigned char *edid)
{
int i, err = 1, fix = check_edid(edid);
int32_t i, err = 1, fix = check_edid(edid);
if(fix)
fix_edid(edid, fix);
for(i = 0; i < 8; i++)
@@ -202,7 +202,7 @@ static void get_dpms_capabilities(unsigned char flags, struct fb_monspecs *specs
static void get_chroma(unsigned char *block, struct fb_monspecs *specs)
{
int tmp;
int32_t tmp;
/* Chromaticity data */
tmp = ((block[5] & (3 << 6)) >> 6) | (block[0x7] << 2);
@@ -254,7 +254,7 @@ static void get_chroma(unsigned char *block, struct fb_monspecs *specs)
dbg(" WhiteY: %d\r\n", specs->chroma.whitey / 10);
}
static int edid_is_serial_block(unsigned char *block)
static int32_t edid_is_serial_block(unsigned char *block)
{
if((block[0] == 0x00) && (block[1] == 0x00)
&& (block[2] == 0x00) && (block[3] == 0xff) && (block[4] == 0x00))
@@ -263,7 +263,7 @@ static int edid_is_serial_block(unsigned char *block)
return 0;
}
static int edid_is_ascii_block(unsigned char *block)
static int32_t edid_is_ascii_block(unsigned char *block)
{
if((block[0] == 0x00) && (block[1] == 0x00)
&& (block[2] == 0x00) && (block[3] == 0xfe) && (block[4] == 0x00))
@@ -272,7 +272,7 @@ static int edid_is_ascii_block(unsigned char *block)
return 0;
}
static int edid_is_limits_block(unsigned char *block)
static int32_t edid_is_limits_block(unsigned char *block)
{
if((block[0] == 0x00) && (block[1] == 0x00)
&& (block[2] == 0x00) && (block[3] == 0xfd) && (block[4] == 0x00))
@@ -281,7 +281,7 @@ static int edid_is_limits_block(unsigned char *block)
return 0;
}
static int edid_is_monitor_block(unsigned char *block)
static int32_t edid_is_monitor_block(unsigned char *block)
{
if((block[0] == 0x00) && (block[1] == 0x00)
&& (block[2] == 0x00) && (block[3] == 0xfc) && (block[4] == 0x00))
@@ -290,7 +290,7 @@ static int edid_is_monitor_block(unsigned char *block)
return 0;
}
static void calc_mode_timings(int xres, int yres, int refresh, struct fb_videomode *mode)
static void calc_mode_timings(int32_t xres, int32_t yres, int32_t refresh, struct fb_videomode *mode)
{
struct fb_var_screeninfo var;
struct fb_info info;
@@ -311,9 +311,9 @@ static void calc_mode_timings(int xres, int yres, int refresh, struct fb_videomo
mode->sync = 0;
}
static int get_est_timing(unsigned char *block, struct fb_videomode *mode)
static int32_t get_est_timing(unsigned char *block, struct fb_videomode *mode)
{
int num = 0;
int32_t num = 0;
unsigned char c;
c = block[0];
if(c&0x80)
@@ -412,9 +412,9 @@ static int get_est_timing(unsigned char *block, struct fb_videomode *mode)
return num;
}
static int get_std_timing(unsigned char *block, struct fb_videomode *mode)
static int32_t get_std_timing(unsigned char *block, struct fb_videomode *mode)
{
int xres, yres = 0, refresh, ratio, i;
int32_t xres, yres = 0, refresh, ratio, i;
xres = (block[0] + 31) * 8;
if(xres <= 256)
return 0;
@@ -443,9 +443,9 @@ static int get_std_timing(unsigned char *block, struct fb_videomode *mode)
return 1;
}
static int get_dst_timing(unsigned char *block, struct fb_videomode *mode)
static int32_t get_dst_timing(unsigned char *block, struct fb_videomode *mode)
{
int j, num = 0;
int32_t j, num = 0;
for(j = 0; j < 6; j++, block+= STD_TIMING_DESCRIPTION_SIZE)
num += get_std_timing(block, &mode[num]);
return num;
@@ -490,16 +490,16 @@ static void get_detailed_timing(unsigned char *block, struct fb_videomode *mode)
static struct fb_videomode tab_db[MAX_DB_ALLOC];
static struct fb_videomode *db_used[MAX_DB_ALLOC];
static struct fb_videomode *alloc_db(int num)
static struct fb_videomode *alloc_db(int32_t num)
{
int i = 0;
int32_t i = 0;
if(!num)
return(NULL);
while(i < MAX_DB_ALLOC)
{
if((db_used[i] == NULL) && ((i + num) <= MAX_DB_ALLOC))
{
int j; /* search contiguous num db free */
int32_t j; /* search contiguous num db free */
for(j = 0; j < num; j++)
{
if(db_used[i+j] != NULL)
@@ -519,7 +519,7 @@ static struct fb_videomode *alloc_db(int num)
static void free_db(struct fb_videomode *db)
{
int i;
int32_t i;
for(i = 0; i < MAX_DB_ALLOC; i++)
{
if(db_used[i] == db)
@@ -551,11 +551,11 @@ void fb_destroy_modedb(struct fb_videomode *modedb)
* This function builds a mode database using the contents of the EDID
* data
*/
static struct fb_videomode *fb_create_modedb(unsigned char *edid, int *dbsize)
static struct fb_videomode *fb_create_modedb(unsigned char *edid, int32_t *dbsize)
{
struct fb_videomode *mode, *m;
unsigned char *block;
int num = 0, i;
int32_t num = 0, i;
// mode = Funcs_malloc(50 * sizeof(struct fb_videomode), 3);
mode = alloc_db(50);
if(mode == NULL)
@@ -578,7 +578,7 @@ static struct fb_videomode *fb_create_modedb(unsigned char *edid, int *dbsize)
block = edid + DETAILED_TIMING_DESCRIPTIONS_START;
for(i = 0; i < 4; i++, block+= DETAILED_TIMING_DESCRIPTION_SIZE)
{
int first = 1;
int32_t first = 1;
if(block[0] == 0x00 && block[1] == 0x00)
{
if(block[3] == 0xfa)
@@ -611,9 +611,9 @@ static struct fb_videomode *fb_create_modedb(unsigned char *edid, int *dbsize)
return m;
}
static int fb_get_monitor_limits(unsigned char *edid, struct fb_monspecs *specs)
static int32_t fb_get_monitor_limits(unsigned char *edid, struct fb_monspecs *specs)
{
int i, retval = 1;
int32_t i, retval = 1;
unsigned char *block;
block = edid + DETAILED_TIMING_DESCRIPTIONS_START;
dbg(" Monitor Operating Limits: ");
@@ -636,7 +636,7 @@ static int fb_get_monitor_limits(unsigned char *edid, struct fb_monspecs *specs)
if(retval)
{
struct fb_videomode *modes;
int num_modes, i, hz, hscan, pixclock;
int32_t num_modes, i, hz, hscan, pixclock;
modes = fb_create_modedb(edid, &num_modes);
if(!modes)
{
@@ -788,7 +788,7 @@ static void get_monspecs(unsigned char *edid, struct fb_monspecs *specs)
}
}
static int edid_is_timing_block(unsigned char *block)
static int32_t edid_is_timing_block(unsigned char *block)
{
if((block[0] != 0x00) || (block[1] != 0x00)
|| (block[2] != 0x00) || (block[4] != 0x00))
@@ -797,9 +797,9 @@ static int edid_is_timing_block(unsigned char *block)
return 0;
}
int fb_parse_edid(unsigned char *edid, struct fb_var_screeninfo *var)
int32_t fb_parse_edid(unsigned char *edid, struct fb_var_screeninfo *var)
{
int i;
int32_t i;
unsigned char *block;
if(edid == NULL || var == NULL)
return 1;
@@ -838,7 +838,7 @@ int fb_parse_edid(unsigned char *edid, struct fb_var_screeninfo *var)
void fb_edid_to_monspecs(unsigned char *edid, struct fb_monspecs *specs)
{
unsigned char *block;
int i;
int32_t i;
if(edid == NULL)
return;
if(!(edid_checksum(edid)))
@@ -883,7 +883,7 @@ void fb_edid_to_monspecs(unsigned char *edid, struct fb_monspecs *specs)
}
//DPRINT(" Display Characteristics:\r\n");
get_monspecs(edid, specs);
specs->modedb = fb_create_modedb(edid, (int *)&specs->modedb_len);
specs->modedb = fb_create_modedb(edid, (int32_t *)&specs->modedb_len);
dbg("========================================\r\n");
}
@@ -967,7 +967,7 @@ static unsigned long fb_get_hblank_by_hfreq(unsigned long hfreq, unsigned long x
}
/* Quick integer square root using binomial theorem (from Dr. Dobbs journal) */
static int int_sqrt(int N)
static int32_t int32_t_sqrt(int32_t N)
{
unsigned long l2, u, v, u2, n;
if(N < 2)
@@ -1023,7 +1023,7 @@ static unsigned long fb_get_hblank_by_dclk(unsigned long dclk, unsigned long xre
h_period *= h_period;
h_period += (M_VAL * xres * 2 * 1000)/(5 * dclk);
h_period *=10000;
h_period = int_sqrt(h_period);
h_period = int32_t_sqrt(h_period);
h_period -= (100 - C_VAL) * 100;
h_period *= 1000;
h_period /= 2 * M_VAL;
@@ -1119,7 +1119,7 @@ static void fb_timings_dclk(struct __fb_timings *timings)
* REQUIRES:
* A valid info->monspecs, otherwise 'safe numbers' will be used.
*/
int fb_get_mode(int flags, unsigned long val, struct fb_var_screeninfo *var, struct fb_info *info)
int32_t fb_get_mode(int32_t flags, unsigned long val, struct fb_var_screeninfo *var, struct fb_info *info)
{
struct __fb_timings timings;
unsigned long interlace = 1, dscan = 1;
@@ -1216,7 +1216,7 @@ int fb_get_mode(int flags, unsigned long val, struct fb_var_screeninfo *var, str
* REQUIRES:
* A valid info->monspecs.
*/
int fb_validate_mode(const struct fb_var_screeninfo *var, struct fb_info *info)
int32_t fb_validate_mode(const struct fb_var_screeninfo *var, struct fb_info *info)
{
unsigned long hfreq, vfreq, htotal, vtotal, pixclock;
unsigned long hfmin, hfmax, vfmin, vfmax, dclkmin, dclkmax;

2
video/offscreen.c
View File

@@ -199,7 +199,7 @@ static void freeit(MD *m, MPB *mp)
}
}
long offscreen_free(struct fb_info *info, long addr)
long offscreen_free(struct fb_info *info, void *addr)
{
MD *p;
MD **q;

2
video/video.c
View File

@@ -344,7 +344,7 @@ struct mode_option resolution =
};
int16_t force_measure_pll = 0;
void install_vbl_timer(void *func, int remove)
void install_vbl_timer(void *func, int32_t remove)
{
dbg("not implemented\r\n");
}