===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cdio/mmc.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -c -r1.26 -r1.27
*** src/usr.bin/cdio/mmc.c	2008/08/30 10:41:38	1.26
--- src/usr.bin/cdio/mmc.c	2009/12/04 07:43:26	1.27
***************
*** 1,4 ****
! /*	$OpenBSD: mmc.c,v 1.26 2008/08/30 10:41:38 fgsch Exp $	*/
  /*
   * Copyright (c) 2006 Michael Coulter <mjc@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: mmc.c,v 1.27 2009/12/04 07:43:26 claudio Exp $	*/
  /*
   * Copyright (c) 2006 Michael Coulter <mjc@openbsd.org>
   *
***************
*** 80,86 ****
  	scsireq_t scr;
  	u_char buf[4096];
  	u_int32_t i, dlen;
! 	u_int16_t feature;
  	u_int8_t feature_len;
  	int error;
  
--- 80,86 ----
  	scsireq_t scr;
  	u_char buf[4096];
  	u_int32_t i, dlen;
! 	u_int16_t feature, tmp;
  	u_int8_t feature_len;
  	int error;
  
***************
*** 90,96 ****
  
  	scr.cmd[0] = SCSI_GET_CONFIGURATION;
  	scr.cmd[1] = rt;
! 	*(u_int16_t *)(scr.cmd + 7) = htobe16(sizeof(buf));
  
  	scr.flags = SCCMD_ESCAPE | SCCMD_READ;
  	scr.databuf = buf;
--- 90,97 ----
  
  	scr.cmd[0] = SCSI_GET_CONFIGURATION;
  	scr.cmd[1] = rt;
! 	tmp = htobe16(sizeof(buf));
! 	memcpy(scr.cmd + 7, &tmp, sizeof(u_int16_t));
  
  	scr.flags = SCCMD_ESCAPE | SCCMD_READ;
  	scr.databuf = buf;