Changeset 7886


Ignore:
Timestamp:
2007-07-07T14:58:47+02:00 (11 years ago)
Author:
olli
Message:

lcd4linux: fix compile (#1981)

Location:
packages/utils/lcd4linux
Files:
1 added
4 edited
1 moved

Legend:

Unmodified
Added
Removed
  • packages/utils/lcd4linux/Makefile

    r6672 r7886  
    1111PKG_NAME:=lcd4linux 
    1212PKG_VERSION:=0.10.0+cvs20051015 
    13 PKG_RELEASE:=1 
     13PKG_RELEASE:=2 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz 
    1616PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/l/lcd4linux/ \ 
    17                 http://ftp.de.debian.org/debian/pool/main/l/lcd4linux/ 
     17        http://ftp.de.debian.org/debian/pool/main/l/lcd4linux/ 
    1818PKG_MD5SUM:=5b5ac629be4bb5c29104fb8f6b7fa444 
    19 PKG_CAT:=zcat 
    2019 
    2120PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig 
     
    3837 
    3938CONFIGURE_ARGS += \ 
    40                 --without-x \ 
    41                 --with-drivers="$(PKG_CONFIGURE_DRIVERS)" \ 
    42                 --with-plugins=wireless 
     39        --without-x \ 
     40        --with-drivers="$(PKG_CONFIGURE_DRIVERS)" \ 
     41        --with-plugins=wireless 
    4342 
    4443define Build/Configure 
  • packages/utils/lcd4linux/patches/100-drv_RouterBoard.patch

    r3022 r7886  
    1 --- lcd4linux-0.10.0-RC1/drv_RouterBoard.c      2004-08-30 15:20:45.000000000 +0200 
    2 +++ lcd-patched/drv_RouterBoard.c       2005-03-19 16:03:26.849650830 +0100 
    3 @@ -113,7 +113,7 @@ 
     1Index: lcd4linux-0.10.0+cvs20051015.orig/drv_RouterBoard.c 
     2=================================================================== 
     3--- lcd4linux-0.10.0+cvs20051015.orig.orig/drv_RouterBoard.c    2007-07-07 14:02:56.000000000 +0200 
     4+++ lcd4linux-0.10.0+cvs20051015.orig/drv_RouterBoard.c 2007-07-07 14:02:56.000000000 +0200 
     5@@ -120,7 +120,7 @@ 
    46 #include <string.h> 
    57 #include <errno.h> 
  • packages/utils/lcd4linux/patches/110-udelay.patch

    r7885 r7886  
    1 diff -urN lcd4linux.old/udelay.h lcd4linux.dev/udelay.h 
    2 --- lcd4linux.old/udelay.h      2005-05-08 06:32:45.000000000 +0200 
    3 +++ lcd4linux.dev/udelay.h      2006-01-20 03:50:36.806897500 +0100 
    4 @@ -76,7 +76,7 @@ 
     1Index: lcd4linux-0.10.0+cvs20051015.orig/udelay.c 
     2=================================================================== 
     3--- lcd4linux-0.10.0+cvs20051015.orig.orig/udelay.c     2007-07-07 14:02:55.000000000 +0200 
     4+++ lcd4linux-0.10.0+cvs20051015.orig/udelay.c  2007-07-07 14:02:56.000000000 +0200 
     5@@ -134,28 +134,11 @@ 
     6 #include <stdio.h> 
     7  
     8  
     9-#ifdef USE_OLD_UDELAY 
     10- 
     11-#include <time.h> 
     12- 
     13-#else 
     14- 
     15-#include <math.h> 
     16-#include <unistd.h> 
     17-#include <fcntl.h> 
     18-#include <errno.h> 
     19-#include <string.h> 
     20-#include <sys/time.h> 
     21- 
     22-#ifdef HAVE_ASM_MSR_H 
     23-#include <asm/msr.h> 
     24-#endif 
     25- 
     26-#endif 
     27- 
     28- 
     29 #include "debug.h" 
     30 #include "udelay.h" 
     31+  
     32+#include <time.h> 
     33+#include <errno.h> 
     34  
     35 #ifdef USE_OLD_UDELAY 
     36  
     37@@ -163,16 +146,30 @@ 
     38  
     39 void ndelay(const unsigned long nsec) 
     40 { 
     41+#if 0 
     42     unsigned long loop = (nsec * loops_per_usec + 999) / 1000; 
     43  
     44   __asm__(".align 16\n" "1:\tdecl %0\n" "\tjne 1b":    /* no result */ 
     45   :"a"(loop)); 
     46+#endif 
     47+  struct timespec val; 
     48+  struct timespec rem; 
     49+  int ret; 
     50+ 
     51+  val.tv_sec = 0; 
     52+  val.tv_nsec = nsec; 
     53+ 
     54+  do { 
     55+         ret = nanosleep(&val, &rem); 
     56+         val = rem; 
     57+  } while ((ret == -1) && (errno == EINTR)); 
     58 } 
     59  
     60 /* adopted from /usr/src/linux/init/main.c */ 
     61  
     62 void udelay_calibrate(void) 
     63 { 
     64+#if 0 
     65     clock_t tick; 
     66     unsigned long bit; 
     67  
     68@@ -197,12 +194,13 @@ 
     69        if (clock() > tick) 
     70            loops_per_usec &= ~bit; 
     71     } 
     72+#endif 
     73 } 
     74  
     75 #else 
     76  
     77 static unsigned int ticks_per_usec = 0; 
     78- 
     79+#if 0 
     80 static void getCPUinfo(int *hasTSC, double *MHz) 
     81 { 
     82     int fd; 
     83@@ -249,10 +247,11 @@ 
     84     } 
     85  
     86 } 
     87- 
     88+#endif 
     89  
     90 void udelay_init(void) 
     91 { 
     92+#if 0 
     93 #ifdef HAVE_ASM_MSR_H 
     94  
     95     int tsc; 
     96@@ -274,12 +273,13 @@ 
     97        ticks_per_usec = 0; 
     98        info("udelay: using gettimeofday() delay loop"); 
     99     } 
     100+#endif 
     101 } 
     102  
     103  
     104 void ndelay(const unsigned long nsec) 
     105 { 
     106- 
     107+#if 0 
     108 #ifdef HAVE_ASM_MSR_H 
     109  
     110     if (ticks_per_usec) { 
     111@@ -313,6 +313,20 @@ 
     112            gettimeofday(&now, NULL); 
     113        } while (now.tv_sec == end.tv_sec ? now.tv_usec < end.tv_usec : now.tv_sec < end.tv_sec); 
     114     } 
     115+#endif 
     116+ 
     117+  struct timespec val; 
     118+  struct timespec rem; 
     119+  int ret; 
     120+ 
     121+  val.tv_sec = 0; 
     122+  val.tv_nsec = nsec; 
     123+ 
     124+  do { 
     125+         ret = nanosleep(&val, &rem); 
     126+         val = rem; 
     127+  } while ((ret == -1) && (errno == EINTR)); 
     128+ 
     129 } 
     130  
     131 #endif 
     132Index: lcd4linux-0.10.0+cvs20051015.orig/udelay.h 
     133=================================================================== 
     134--- lcd4linux-0.10.0+cvs20051015.orig.orig/udelay.h     2007-07-07 14:02:56.000000000 +0200 
     135+++ lcd4linux-0.10.0+cvs20051015.orig/udelay.h  2007-07-07 14:02:56.000000000 +0200 
     136@@ -72,12 +72,14 @@ 
     137 #ifndef _UDELAY_H_ 
     138 #define _UDELAY_H_ 
     139  
     140+#if 0 
     141 /* stolen from linux/asm-i386/processor.h */ 
    5142 /* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */ 
    6143 static inline void rep_nop(void) 
    7144 { 
    8 -    __asm__ __volatile__("rep; nop"); 
    9 +    __asm__ __volatile__("nop"); 
     145     __asm__ __volatile__("rep; nop"); 
    10146 } 
     147+#endif 
    11148  
    12149  
     150 #ifdef USE_OLD_UDELAY 
  • packages/utils/lcd4linux/patches/120-remove_parport_outb.patch

    r6672 r7886  
    1 diff -urN lcd4linux.old/drv_generic_parport.c lcd4linux.dev/drv_generic_parport.c 
    2 --- lcd4linux.old/drv_generic_parport.c 2006-01-20 03:52:18.426419500 +0100 
    3 +++ lcd4linux.dev/drv_generic_parport.c 2006-01-20 03:57:59.205263500 +0100 
    4 @@ -134,6 +134,11 @@ 
    5  #define PARPORT_STATUS_BUSY       0x80 
    6  #endif 
    7   
    8 +#ifndef WITH_OUTB 
    9 +#define inb(foo) 0 
    10 +#define outb(foo,bar) 0 
    11 +#endif 
    12 +  
    13  #if !defined(WITH_OUTB) && !defined(WITH_PPDEV) 
    14  #error neither outb() nor ppdev() possible 
    15  #error cannot compile parallel port driver 
    16 diff -ur lcd4linux.old/drv_generic_parport.c lcd4linux.dev/drv_generic_parport.c 
    17 --- lcd4linux.old/drv_generic_parport.c 2007-03-24 18:14:55.706590000 +0100 
    18 +++ lcd4linux.dev/drv_generic_parport.c 2007-03-24 18:15:20.036891568 +0100 
     1Index: lcd4linux-0.10.0+cvs20051015.orig/drv_generic_parport.c 
     2=================================================================== 
     3--- lcd4linux-0.10.0+cvs20051015.orig.orig/drv_generic_parport.c        2007-07-07 14:02:55.000000000 +0200 
     4+++ lcd4linux-0.10.0+cvs20051015.orig/drv_generic_parport.c     2007-07-07 14:02:57.000000000 +0200 
    195@@ -117,16 +117,6 @@ 
    206 #include <sys/stat.h> 
     
    3420 #define WITH_PPDEV 
    3521 #include <linux/parport.h> 
     22@@ -143,6 +133,11 @@ 
     23 #define PARPORT_STATUS_BUSY       0x80 
     24 #endif 
     25  
     26+#ifndef WITH_OUTB 
     27+#define inb(foo) 0 
     28+#define outb(foo,bar) 0 
     29+#endif 
     30+  
     31 #if !defined(WITH_OUTB) && !defined(WITH_PPDEV) 
     32 #error neither outb() nor ppdev() possible 
     33 #error cannot compile parallel port driver 
  • packages/utils/lcd4linux/patches/130-linux_2.6.19_wireless_h.patch

    r6500 r7886  
    1 diff -ruN lcd4linux-0.10.0+cvs20051015-old/plugin_wireless.c lcd4linux-0.10.0+cvs20051015-new/plugin_wireless.c 
    2 --- lcd4linux-0.10.0+cvs20051015-old/plugin_wireless.c  2005-05-08 06:32:45.000000000 +0200 
    3 +++ lcd4linux-0.10.0+cvs20051015-new/plugin_wireless.c  2007-01-10 01:08:13.000000000 +0100 
     1Index: lcd4linux-0.10.0+cvs20051015.orig/plugin_wireless.c 
     2=================================================================== 
     3--- lcd4linux-0.10.0+cvs20051015.orig.orig/plugin_wireless.c    2007-07-07 14:02:55.000000000 +0200 
     4+++ lcd4linux-0.10.0+cvs20051015.orig/plugin_wireless.c 2007-07-07 14:02:57.000000000 +0200 
    45@@ -92,6 +92,11 @@ 
    56  
Note: See TracChangeset for help on using the changeset viewer.