gentoo/alpha-quadrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Neues mt-daapd nightly build

Browse Source
This commit is contained in:
Micha Glave
2007-04-19 10:44:47 +00:00
parent 6a9847b4e4
commit 5a64c71c6e
14 changed files with 993 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app-laptop/thinkpad/files/digest-thinkpad-5.9-r1 Normal file
View File

@@ -0,0 +1,3 @@
MD5 9cd4e86277bb7baeca97e93f57f49e87 thinkpad-5.9.tar.gz 74779
RMD160 93d3d8ff6d64191ff07252654489a9bc5d878457 thinkpad-5.9.tar.gz 74779
SHA256 49d2eab42e57d71cb0f175a645c703fce458a852552842ea56e0c81547d8f715 thinkpad-5.9.tar.gz 74779

15
app-laptop/thinkpad/files/thinkpad Normal file
View File

@@ -0,0 +1,15 @@
keep
path[thinkpad]=/lib/modules/%KV%/thinkpad
# Uncomment this with the options you like.
#options thinkpad enable_smapi=1 enable_superio=1 enable_rtcmosram=1 enable_thinkpadpm=1
# Uncomment this if you are not using devfs for some reason, and comment the
# rest. Otherwise, leave it as is.
#alias char-major-10-170 thinkpad
alias /dev/thinkpad thinkpad
alias /dev/thinkpad/thinkpad thinkpad
alias /dev/thinkpad/smapi smapi
alias /dev/thinkpad/superio superio
alias /dev/thinkpad/rtcmosram rtcmosram
alias /dev/thinkpad/thinkpadpm thinkpadpm

18
app-laptop/thinkpad/files/thinkpad-5.9-module-param.patch Normal file
View File

@@ -0,0 +1,18 @@
diff -purN thinkpad-5.9-orig/2.6/drivers/thinkpad.c thinkpad-5.9/2.6/drivers/thinkpad.c
--- thinkpad-5.9-orig/2.6/drivers/thinkpad.c 2006-07-15 12:27:38.000000000 +0200
+++ thinkpad-5.9/2.6/drivers/thinkpad.c 2006-07-15 12:42:55.000000000 +0200
@@ -91,11 +91,11 @@ static int enable_smapi = 1;
static int enable_superio = 1;
static int enable_rtcmosram = 1;
#ifdef MODULE
-MODULE_PARM( enable_smapi, "i" );
+module_param( enable_smapi, int, S_IRUGO );
MODULE_PARM_DESC( enable_smapi, "Enable/disable (1/0) use of the smapi module" );
-MODULE_PARM( enable_superio, "i" );
+module_param( enable_superio, int, S_IRUGO );
MODULE_PARM_DESC( enable_superio, "Enable/disable (1/0) use of the superio module" );
-MODULE_PARM( enable_rtcmosram, "i" );
+module_param( enable_rtcmosram, int, S_IRUGO );
MODULE_PARM_DESC( enable_rtcmosram, "Enable/disable (1/0) use of the rtcmosram module" );
MODULE_AUTHOR( "Thomas Hood" );
MODULE_DESCRIPTION( "Metadriver for IBM ThinkPad hardware drivers" );

192
app-laptop/thinkpad/files/thinkpad-5.9-remove-inter_module.patch Normal file
View File

@@ -0,0 +1,192 @@
diff -uNr thinkpad-5.9.orig/2.6/drivers/rtcmosram.c thinkpad-5.9/2.6/drivers/rtcmosram.c
--- thinkpad-5.9.orig/2.6/drivers/rtcmosram.c 2006-03-24 18:45:52.000000000 +0100
+++ thinkpad-5.9/2.6/drivers/rtcmosram.c 2006-03-24 18:50:36.000000000 +0100
@@ -52,7 +52,6 @@
/****** variables ******/
static const char _szMyName[] = "rtcmosram";
-static const char _szImName[] = "rtcmosram_do";
static const char _szMyVersion[] = "5.0";
static const char _szProcfile[] = "driver/thinkpad/rtcmosram";
static struct resource *_presourceRtcmosram;
@@ -226,8 +225,6 @@
}
/* proc entry created */
- inter_module_register( _szImName, THIS_MODULE, &rtcmosram_do );
-
return 0;
}
@@ -235,8 +232,6 @@
static void __exit rtcmosram_exit( void )
{
- inter_module_unregister( _szImName );
-
remove_proc_entry( _szProcfile, NULL );
if ( _presourceRtcmosram != NULL ) release_resource( _presourceRtcmosram );
@@ -244,5 +239,6 @@
return;
}
+EXPORT_SYMBOL(rtcmosram_do);
module_init(rtcmosram_init);
module_exit(rtcmosram_exit);
diff -uNr thinkpad-5.9.orig/2.6/drivers/smapi_core.c thinkpad-5.9/2.6/drivers/smapi_core.c
--- thinkpad-5.9.orig/2.6/drivers/smapi_core.c 2006-03-24 18:45:52.000000000 +0100
+++ thinkpad-5.9/2.6/drivers/smapi_core.c 2006-03-24 18:53:55.000000000 +0100
@@ -52,7 +52,6 @@
/****** variables ******/
static const char _szMyName[] = "smapi";
-static const char _szImName[] = "smapi_do";
static const char _szMyVersion[] = "5.0";
static const char _szProcfile[] = "driver/thinkpad/smapi";
@@ -298,8 +297,6 @@
}
/* proc entry created */
- inter_module_register( _szImName, THIS_MODULE, &smapi_do );
-
return 0;
}
@@ -307,12 +304,11 @@
static void __exit smapi_exit( void )
{
- inter_module_unregister( _szImName );
-
remove_proc_entry( _szProcfile, NULL );
return;
}
+EXPORT_SYMBOL(smapi_do);
module_init(smapi_init);
module_exit(smapi_exit);
diff -uNr thinkpad-5.9.orig/2.6/drivers/superio.c thinkpad-5.9/2.6/drivers/superio.c
--- thinkpad-5.9.orig/2.6/drivers/superio.c 2006-03-24 18:45:52.000000000 +0100
+++ thinkpad-5.9/2.6/drivers/superio.c 2006-03-24 18:53:06.000000000 +0100
@@ -52,7 +52,6 @@
/****** variables ******/
static const char _szMyName[] = "superio";
-static const char _szImName[] = "superio_do";
static const char _szMyVersion[] = "5.0";
static const char _szProcfile[] = "driver/thinkpad/superio";
static word _wPortIndex, _wPortData;
@@ -887,8 +886,6 @@
}
/* proc entry created */
- inter_module_register( _szImName, THIS_MODULE, &superio_do );
-
return 0;
}
@@ -896,8 +893,6 @@
static void __exit superio_exit( void )
{
- inter_module_unregister( _szImName );
-
remove_proc_entry( _szProcfile, NULL );
if ( _presourceSuperio != NULL ) release_resource( _presourceSuperio );
@@ -905,5 +900,6 @@
return;
}
+EXPORT_SYMBOL(superio_do);
module_init(superio_init);
module_exit(superio_exit);
diff -uNr thinkpad-5.9.orig/2.6/drivers/thinkpad.c thinkpad-5.9/2.6/drivers/thinkpad.c
--- thinkpad-5.9.orig/2.6/drivers/thinkpad.c 2006-03-24 18:45:52.000000000 +0100
+++ thinkpad-5.9/2.6/drivers/thinkpad.c 2006-03-24 18:58:40.000000000 +0100
@@ -230,13 +230,13 @@
pxint_do_t pxint_doSmapi;
int intRet;
if ( ! enable_smapi ) return -ETHINKPAD_MODULE_DISABLED;
- pxint_doSmapi = (pxint_do_t)inter_module_get_request( "smapi_do" , _szSmapiName );
+ pxint_doSmapi = (pxint_do_t)try_then_request_module( __symbol_get("smapi_do") , _szSmapiName );
if ( pxint_doSmapi == NULL ) return -ETHINKPAD_MODULE_NOT_FOUND;
intRet = (*pxint_doSmapi)(
ulongIoctlArg,
caller_has_w( pfileThe )
);
- inter_module_put("smapi_do");
+ __symbol_put("smapi_do");
if ( intRet > 0 ) intRet = -ETHINKPAD_PROGRAMMING;
return intRet;
}
@@ -245,13 +245,13 @@
pxint_do_t pxint_doSuperio;
int intRet;
if ( ! enable_superio ) return -ETHINKPAD_MODULE_DISABLED;
- pxint_doSuperio = (pxint_do_t)inter_module_get_request( "superio_do" , _szSuperioName );
+ pxint_doSuperio = (pxint_do_t)try_then_request_module( __symbol_get("superio_do") , _szSuperioName );
if ( pxint_doSuperio == NULL ) return -ETHINKPAD_MODULE_NOT_FOUND;
intRet = (*pxint_doSuperio)(
ulongIoctlArg,
caller_has_w( pfileThe )
);
- inter_module_put("superio_do");
+ __symbol_put("superio_do");
if ( intRet > 0 ) intRet = -ETHINKPAD_PROGRAMMING;
return intRet;
}
@@ -260,13 +260,13 @@
pxint_do_t pxint_doRtcmosram;
int intRet;
if ( ! enable_rtcmosram ) return -ETHINKPAD_MODULE_DISABLED;
- pxint_doRtcmosram = (pxint_do_t)inter_module_get_request( "rtcmosram_do" , _szRtcmosramName );
+ pxint_doRtcmosram = (pxint_do_t)try_then_request_module( __symbol_get("rtcmosram_do") , _szRtcmosramName );
if ( pxint_doRtcmosram == NULL ) return -ETHINKPAD_MODULE_NOT_FOUND;
intRet = (*pxint_doRtcmosram)(
ulongIoctlArg,
caller_has_w( pfileThe )
);
- inter_module_put("rtcmosram_do");
+ __symbol_put("rtcmosram_do");
if ( intRet > 0 ) intRet = -ETHINKPAD_PROGRAMMING;
return intRet;
}
diff -uNr thinkpad-5.9.orig/2.6/drivers/thinkpadpm.c thinkpad-5.9/2.6/drivers/thinkpadpm.c
--- thinkpad-5.9.orig/2.6/drivers/thinkpadpm.c 2006-03-24 18:45:52.000000000 +0100
+++ thinkpad-5.9/2.6/drivers/thinkpadpm.c 2006-03-24 18:52:04.000000000 +0100
@@ -57,7 +57,6 @@
/****** variables ******/
static const char _szMyName[] = "thinkpadpm";
-static const char _szImName[] = "thinkpadpm_do";
static const char _szMyVersion[] = "5.9";
static const char _szProcfile[] = "driver/thinkpad/thinkpadpm";
@@ -516,21 +515,18 @@
}
/* proc entry created */
- inter_module_register( _szImName, THIS_MODULE, &thinkpadpm_do );
-
return 0;
}
static void __exit thinkpadpm_exit( void )
{
-
- inter_module_unregister( _szImName );
-
+
remove_proc_entry( _szProcfile, NULL );
return;
}
+EXPORT_SYMBOL(thinkpadpm_do);
module_init(thinkpadpm_init);
module_exit(thinkpadpm_exit);

20
app-laptop/thinkpad/files/thinkpad-5.9-remove-thinkpadapm-argument.patch Normal file
View File

@@ -0,0 +1,20 @@
diff -uNr thinkpad-5.9.orig2/2.6/drivers/thinkpad.c thinkpad-5.9/2.6/drivers/thinkpad.c
--- thinkpad-5.9.orig2/2.6/drivers/thinkpad.c 2006-03-24 19:10:35.000000000 +0100
+++ thinkpad-5.9/2.6/drivers/thinkpad.c 2006-03-24 19:11:11.000000000 +0100
@@ -90,7 +90,6 @@
static int enable_smapi = 1;
static int enable_superio = 1;
static int enable_rtcmosram = 1;
-static int enable_thinkpadpm = 1; /* obsolete */
#ifdef MODULE
MODULE_PARM( enable_smapi, "i" );
MODULE_PARM_DESC( enable_smapi, "Enable/disable (1/0) use of the smapi module" );
@@ -98,8 +97,6 @@
MODULE_PARM_DESC( enable_superio, "Enable/disable (1/0) use of the superio module" );
MODULE_PARM( enable_rtcmosram, "i" );
MODULE_PARM_DESC( enable_rtcmosram, "Enable/disable (1/0) use of the rtcmosram module" );
-MODULE_PARM( enable_thinkpadpm, "i" );
-MODULE_PARM_DESC( enable_thinkpadpm, "Enable/disable (1/0) use of the thinkpadpm module (obsolete)" );
MODULE_AUTHOR( "Thomas Hood" );
MODULE_DESCRIPTION( "Metadriver for IBM ThinkPad hardware drivers" );
MODULE_LICENSE( "GPL" );