You have take the version from Sylvain's testing
branch (Sylvain, please
correct me if the extended SIM driver is no longer there) ?
You're right.
The new SIM code is only in sylvain/testing for now. So no point in
trying to use/patch the SIM code in master.
Cheers,
Sylvain