[sr-dev] git:master:5664d861: p_usrloc: reformat exported structures