What years were OBD1 or OBD2, what years were MAF, MAP, both?

I am refering to the '85 thru 2002 V8 models only, like Z28s, RSs, SSs.

I have:
'85 thru '89 MAF only and with L98 engines as the 350
'90 thru '92 MAP only and with L98 engines as the 350
'93 thru ?
'98 thru '02 both MAF & MAP and with LS1 engines.

'85 thru '95 as OBD1
'96 thru '02 as OBD2

93 MAP no MAF
94-02 MAP and MAF