tp_smapi merge isues from l-u-m to u-i, with possible u-i-p effects

[Stefan Bader]

TJ wrote:
> This afternoon the tp_smapi Debian maintainer (Evgeni Golov, nickname:
> Zhenech) visited #ubuntu-kernel asking about the integration of this
> package into the Ubuntu kernel.
> 
Does Evgeni know what prvents those drivers from being integrated into the
kernel? I remember one package having issues with unclear code origins but i am
not sure this was the one or not.

> In investigating the chain of events of the package's inclusion it
> raised some questions as to whether the switch from l-u-m to u-i/u-i-p
> accidentally omitted the l-u-m ubuntu/hwmon/hdpas_ec.c file.
> 
> Stefan commented that this needs further investigation so this post is
> to ensure the issue is on the radar.
> 
> The original commit was for Hardy l-u-m:
> 
> commit 2e0a73b13cfe2c8c2d620b46a74013435e30c18b
> Author: Stefan Bader <stefan.bader at ubuntu.com>
> Date:   Fri Feb 8 09:32:28 2008 -0500
> 
>     UBUNTU: Add tp_smapi support.
> 
> The files in the commit:
> 
> git show 2e0a73b13c | grep '^diff'
> diff --git a/ubuntu/Makefile b/ubuntu/Makefile
> diff --git a/ubuntu/hwmon/hdaps_ec.c b/ubuntu/hwmon/hdaps_ec.c
> diff --git a/ubuntu/misc/thinkpad_ec.c b/ubuntu/misc/thinkpad_ec.c
> diff --git a/ubuntu/misc/thinkpad_ec.h b/ubuntu/misc/thinkpad_ec.h
> diff --git a/ubuntu/misc/tp_smapi.c b/ubuntu/misc/tp_smapi.c
> 
> At that time the Hardy kernel had another (older, un-enhanced*) version
> of hdaps:
> 
>  drivers/hwmon/hdaps.c
> 
> *note: I'm not clear on the relationship between these, it may be that
> both can operate independently.
> 
> Moving to Intrepid, l-u-m was dropped and the tp_smapi files were
> imported to ubuntu-intrepid:
> 
> commit ed464174f93b6a5de9f87d0e50b62359310239a8
> Author: Ben Collins <ben.collins at canonical.com>
> Date:   Thu Jul 31 23:29:51 2008 -0400
> 
>     UBUNTU: ubuntu: Add misc drivers from hardy lum
>     
>     Signed-off-by: Ben Collins <ben.collins at canonical.com>
> 
> The files in the commit:
> 
> git show ed464174f9 | grep '^diff'
> diff --git a/ubuntu/Kconfig b/ubuntu/Kconfig
> diff --git a/ubuntu/Makefile b/ubuntu/Makefile
> diff --git a/ubuntu/misc/BOM b/ubuntu/misc/BOM
> diff --git a/ubuntu/misc/Kconfig b/ubuntu/misc/Kconfig
> diff --git a/ubuntu/misc/Makefile b/ubuntu/misc/Makefile
> diff --git a/ubuntu/misc/acerhk.c b/ubuntu/misc/acerhk.c
> diff --git a/ubuntu/misc/acerhk.h b/ubuntu/misc/acerhk.h
> diff --git a/ubuntu/misc/appleir.c b/ubuntu/misc/appleir.c
> diff --git a/ubuntu/misc/dm-bbr.c b/ubuntu/misc/dm-bbr.c
> diff --git a/ubuntu/misc/dm-bbr.h b/ubuntu/misc/dm-bbr.h
> diff --git a/ubuntu/misc/lmpcm_usb.c b/ubuntu/misc/lmpcm_usb.c
> diff --git a/ubuntu/misc/thinkpad_ec.c b/ubuntu/misc/thinkpad_ec.c
> diff --git a/ubuntu/misc/thinkpad_ec.h b/ubuntu/misc/thinkpad_ec.h
> diff --git a/ubuntu/misc/tp_smapi.c b/ubuntu/misc/tp_smapi.c
> 
> Note that ubuntu/hwmon/hdaps_ec.c isn't in the commit.
> 
> Checking ubuntu-intrepid-ports in case hdaps_ec.c had migrated there I
> found a duplicate of ubuntu-intrepid's hdaps.c, but an older version.
> The common history commit is:
> 
> commit 7b19ada2ed3c1eccb9fe94d74b05e1428224663d
> Author: Jiri Slaby <jirislaby at gmail.com>
> Date:   Thu Oct 18 23:40:32 2007 -0700
> 
> The version in u-i-p is this commit - there are no changes after that
> point.
> 
> Neither ubuntu-intrepid nor ubuntu-intrepid-ports contains a copy of
> l-u-m ubuntu/hwmon/hdaps_ec.c and a diff against the hdaps.c files shows
> significance differences - which come from the tp_smapi project's 0.36
> source tarball.
> 
> The tp_smapi project released 0.37 on 2008-03-29:
> 
> http://sourceforge.net/project/showfiles.php?group_id=1212&package_id=171579
> 
> Stephan mentioned:
> 
> "The one from tpsmapi had some improvements regarding to some axis
> inversion. And it worked together with tp_smapi trhough the common ec
> driver. otherwise one [sic: only?] one can be loaded."
> 

As far as I remember: both tp_smapi and hdaps need to access the embedded
controller. In the tp_smapi project's version thinkpad_ec is used to channel
this. Otherwise only hdaps or tp_smapi can (or should) be loaded.


> TJ.
> 
> 
> 


-- 

When all other means of communication fail, try words!