patch-plat_openbsd_c 1.0 KB

123456789101112131415161718192021222324252627282930313233343536
  1. $OpenBSD: patch-plat_openbsd_c,v 1.2 2005/06/03 00:51:48 mjc Exp $
  2. --- plat_openbsd.c.orig Sun Mar 7 00:36:40 1999
  3. +++ plat_openbsd.c Thu Jun 2 15:15:52 2005
  4. @@ -54,10 +54,12 @@ static char plat_openbsd[] = "$Id: plat_
  5. #include <sys/ioctl.h>
  6. #include <sys/cdio.h>
  7. #include <sys/scsiio.h>
  8. +#include <scsi/cd.h>
  9. #include <scsi/scsi_all.h>
  10. -#include <scsi/scsi_cd.h>
  11. #include "include/wm_struct.h"
  12. +#include "include/wm_cdrom.h"
  13. +#include "include/wm_helpers.h"
  14. #define WM_MSG_CLASS WM_MSG_CLASS_PLATFORM
  15. @@ -82,7 +84,7 @@ gen_init(struct wm_drive *d)
  16. * Get the number of tracks on the CD.
  17. */
  18. int
  19. -gen_get_trackcount(struct wm_drive *d, int tracks)
  20. +gen_get_trackcount(struct wm_drive *d, int *tracks)
  21. {
  22. struct ioc_toc_header hdr;
  23. @@ -473,7 +475,7 @@ wmcd_open(struct wm_drive *d)
  24. if (!warned)
  25. {
  26. fprintf(stderr,
  27. - "As root, please run\n\nchmod 666 %s\n\n%s\n", cd_device,
  28. + "As root, please run\n\nchmod 644 %s\n\n%s\n", cd_device,
  29. "to give yourself permission to access the CD-ROM device.");
  30. warned++;
  31. }