acerhk-x86_64/amd64fix.diff

   1 --- acerhk-0.5.35-old/acerhk.c  2007-02-10 17:46:23.000000000 +0200
   2 +++ acerhk-0.5.35/acerhk.c      2007-04-28 19:18:49.000000000 +0300
   3 @@ -550,6 +550,7 @@
   4   */
   5  static asmlinkage void call_bios_6xx(struct register_buffer *buf)
   6  {
   7 +#ifndef __x86_64__
   8    if (bios_routine) {
   9        local_irq_disable();
  10         __asm__ __volatile__(
  11 @@ -578,10 +579,12 @@
  12                                                  );
  13        local_irq_enable();
  14    }
  15 +#endif
  16  }
  17
  18  static asmlinkage void call_bios_52x(struct register_buffer *buf)
  19  {
  20 +#ifndef __x86_64__
  21    if (bios_routine) {
  22        local_irq_disable();
  23         __asm__ __volatile__(
  24 @@ -611,6 +614,7 @@
  25                                                  );
  26        local_irq_enable();
  27    }
  28 +#endif
  29  }
  30
  31  #define PRINT_BUFFER(x) \
  32 @@ -783,7 +787,8 @@
  33    unsigned char c = 0;
  34
  35    spin_lock_irqsave (&rtc_lock, flags);
  36 -#ifndef DUMMYHW
  37 +/* #ifndef DUMMYHW */
  38 +#if !(defined(DUMMYHW) || defined(__x86_64__))
  39    if (cmos_index)
  40      c = CMOS_READ(cmos_index);
  41    else if (verbose > 3)
  42 @@ -867,9 +872,9 @@
  43
  44  static struct proc_dir_entry *proc_acer_dir;
  45
  46 -static unsigned int __init find_hk_area(void)
  47 +static unsigned long __init find_hk_area(void)
  48  {
  49 -  int offset, sig;
  50 +  long offset, sig;
  51    unsigned int fkt;
  52    fkt = 0;
  53    sig = -1; /* offset to signature in io area */
  54 @@ -887,9 +892,9 @@
  55      fkt = readl(reg1 + sig + 5);
  56      /* adjust fkt to address of mapped IO area */
  57      if (fkt >= 0xf0000)
  58 -      fkt = (unsigned int)reg1 + fkt - 0xf0000;
  59 +      fkt = (unsigned long)reg1 + fkt - 0xf0000;
  60      else if (fkt >= 0xe0000)
  61 -      fkt = (unsigned int)reg1 + fkt - 0xe0000;
  62 +      fkt = (unsigned long)reg1 + fkt - 0xe0000;
  63      else
  64        fkt = 0;
  65    }
  66 @@ -1144,6 +1149,7 @@
  67    case 2000:
  68    case 2010:
  69    case 2020:
  70 +  case 5100:
  71      /* Aspire 13xx series laptops use dritek hardware, no
  72         acerhk-mapping needed
  73         VolUp and VolDown are managed as normal keys
  74 @@ -1458,6 +1464,7 @@
  75    case 1800:
  76    case 2010:
  77    case 2020:
  78 +  case 5100:
  79      /* Dritek EC, bluetooth, wifi, mail */
  80      acerhk_type = TM_dritek;
  81      acerhk_model_features = TM_F_MAIL_LED_EC2 | TM_F_WLAN_EC2 | TM_F_BLUE_EC2;
  82 @@ -1792,6 +1799,8 @@
  83            break;
  84          case '2': series = 5020; break;
  85          }
  86 +      } else if (str[8] == '1' && str[9] == '0') {
  87 +       series = 5100;
  88        } else {
  89          if (verbose > 1)
  90            printk(KERN_INFO"acerhk: model string indicates unknown Aspire 5xxx series\n");
  91 @@ -2117,7 +2126,8 @@
  92  /* polling timer handler */
  93  static void acerhk_poll_event(unsigned long save_size)
  94  {
  95 -#ifndef DUMMYHW
  96 +/* #ifndef DUMMYHW */
  97 +#if !(defined(DUMMYHW) || defined(__x86_64__))
  98    unsigned int max = MAX_POLLING_LOOPS;
  99    /* make sure not to loop more then 32 times */
 100    if (!max || max > 32)
 101 @@ -2139,7 +2149,8 @@
 102  {
 103    if (acerhk_blueled_blinking != -1) {
 104      acerhk_blueled_blinking = !acerhk_blueled_blinking;
 105 -#ifndef DUMMYHW
 106 +/* #ifndef DUMMYHW */
 107 +#if !(defined(DUMMYHW) || defined(__x86_64__))
 108      wbutton_fct_1(acerhk_blueled_blinking);
 109  #endif
 110      acerhk_timer_blinking.expires = jiffies + acerhk_blueled_blinking_delay;
 111 @@ -2904,7 +2915,8 @@
 112      /* attach to input system */
 113      init_input();
 114      memset(acerhk_model_string, 0x00, ACERHK_MODEL_STRLEN);
 115 -#ifdef DUMMYHW
 116 +/* #ifdef DUMMYHW */
 117 +#if !(defined(DUMMYHW) || defined(__x86_64__))
 118      acerhk_model_addr = (void*)0x12345678;
 119      /* copy the string, but not more than 15 characters */
 120      strncpy(acerhk_model_string, "TravelmateDummy", ACERHK_MODEL_STRLEN-1);