Characterization of Visible and Infrared (1.54 μm) Luminescence from Er-doped Porous Si