X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fdev.h;h=0ff099dc4c30870c6cdbaa130c29078439d692ff;hb=8fe276359efe90c40a83f85ff8476d17f10da740;hp=0408fc52067a72a67e4a2b70b1ddec81e98f6d61;hpb=4e79b6c6dff69319d4d241d459dcfcdec675062e;p=bacula%2Fbacula

diff --git a/bacula/src/stored/dev.h b/bacula/src/stored/dev.h
index 0408fc5206..0ff099dc4c 100644
--- a/bacula/src/stored/dev.h
+++ b/bacula/src/stored/dev.h
@@ -8,19 +8,32 @@
  *
  */
 /*
-   Copyright (C) 2000-2006 Kern Sibbald
+   Bacula® - The Network Backup Solution
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   version 2 as amended with additional clauses defined in the
-   file LICENSE in the main source directory.
+   Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
-   the file LICENSE for additional details.
+   The main author of Bacula is Kern Sibbald, with contributions from
+   many others, a complete list can be found in the file AUTHORS.
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version two of the GNU General Public
+   License as published by the Free Software Foundation plus additions
+   that are listed in the file LICENSE.
 
- */
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+   Bacula® is a registered trademark of John Walker.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
 
 
 #ifndef __DEV_H
@@ -80,9 +93,6 @@ enum {
 #define BMT_IM_REP_EN      (1<<9)     /* immediate report enabled */
 
 
-/* Test capabilities */
-#define dev_cap(dev, cap) ((dev)->capabilities & (cap))
-
 /* Bits for device capabilities */
 #define CAP_EOF            (1<<0)     /* has MTWEOF */
 #define CAP_BSR            (1<<1)     /* has MTBSR */
@@ -163,13 +173,15 @@ struct VOLUME_CAT_INFO {
    uint32_t EndBlock;                 /* Last block number */
    int32_t  LabelType;                /* Bacula/ANSI/IBM */
    int32_t  Slot;                     /* >0=Slot loaded, 0=nothing, -1=unknown */
-   bool     InChanger;                /* Set if vol in current magazine */
    uint32_t VolCatMaxJobs;            /* Maximum Jobs to write to volume */
    uint32_t VolCatMaxFiles;           /* Maximum files to write to volume */
    uint64_t VolCatMaxBytes;           /* Max bytes to write to volume */
    uint64_t VolCatCapacityBytes;      /* capacity estimate */
    uint64_t VolReadTime;              /* time spent reading */
    uint64_t VolWriteTime;             /* time spent writing this Volume */
+   int64_t VolMediaId;                /* MediaId */
+   utime_t  VolFirstWritten;          /* Time of first write */
+   bool     InChanger;                /* Set if vol in current magazine */
    char VolCatStatus[20];             /* Volume status */
    char VolCatName[MAX_NAME_LENGTH];  /* Desired volume to mount */
 };
@@ -270,6 +282,8 @@ public:
 
    /* Methods */
    int has_cap(int cap) const { return capabilities & cap; }
+   void clear_cap(int cap) { capabilities &= ~cap; }
+   void set_cap(int cap) { capabilities |= cap; }
    int is_autochanger() const { return capabilities & CAP_AUTOCHANGER; }
    int requires_mount() const { return capabilities & CAP_REQMOUNT; }
    int is_removable() const { return capabilities & CAP_REM; }
@@ -340,6 +354,7 @@ public:
    void clear_short_block() { state &= ~ST_SHORT; };
    void clear_freespace_ok() { state &= ~ST_FREESPACE_OK; };
    char *bstrerror(void) { return errmsg; };
+   char *print_errmsg() { return errmsg; };
 
    void block(int why);          /* in dev.c */
    void unblock();               /* in dev.c */
@@ -360,11 +375,14 @@ public:
    bool fsf(int num);            /* in dev.c */
    bool bsr(int num);            /* in dev.c */
    bool weof(int num);           /* in dev.c */
+   void lock_door();             /* in dev.c */
+   void unlock_door();           /* in dev.c */
    bool scan_dir_for_volume(DCR *dcr); /* in scan.c */
    bool reposition(DCR *dcr, uint32_t rfile, uint32_t rblock); /* in dev.c */
    void clrerror(int func);      /* in dev.c */
-   off_t lseek(DCR *dcr, off_t offset, int whence); /* in dev.c */
+   boffset_t lseek(DCR *dcr, boffset_t offset, int whence); /* in dev.c */
    bool update_pos(DCR *dcr);    /* in dev.c */
+   bool update_freespace();      /* in dvd.c */
 
    void set_blocked(int block) { dev_blocked = block; };
    int  get_blocked() const { return dev_blocked; };
@@ -379,8 +397,6 @@ private:
    void open_tape_device(DCR *dcr, int omode); /* in dev.c */
    void open_file_device(DCR *dcr, int omode); /* in dev.c */
    void open_dvd_device(DCR *dcr, int omode);  /* in dev.c */
-   void set_blocking();                        /* in dev.c */
-
 };
 
 /* Note, these return int not bool! */