Additional updates

This commit is contained in:
Tony
2020-08-15 19:22:08 -05:00
parent 15f36ecd30
commit b6101d00ce
4 changed files with 12 additions and 3 deletions

View File

@@ -572,7 +572,7 @@ private:
DWORD signals; // All bus signals DWORD signals; // All bus signals
#if defined(USE_SEL_EVENT_ENABLE) && !defined(BAREMETAL) #if defined(USE_SEL_EVENT_ENABLE) && !defined(BAREMETAL) && defined(__linux__)
struct gpioevent_request selevreq; // SEL signal event request struct gpioevent_request selevreq; // SEL signal event request
int epfd; // epoll file descriptor int epfd; // epoll file descriptor

View File

@@ -61,9 +61,11 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/socket.h> #include <sys/socket.h>
#ifndef __APPLE__
#include <sys/epoll.h> #include <sys/epoll.h>
#include <netinet/in.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#endif
#include <netinet/in.h>
#else #else
#include <machine/endian.h> #include <machine/endian.h>
#define htonl(_x) __htonl(_x) #define htonl(_x) __htonl(_x)

View File

@@ -31,6 +31,9 @@ class Rascsi_Manager{
public: public:
static Rascsi_Manager* GetInstance(); static Rascsi_Manager* GetInstance();
void MapControler(FILE *fp, Disk **map); void MapControler(FILE *fp, Disk **map);
void AttachDevice(FILE *fp, Disk *disk, int id, int ui);
void DetachDevice(FILE *fp, Disk *disk, int id, int ui);
Disk* GetDevice(FILE *fp, int id, int ui);
void ListDevice(FILE *fp); void ListDevice(FILE *fp);
BOOL Init(); BOOL Init();
void Close(); void Close();
@@ -58,5 +61,9 @@ class Rascsi_Manager{
static Rascsi_Manager *m_instance; static Rascsi_Manager *m_instance;
static BOOL m_active; static BOOL m_active;
static BOOL m_running; static BOOL m_running;
// Any PUBLIC functions should lock this before accessing the m_ctrl
// m_disk or m_bus data structures. The Public functions could be
// called from a different thread.
static std::timed_mutex m_locked; static std::timed_mutex m_locked;
}; };

View File

@@ -28,8 +28,8 @@ enum rasctl_command : int {
enum rasctl_dev_type : int { enum rasctl_dev_type : int {
rasctl_dev_invalid = -1, rasctl_dev_invalid = -1,
rasctl_dev_scsi_hd = 0,
rasctl_dev_sasi_hd = 0, rasctl_dev_sasi_hd = 0,
rasctl_dev_scsi_hd = 1,
rasctl_dev_mo = 2, rasctl_dev_mo = 2,
rasctl_dev_cd = 3, rasctl_dev_cd = 3,
rasctl_dev_br = 4, rasctl_dev_br = 4,