$OpenBSD: patch-kscd_libwm_plat_openbsd_c,v 1.7 2007/05/25 09:49:55 espie Exp $
--- kscd/libwm/plat_openbsd.c.orig	Sat Sep 10 10:19:56 2005
+++ kscd/libwm/plat_openbsd.c	Thu May 24 16:28:25 2007
@@ -57,7 +57,6 @@
 #include <sys/scsiio.h>
 #include <scsi/scsi_all.h>
 #include <scsi/cd.h>
-#include <scsi/scsi_cd.h>
 
 #include "include/wm_struct.h"
 #include "include/wm_cdtext.h"
@@ -127,10 +126,9 @@ wmcd_open(struct wm_drive *d)
   
   find_drive_struct(vendor, model, rev);
   
-  (d->init)(d);
-  
   d->fd = fd;
-  
+  if (d->proto->gen_init)
+  	return (d->proto->gen_init)(d);
   return (0);
 } /* wmcd_open() */
 
@@ -314,7 +312,7 @@ gen_get_cdlen(struct wm_drive *d, int *frames)
  * Play the CD from one position to another (both in frames.)
  */
 int
-gen_play(struct wm_drive *d, int start, int end)
+gen_play(struct wm_drive *d, int start, int end, int realstart)
 {
   struct ioc_play_msf	msf;
   
