Clean up some SD message nos.

[bacula/bacula] / bacula / src / stored / dev.h

diff --git a/bacula/src/stored/dev.h b/bacula/src/stored/dev.h
index 10ca3577d636cac4c0317f12eabb8d6d53b78ad5..ffcd90781ec69e68bab049cd69accae79c49fd44 100644 (file)
--- a/bacula/src/stored/dev.h
+++ b/bacula/src/stored/dev.h
@@ -6,7 +6,7 @@
  *
  */
 /*
-   Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2000-2003 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -45,6 +45,9 @@
 /* Arguments to open_dev() */
 #define READ_WRITE 0
 #define READ_ONLY  1
+#define OPEN_READ_WRITE 0
+#define OPEN_READ_ONLY  1
+#define OPEN_WRITE_ONLY 2
 
 /* Generic status bits returned from status_dev() */
 #define MT_TAPE      (1<<0)                /* is tape device */
@@ -59,6 +62,9 @@
 #define MT_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            0x0001     /* has MTWEOF */
 #define CAP_BSR            0x0002     /* has MTBSR */
@@ -75,7 +81,10 @@
 #define CAP_AUTOCHANGER    0x1000     /* AutoChanger */
 #define CAP_OFFLINEUNMOUNT 0x2000     /* Offline before unmount */
 #define CAP_STREAM         0x4000     /* Stream device */
+#define CAP_BSFATEOM       0x8000     /* Backspace file at EOM */
 
+/* Test state */
+#define dev_state(dev, state) ((dev)->state & (state))
 
 /* Device state bits */
 #define ST_OPENED    0x0001           /* set when device opened */
@@ -132,10 +141,8 @@ typedef struct s_steal_lock {
 /* Device structure definition */
 typedef struct s_device {
    struct s_device *next;             /* pointer to next open device */
+   struct s_device *prev;             /* pointer to prev open device */
    void *attached_jcrs;               /* attached JCR list */
-#ifdef NEW_LOCK
-   brwlock_t lock;                    /* new device locking mechanism */
-#endif
    pthread_mutex_t mutex;             /* access control */
    pthread_cond_t wait;               /* thread wait variable */
    pthread_cond_t wait_next_vol;      /* wait for tape to be mounted */
@@ -158,14 +165,14 @@ typedef struct s_device {
    uint32_t EndFile;                  /* last file written */
    uint32_t min_block_size;           /* min block size */
    uint32_t max_block_size;           /* max block size */
-   uint32_t max_volume_jobs;          /* max jobs to put on one volume */
-   uint64_t max_volume_files;         /* max files to put on one volume */
    uint64_t max_volume_size;          /* max bytes to put on one volume */
    uint64_t max_file_size;            /* max file size to put in one file on volume */
    uint64_t volume_capacity;          /* advisory capacity */
    uint32_t max_rewind_wait;          /* max secs to allow for rewind */
    uint32_t max_open_wait;            /* max secs to allow for open */
+   uint32_t max_open_vols;            /* max simultaneous open volumes */
    void *device;                      /* pointer to Device Resource */
+   btimer_id tid;                     /* timer id */
 
    VOLUME_CAT_INFO VolCatInfo;        /* Volume Catalog Information */
    VOLUME_LABEL VolHdr;               /* Actual volume label */