Dear @MikeS,
I modified the driver as you requested, could you try this driver and let us know the feedback. Meanwhile, I will try to read this topic to understand better. Thank you.