The patch to kb.c compiled fine, but the patch for joy.c didn't compile for me:

cpu% mk
7c -I../lib -FTVw joy.c
joy.c:228 name not declared: iface
mk: 7c -I../lib -FTVw joy.c  : exit status=rc 2880351: 7c 2880353: error

Just to see if it would compile I replaced "iface" with "f->dev->usb->ep[eid]->iface" and it did. Did you have iface referring to something else?