Changeset 3022


Ignore:
Timestamp:
2006-01-20T04:19:35+01:00 (12 years ago)
Author:
nbd
Message:

sync lcd4linux with whiterussian

Location:
trunk/openwrt/package/lcd4linux
Files:
1 edited
3 moved

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/package/lcd4linux/Makefile

    r948 r3022  
    44 
    55PKG_NAME:=lcd4linux 
    6 PKG_VERSION:=0.10.0-RC1 
     6PKG_VERSION:=0.10.0 
    77PKG_RELEASE:=1 
    8 PKG_MD5SUM:=bab64ac01ebdce7e46ab367351af839f 
     8PKG_MD5SUM:=b7fb1c24b940482cd730cf212d1b5062 
    99 
    10 PKG_SOURCE_URL:=@SF/lcd4linux/ 
     10PKG_SOURCE_URL:=@SF/lcd4linux 
    1111PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1212PKG_CAT:=zcat 
  • trunk/openwrt/package/lcd4linux/patches/110-ucdelay.patch

    r3005 r3022  
    1 --- lcd4linux-0.10.0-RC1/udelay.h       2004-06-26 14:05:00.000000000 +0200 
    2 +++ lcd-patched/udelay.h        2005-03-19 15:00:54.835892666 +0100 
    3 @@ -69,7 +69,7 @@ 
     1diff -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 @@ 
    45 /* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */ 
    5  static inline void rep_nop (void) 
     6 static inline void rep_nop(void) 
    67 { 
    7 __asm__ __volatile__("rep; nop"); 
    8 __asm__ __volatile__("nop"); 
     8  __asm__ __volatile__("rep; nop"); 
     9  __asm__ __volatile__("nop"); 
    910 } 
    1011  
  • trunk/openwrt/package/lcd4linux/patches/120-remove_parport_outb.patch

    r3005 r3022  
    1 --- lcd4linux-0.10.0-RC1/drv_generic_parport.c  2005-01-06 17:54:54.000000000 +0100 
    2 +++ lcd/drv_generic_parport.c   2005-03-20 01:20:48.052255953 +0100 
    3 @@ -359,13 +359,12 @@ 
    4  #ifdef WITH_PPDEV 
    5    if (PPdev) { 
    6      ioctl (PPfd, PPDATADIR, &direction); 
    7 -  } else 
    8 +  }  
    9 +#else 
    10 +       /* code stolen from linux/parport_pc.h */ 
    11 +       ctr = (ctr & ~0x20) ^ (direction?0x20:0x00); 
    12 +       outb (ctr, Port+2); 
     1diff -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 
    136 #endif 
    14 -    { 
    15 -      /* code stolen from linux/parport_pc.h */ 
    16 -      ctr = (ctr & ~0x20) ^ (direction?0x20:0x00); 
    17 -      outb (ctr, Port+2); 
    18 -    } 
    19  } 
    207  
    21   
    22 @@ -383,11 +382,10 @@ 
    23  #ifdef WITH_PPDEV 
    24    if (PPdev) { 
    25      ioctl (PPfd, PPRSTATUS, &data); 
    26 -  } else 
    27 +  }  
    28 +#else 
    29 +  data = inb (Port+1); 
    30  #endif 
    31 -    { 
    32 -      data = inb (Port+1); 
    33 -    } 
    34     
    35    /* clear unused bits */ 
    36    data &= mask; 
    37 @@ -413,13 +411,12 @@ 
    38      frob.mask=mask; 
    39      frob.val=val; 
    40      ioctl (PPfd, PPFCONTROL, &frob); 
    41 -  } else 
    42 +  }  
    43 +#else 
    44 +  /* code stolen from linux/parport_pc.h */ 
    45 +  ctr = (ctr & ~mask) ^ val; 
    46 +  outb (ctr, Port+2); 
    47  #endif 
    48 -    { 
    49 -      /* code stolen from linux/parport_pc.h */ 
    50 -      ctr = (ctr & ~mask) ^ val; 
    51 -      outb (ctr, Port+2); 
    52 -    } 
    53  } 
    54   
    55   
    56 @@ -456,9 +453,9 @@ 
    57      frob.val = value2; 
    58      ioctl (PPfd, PPFCONTROL, &frob); 
    59   
    60 -  } else 
    61 -#endif 
    62 -    { 
    63 +  }  
    64 +#else 
    65 +     
    66        /* rise */ 
    67        ctr = (ctr & ~bits) ^ value1; 
    68        outb (ctr, Port+2); 
    69 @@ -469,7 +466,8 @@ 
    70        /* lower */ 
    71        ctr = (ctr & ~bits) ^ value2; 
    72        outb (ctr, Port+2); 
    73 -    } 
    74 +     
     8+#ifndef WITH_OUTB 
     9+#define inb(foo) 0 
     10+#define outb(foo,bar) 0 
    7511+#endif 
    76  } 
    77   
    78   
    79 @@ -478,11 +476,11 @@ 
    80  #ifdef WITH_PPDEV 
    81    if (PPdev) { 
    82      ioctl(PPfd, PPWDATA, &data); 
    83 -  } else 
    84 +  }  
    85 +#else     
    86 +  outb (data, Port); 
    87  #endif 
    88 -    { 
    89 -      outb (data, Port); 
    90 -    } 
    91 +     
    92  } 
    93   
    94  unsigned char drv_generic_parport_read (void) 
    95 @@ -492,11 +490,10 @@ 
    96  #ifdef WITH_PPDEV 
    97    if (PPdev) { 
    98      ioctl (PPfd, PPRDATA, &data); 
    99 -  } else 
    100 +  }  
    101 +#else 
    102 +  data=inb (Port); 
    103  #endif 
    104 -    { 
    105 -      data=inb (Port); 
    106 -    } 
    107    return data; 
    108  } 
    109   
     12+  
     13 #if !defined(WITH_OUTB) && !defined(WITH_PPDEV) 
     14 #error neither outb() nor ppdev() possible 
     15 #error cannot compile parallel port driver 
Note: See TracChangeset for help on using the changeset viewer.