// -------------------------------------------
// This file is part of eCos, the Embedded Configurable Operating System.
// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-// Copyright (C) 2003 Savin Zlobec
+// Copyright (C) 2003, 2004, 2005 eCosCentric Limited
//
// eCos is free software; you can redistribute it and/or modify it under
// the terms of the GNU General Public License as published by the Free
#include <pkgconf/io_disk.h>
#include <cyg/infra/cyg_type.h>
+#include <cyg/io/devtab.h>
#include <cyg/io/io.h>
-#include <cyg/io/diskio.h>
#include <cyg/hal/drv_api.h>
+#include <string.h> /* memset() */
+
+// ---------------------------------------------------------------------------
+
+typedef struct cyg_disk_partition_t cyg_disk_partition_t;
+typedef struct cyg_disk_info_t cyg_disk_info_t;
+typedef struct cyg_disk_identify_t cyg_disk_identify_t;
-typedef struct disk_channel disk_channel;
-typedef struct disk_funs disk_funs;
+typedef struct disk_channel disk_channel;
+typedef struct disk_controller disk_controller;
+typedef struct disk_funs disk_funs;
+
+// ---------------------------------------------------------------------------
// Pointers into upper-level driver
typedef struct {
cyg_disk_identify_t *ident);
// Disk device has been disconnected
- Cyg_ErrNo (*disk_disconnected)(struct cyg_devtab_entry *tab);
+ Cyg_ErrNo (*disk_disconnected)(struct disk_channel *chan);
// Lookup disk device
Cyg_ErrNo (*disk_lookup)(struct cyg_devtab_entry **tab,
struct cyg_devtab_entry *sub_tab,
const char *name);
+
+ // Asynchronous block transfer done
+ void (*disk_transfer_done)(struct disk_channel *chan, Cyg_ErrNo res);
+
} disk_callbacks_t;
-#define DISK_CALLBACKS(_l, \
- _init, \
- _connected, \
- _disconnected, \
- _lookup) \
-disk_callbacks_t _l = { \
- _init, \
- _connected, \
- _disconnected, \
- _lookup \
+#define DISK_CALLBACKS(_l, \
+ _init, \
+ _connected, \
+ _disconnected, \
+ _lookup, \
+ _transfer_done) \
+disk_callbacks_t _l = { \
+ _init, \
+ _connected, \
+ _disconnected, \
+ _lookup, \
+ _transfer_done \
};
extern disk_callbacks_t cyg_io_disk_callbacks;
+// ---------------------------------------------------------------------------
+// Private data which describes a disk controller
+
+struct disk_controller {
+ cyg_drv_mutex_t lock; // Per-controller lock
+ cyg_drv_cond_t queue; // Access wait list
+ cyg_drv_cond_t async; // Async transfer waits here
+ void *priv; // Private data
+ volatile Cyg_ErrNo result; // Last operation result
+ cyg_bool init; // Initialized?
+ volatile cyg_bool busy; // Busy?
+};
+
+#define DISK_CONTROLLER(_l, _priv) \
+static disk_controller _l = { \
+ priv: &_priv, \
+ init: false, \
+ busy: false \
+};
+
+// ---------------------------------------------------------------------------
// Private data which describes this channel
+
struct disk_channel {
disk_funs *funs;
disk_callbacks_t *callbacks;
void *dev_priv; // device private data
+ disk_controller *controller; // pointer to controller
cyg_disk_info_t *info; // disk info
cyg_disk_partition_t *partition; // partition data
struct cyg_devtab_entry *pdevs_dev; // partition devs devtab ents
cyg_bool mbr_support; // true if disk has MBR
cyg_bool valid; // true if device valid
cyg_bool init; // true if initialized
+ cyg_ucount16 mounts; // count of number of mounts
};
// Initialization macro for disk channel
#define DISK_CHANNEL(_l, \
_funs, \
_dev_priv, \
+ _controller, \
_mbr_supp, \
_max_part_num) \
static struct cyg_devtab_entry _l##_part_dev[_max_part_num]; \
&(_funs), \
&cyg_io_disk_callbacks, \
&(_dev_priv), \
+ &(_controller), \
&(_l##_disk_info), \
NULL, \
_l##_part_dev, \
_l##_part_chan, \
_mbr_supp, \
false, \
- false \
+ false, \
+ 0 \
};
+// Initialization macro for disk channel allocated elsewhere.
+#define DISK_CHANNEL_INIT(_dc, \
+ _funs, \
+ _dev_priv, \
+ _controller, \
+ _disk_info, \
+ _part_dev, \
+ _part_chan, \
+ _part_tab, \
+ _mbr_supp, \
+ _max_part_num) \
+ CYG_MACRO_START \
+ memset((_disk_info), 0, sizeof(cyg_disk_info_t)); \
+ (_dc).funs = &(_funs); \
+ (_dc).callbacks = &cyg_io_disk_callbacks; \
+ (_dc).dev_priv = (_dev_priv); \
+ (_dc).controller = &(_controller); \
+ (_dc).info = &(_disk_info); \
+ (_dc).info->partitions = (_part_tab); \
+ (_dc).pdevs_dev = (_part_dev); \
+ (_dc).pdevs_chan = (_part_chan); \
+ (_dc).partition = NULL; \
+ (_dc).mbr_support = (_mbr_supp); \
+ (_dc).valid = false; \
+ (_dc).init = false; \
+ (_dc).mounts = 0; \
+ (_dc).info->partitions_num = (_max_part_num); \
+ CYG_MACRO_END
+
+// ---------------------------------------------------------------------------
// Low level interface functions
+
struct disk_funs {
// Read block data into buf
};
#define DISK_FUNS(_l,_read,_write,_get_config,_set_config) \
-disk_funs _l = { \
+static disk_funs _l = { \
_read, \
_write, \
_get_config, \
extern cyg_devio_table_t cyg_io_disk_devio;
+// ---------------------------------------------------------------------------
+
+#include <cyg/io/diskio.h>
+
+// ---------------------------------------------------------------------------
#endif // CYGONCE_DISK_H
projects / karo-tx-redboot.git / blobdiff