From 75496146b70b1ce14e732e85c419fbfdb5968b15 Mon Sep 17 00:00:00 2001
From: rocky <rocky>
Date: Thu, 27 Jan 2005 04:00:48 +0000
Subject: [PATCH] Some FreeBSD fixes.

---
 lib/driver/FreeBSD/freebsd.c       | 6 +++---
 lib/driver/FreeBSD/freebsd.h       | 5 ++---
 lib/driver/FreeBSD/freebsd_cam.c   | 6 +++---
 lib/driver/FreeBSD/freebsd_ioctl.c | 6 +++---
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/lib/driver/FreeBSD/freebsd.c b/lib/driver/FreeBSD/freebsd.c
index 05d86b1c..825650a9 100644
--- a/lib/driver/FreeBSD/freebsd.c
+++ b/lib/driver/FreeBSD/freebsd.c
@@ -1,5 +1,5 @@
 /*
-    $Id: freebsd.c,v 1.12 2005/01/24 00:06:31 rocky Exp $
+    $Id: freebsd.c,v 1.13 2005/01/27 04:00:48 rocky Exp $
 
     Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
 
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: freebsd.c,v 1.12 2005/01/24 00:06:31 rocky Exp $";
+static const char _rcsid[] = "$Id: freebsd.c,v 1.13 2005/01/27 04:00:48 rocky Exp $";
 
 #include "freebsd.h"
 
@@ -583,7 +583,7 @@ cdio_open_am_freebsd (const char *psz_orig_source_name,
     .get_cdtext             = get_cdtext_generic,
     .get_default_device     = cdio_get_default_device_freebsd,
     .get_devices            = cdio_get_devices_freebsd,
-    .get_disc_last_lsn      = get_disc_last_lsn_freebsd
+    .get_disc_last_lsn      = get_disc_last_lsn_freebsd,
     .get_discmode           = get_discmode_generic,
     .get_drive_cap          = get_drive_cap_freebsd,
     .get_first_track_num    = get_first_track_num_generic,
diff --git a/lib/driver/FreeBSD/freebsd.h b/lib/driver/FreeBSD/freebsd.h
index 5498dc5e..6b61a6bf 100644
--- a/lib/driver/FreeBSD/freebsd.h
+++ b/lib/driver/FreeBSD/freebsd.h
@@ -1,5 +1,5 @@
 /*
-    $Id: freebsd.h,v 1.1 2004/12/18 17:29:32 rocky Exp $
+    $Id: freebsd.h,v 1.2 2005/01/27 04:00:48 rocky Exp $
 
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
 
@@ -223,8 +223,7 @@ int run_scsi_cmd_freebsd_cam( const void *p_user_data,
 /*!
    Return the size of the CD in logical block address (LBA) units.
  */
-uint32_t stat_size_freebsd_cam (_img_private_t *env);
-uint32_t stat_size_freebsd_ioctl (_img_private_t *env);
+lsn_t get_disc_last_lsn_freebsd_ioctl (_img_private_t *_obj);
 
 bool init_freebsd_cam (_img_private_t *env);
 void free_freebsd_cam (void *user_data);
diff --git a/lib/driver/FreeBSD/freebsd_cam.c b/lib/driver/FreeBSD/freebsd_cam.c
index 66912919..dca8863a 100644
--- a/lib/driver/FreeBSD/freebsd_cam.c
+++ b/lib/driver/FreeBSD/freebsd_cam.c
@@ -1,5 +1,5 @@
 /*
-    $Id: freebsd_cam.c,v 1.3 2005/01/24 00:06:31 rocky Exp $
+    $Id: freebsd_cam.c,v 1.4 2005/01/27 04:00:48 rocky Exp $
 
     Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
 
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: freebsd_cam.c,v 1.3 2005/01/24 00:06:31 rocky Exp $";
+static const char _rcsid[] = "$Id: freebsd_cam.c,v 1.4 2005/01/27 04:00:48 rocky Exp $";
 
 #ifdef HAVE_FREEBSD_CDROM
 
@@ -155,7 +155,7 @@ free_freebsd_cam (void *user_data)
   free (p_env);
 }
 
-static driver_return_code_t
+driver_return_code_t
 read_mode2_sector_freebsd_cam (_img_private_t *p_env, void *data, lsn_t lsn, 
 			       bool b_form2)
 {
diff --git a/lib/driver/FreeBSD/freebsd_ioctl.c b/lib/driver/FreeBSD/freebsd_ioctl.c
index 30fabd62..d5b609e4 100644
--- a/lib/driver/FreeBSD/freebsd_ioctl.c
+++ b/lib/driver/FreeBSD/freebsd_ioctl.c
@@ -1,7 +1,7 @@
 /*
-    $Id: freebsd_ioctl.c,v 1.2 2005/01/24 00:06:31 rocky Exp $
+    $Id: freebsd_ioctl.c,v 1.3 2005/01/27 04:00:48 rocky Exp $
 
-    Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
+    Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: freebsd_ioctl.c,v 1.2 2005/01/24 00:06:31 rocky Exp $";
+static const char _rcsid[] = "$Id: freebsd_ioctl.c,v 1.3 2005/01/27 04:00:48 rocky Exp $";
 
 #ifdef HAVE_FREEBSD_CDROM