Hello,
Here comes the patch.
The patch fixes the CID for France (and probably other european countries except maybe england where a specific TAS has to be used), both for incoming calls and call waiting cases.
If anybody can try this patch with US hardware to verify the compatibility.
I added a new parameter in openzap.conf (modem-type defaulting to FSK_BELL202) so that modulation can be specified in config.
The patch also adds the MWI functionnality on FXS ports (that meant to also patch mod_voicemail), by using the MWI-Account parameter in directory set to something like "openzap/x/y".
Please comment on this, if any modification need to be made.
François