1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
diff -urN rtl8180_1.5-orig/r8180_if.c rtl8180_1.5/r8180_if.c
--- rtl8180_1.5-orig/r8180_if.c 2003-11-24 16:53:00.000000000 +0100
+++ rtl8180_1.5/r8180_if.c 2004-05-23 01:13:02.362800664 +0200
@@ -391,7 +391,7 @@
//===========================================================================
int timer_cnt = 0;
//---------------------------------------------------------------
-int rtl_request_timer( timer_t *timer, unsigned long timer_expires, void *timer_func, void *timer_data )
+int rtl_request_timer( struct timer_list *timer, unsigned long timer_expires, void *timer_func, void *timer_data )
{
init_timer(timer);
timer->expires = (unsigned long)(jiffies + timer_expires);
@@ -410,7 +410,7 @@
//===========================================================================
//===========================================================================
-void rtl_delete_timer( timer_t *del_timer_t )
+void rtl_delete_timer( struct timer_list *del_timer_t )
{
del_timer(del_timer_t);
timer_cnt--;
@@ -420,9 +420,9 @@
//===========================================================================
//===========================================================================
-int rtl_check_timer( timer_t *timer )
+int rtl_check_timer( struct timer_list *timer )
{
- if( (timer->list.next == NULL) && (timer->list.prev == NULL) ){
+ if( (timer->entry.next == NULL) && (timer->entry.prev == NULL) ){
return 1;
}
return 0;
diff -urN rtl8180_1.5-orig/r8180_if.h rtl8180_1.5/r8180_if.h
--- rtl8180_1.5-orig/r8180_if.h 2003-11-24 16:53:00.000000000 +0100
+++ rtl8180_1.5/r8180_if.h 2004-05-23 01:13:02.359801120 +0200
@@ -93,9 +93,9 @@
unsigned long GetCurTime(void);
-int rtl_request_timer( timer_t *timer, unsigned long timer_expires, void *timer_func, void *timer_data );
-void rtl_delete_timer( timer_t *del_timer_t );
-int rtl_check_timer( timer_t *timer );
+int rtl_request_timer( struct timer_list *timer, unsigned long timer_expires, void *timer_func, void *timer_data );
+void rtl_delete_timer( struct timer_list *del_timer_t );
+int rtl_check_timer( struct timer_list *timer );
int rtl_mod_timer(struct timer_list *timer, unsigned long expires);
int rtl8180_open(struct net_device *dev);
diff -urN rtl8180_1.5-orig/r8180_type.h rtl8180_1.5/r8180_type.h
--- rtl8180_1.5-orig/r8180_type.h 2003-11-24 16:53:00.000000000 +0100
+++ rtl8180_1.5/r8180_type.h 2004-05-23 01:13:15.131859472 +0200
@@ -145,10 +145,11 @@
/*=====================================================================================
type definition.
=====================================================================================*/
+/*
#ifndef timer_t
typedef struct timer_list timer_t;
#endif //#ifndef timer_t
-
+*/
#define rtl_bool unsigned char
#define rtl_uint8 unsigned char
|
