comparison linux/vbelib.c @ 2536:6426007cad63

Fixed broken BIOS workaround

2535:b44113f46c96

#include <sys/io.h>
#include <ctype.h>

static struct VesaProtModeInterface vbe_pm_info;

static inline int VERR(void *p)
{
  register int retval;
  __asm __volatile(
	"xorl	%0, %0\n\t"
	"verr	%1\n\t"

	:"memory");
  return retval;
}

#if 0
static inline int VERW(void *p)
{
  register int retval;
  __asm __volatile(
	"xorl	%0, %0\n\t"
	"verw	%1\n\t"

   return VBE_OK;
}

int vbeDestroy( void ) { return VBE_OK; }

static int check_str(unsigned char *str)
{
  size_t i;
  int null_found = 0;
  for(i = 0;i < 256;i++) 
  {
    if(VERR(&str[i]))
    {
      if(!str[i]) { null_found = 1; break; }
    }
    else break;
  }
  return null_found;
}

static int check_wrd(unsigned short *str)
{
  size_t i;
  int ffff_found = 0;
  for(i = 0;i < 1024;i++) 
  {
    if(VERR(&str[i]))
    {
      if(str[i] == 0xffff) { ffff_found = 1; break; }
    }
    else break;
  }
  return ffff_found;
}

2536:6426007cad63

#include <sys/io.h>
#include <ctype.h>

static struct VesaProtModeInterface vbe_pm_info;

static inline int VERR(const void *p)
{
  register int retval;
  __asm __volatile(
	"xorl	%0, %0\n\t"
	"verr	%1\n\t"

	:"memory");
  return retval;
}

#if 0
static inline int VERW(const void *p)
{
  register int retval;
  __asm __volatile(
	"xorl	%0, %0\n\t"
	"verw	%1\n\t"

   return VBE_OK;
}

int vbeDestroy( void ) { return VBE_OK; }

/* Fixme!!! This code is compatible only with mplayer's version of lrmi*/
static inline int is_addr_valid(const void *p)
{
  return (p < (const void *)0x502) || 
	 (p >= (const void *)0x10000 && p < (const void *)0x20000) ||
	 (p >= (const void *)0xa0000 && p < (const void *)0x100000);
}

static int check_str(const unsigned char *str)
{
  size_t i;
  int null_found = 0;
  for(i = 0;i < 256;i++) 
  {
    if(is_addr_valid(&str[i]))
    {
      if(VERR(&str[i]))
      {
        if(!str[i]) { null_found = 1; break; }
      }
      else break;
    }
    else break;
  }
  return null_found;
}

static int check_wrd(const unsigned short *str)
{
  size_t i;
  int ffff_found = 0;
  for(i = 0;i < 1024;i++) 
  {
    if(is_addr_valid(&str[i]))
    {
      if(VERR(&str[i]))
      {
        if(str[i] == 0xffff) { ffff_found = 1; break; }
      }
      else break;
    }
    else break;
  }
  return ffff_found;
}