===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cdio/mmc.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -c -r1.32 -r1.33
*** src/usr.bin/cdio/mmc.c	2020/09/01 17:20:02	1.32
--- src/usr.bin/cdio/mmc.c	2021/11/28 19:28:42	1.33
***************
*** 1,4 ****
! /*	$OpenBSD: mmc.c,v 1.32 2020/09/01 17:20:02 krw Exp $	*/
  /*
   * Copyright (c) 2006 Michael Coulter <mjc@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: mmc.c,v 1.33 2021/11/28 19:28:42 deraadt Exp $	*/
  /*
   * Copyright (c) 2006 Michael Coulter <mjc@openbsd.org>
   *
***************
*** 15,25 ****
   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */
  
  #include <sys/limits.h>
  #include <sys/time.h>
- #include <sys/types.h>
  #include <sys/scsiio.h>
- #include <sys/param.h>	/* setbit, isset */
  #include <scsi/cd.h>
  #include <scsi/scsi_all.h>
  #include <scsi/scsi_disk.h>
--- 15,24 ----
   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */
  
+ #include <sys/types.h>
  #include <sys/limits.h>
  #include <sys/time.h>
  #include <sys/scsiio.h>
  #include <scsi/cd.h>
  #include <scsi/scsi_all.h>
  #include <scsi/scsi_disk.h>
***************
*** 274,280 ****
  				    "" );
  			}
  		}
! 		setbit(cap, feature);
  	}
  
  	return (0);
--- 273,279 ----
  				    "" );
  			}
  		}
! 		cdio_setbit(cap, feature);
  	}
  
  	return (0);
***************
*** 288,294 ****
  
  	memset(&scr, 0, sizeof(scr));
  	scr.cmd[0] = SET_CD_SPEED;
! 	scr.cmd[1] = (isset(mediacap, MMC_FEATURE_CDRW_CAV)) != 0;
  	*(u_int16_t *)(scr.cmd + 2) = htobe16(DRIVE_SPEED_OPTIMAL);
  	*(u_int16_t *)(scr.cmd + 4) = htobe16(wspeed);
  
--- 287,293 ----
  
  	memset(&scr, 0, sizeof(scr));
  	scr.cmd[0] = SET_CD_SPEED;
! 	scr.cmd[1] = (cdio_isset(mediacap, MMC_FEATURE_CDRW_CAV)) != 0;
  	*(u_int16_t *)(scr.cmd + 2) = htobe16(DRIVE_SPEED_OPTIMAL);
  	*(u_int16_t *)(scr.cmd + 4) = htobe16(wspeed);