Many control methods have been proposed for powered prosthetic legs, ranging from finite state machines that switch between discrete phases of gait to unified controllers that have a continuous sense of phase. In particular, recent work has shown that a mechanical phase variable can parameterize the entire gait cycle for controlling a prosthetic leg during steady rhythmic locomotion. However, the unified approach does not provide voluntary control over non-rhythmic motions like stepping forward and back. In this paper we present a phasing algorithm that uses the amputee's hip angle to control both rhythmic and non-rhythmic motion through two modes: 1) a piecewise (PW) function that provides users voluntary control over stance and swing in a piecewise manner, and 2) a unified function that continuously synchronizes the motion of the prosthetic leg with the amputee user at different walking speeds. The two phase variable approaches are compared in experiments with a powered knee-ankle prosthesis used by an above-knee amputee subject.