Actually they were both. They were state organized, but subject to federal call, and were to be trained according to federal "discipline" (which can be thought of as "training standards". Congress was to provide for arming them, which they did by requiring them to provide their own arms, of a specified type, which pretty much was the same as issued to regular troops, alhtough the militiament were free to bring rifles, rather than muskets, if they desired and were allowed by the state appointed officers.