Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 23456
b: refs/heads/master
c: 74769ab
h: refs/heads/master
v: v3
  • Loading branch information
Alan Cox authored and Linus Torvalds committed Mar 24, 2006
1 parent 0f69cef commit c9274cb
Show file tree
Hide file tree
Showing 11 changed files with 244 additions and 401 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 10e705f83c3e796893a70fb872895ba604901166
refs/heads/master: 74769abfcb430b839914f3fe91e23a4f628d9553
58 changes: 27 additions & 31 deletions trunk/drivers/char/rio/board.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@
#ifndef __rio_board_h__
#define __rio_board_h__

#ifdef SCCS_LABELS
static char *_board_h_sccs_ = "@(#)board.h 1.2";
#endif

/*
** board.h contains the definitions for the *hardware* of the host cards.
** It describes the memory overlay for the dual port RAM area.
Expand All @@ -53,29 +49,29 @@ static char *_board_h_sccs_ = "@(#)board.h 1.2";
** The shape of the Host Control area, at offset 0x7C00, Write Only
*/
struct s_Ctrl {
BYTE DpCtl; /* 7C00 */
BYTE Dp_Unused2_[127];
BYTE DpIntSet; /* 7C80 */
BYTE Dp_Unused3_[127];
BYTE DpTpuReset; /* 7D00 */
BYTE Dp_Unused4_[127];
BYTE DpIntReset; /* 7D80 */
BYTE Dp_Unused5_[127];
u8 DpCtl; /* 7C00 */
u8 Dp_Unused2_[127];
u8 DpIntSet; /* 7C80 */
u8 Dp_Unused3_[127];
u8 DpTpuReset; /* 7D00 */
u8 Dp_Unused4_[127];
u8 DpIntReset; /* 7D80 */
u8 Dp_Unused5_[127];
};

/*
** The PROM data area on the host (0x7C00), Read Only
*/
struct s_Prom {
WORD DpSlxCode[2];
WORD DpRev;
WORD Dp_Unused6_;
WORD DpUniq[4];
WORD DpJahre;
WORD DpWoche;
WORD DpHwFeature[5];
WORD DpOemId;
WORD DpSiggy[16];
u16 DpSlxCode[2];
u16 DpRev;
u16 Dp_Unused6_;
u16 DpUniq[4];
u16 DpJahre;
u16 DpWoche;
u16 DpHwFeature[5];
u16 DpOemId;
u16 DpSiggy[16];
};

/*
Expand All @@ -90,19 +86,19 @@ union u_CtrlProm { /* This is the control/PROM area (0x7C00) */
** The top end of memory!
*/
struct s_ParmMapS { /* Area containing Parm Map Pointer */
BYTE Dp_Unused8_[DP_PARMMAP_ADDR];
WORD DpParmMapAd;
u8 Dp_Unused8_[DP_PARMMAP_ADDR];
u16 DpParmMapAd;
};

struct s_StartUpS {
BYTE Dp_Unused9_[DP_STARTUP_ADDR];
BYTE Dp_LongJump[0x4];
BYTE Dp_Unused10_[2];
BYTE Dp_ShortJump[0x2];
u8 Dp_Unused9_[DP_STARTUP_ADDR];
u8 Dp_LongJump[0x4];
u8 Dp_Unused10_[2];
u8 Dp_ShortJump[0x2];
};

union u_Sram2ParmMap { /* This is the top of memory (0x7E00-0x7FFF) */
BYTE DpSramMem[DP_SRAM2_SIZE];
u8 DpSramMem[DP_SRAM2_SIZE];
struct s_ParmMapS DpParmMapS;
struct s_StartUpS DpStartUpS;
};
Expand All @@ -111,11 +107,11 @@ union u_Sram2ParmMap { /* This is the top of memory (0x7E00-0x7FFF) */
** This is the DP RAM overlay.
*/
struct DpRam {
BYTE DpSram1[DP_SRAM1_SIZE]; /* 0000 - 7BFF */
u8 DpSram1[DP_SRAM1_SIZE]; /* 0000 - 7BFF */
union u_CtrlProm DpCtrlProm; /* 7C00 - 7DFF */
union u_Sram2ParmMap DpSram2ParmMap; /* 7E00 - 7FFF */
BYTE DpScratch[DP_SCRATCH_SIZE]; /* 8000 - 8FFF */
BYTE DpSram3[DP_SRAM3_SIZE]; /* 9000 - FFFF */
u8 DpScratch[DP_SCRATCH_SIZE]; /* 8000 - 8FFF */
u8 DpSram3[DP_SRAM3_SIZE]; /* 9000 - FFFF */
};

#define DpControl DpCtrlProm.DpCtrl.DpCtl
Expand Down
46 changes: 23 additions & 23 deletions trunk/drivers/char/rio/cmdpkt.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,24 +55,24 @@ static char *_cmdpkt_h_sccs_ = "@(#)cmdpkt.h 1.2";
** at Data[2] in the actual pkt!
*/
struct BootSequence {
WORD NumPackets;
WORD LoadBase;
WORD CodeSize;
u16 NumPackets;
u16 LoadBase;
u16 CodeSize;
};

#define BOOT_SEQUENCE_LEN 8

struct SamTop {
BYTE Unit;
BYTE Link;
u8 Unit;
u8 Link;
};

struct CmdHdr {
BYTE PcCommand;
u8 PcCommand;
union {
BYTE PcPhbNum;
BYTE PcLinkNum;
BYTE PcIDNum;
u8 PcPhbNum;
u8 PcLinkNum;
u8 PcIDNum;
} U0;
};

Expand All @@ -84,28 +84,28 @@ struct PktCmd {
struct BootSequence PcBootSequence;
} S1;
struct {
WORD PcSequence;
BYTE PcBootData[RTA_BOOT_DATA_SIZE];
u16 PcSequence;
u8 PcBootData[RTA_BOOT_DATA_SIZE];
} S2;
struct {
WORD __crud__;
BYTE PcUniqNum[4]; /* this is really a uint. */
BYTE PcModuleTypes; /* what modules are fitted */
u16 __crud__;
u8 PcUniqNum[4]; /* this is really a uint. */
u8 PcModuleTypes; /* what modules are fitted */
} S3;
struct {
struct CmdHdr CmdHdr;
BYTE __undefined__;
BYTE PcModemStatus;
BYTE PcPortStatus;
BYTE PcSubCommand; /* commands like mem or register dump */
WORD PcSubAddr; /* Address for command */
BYTE PcSubData[64]; /* Date area for command */
u8 __undefined__;
u8 PcModemStatus;
u8 PcPortStatus;
u8 PcSubCommand; /* commands like mem or register dump */
u16 PcSubAddr; /* Address for command */
u8 PcSubData[64]; /* Date area for command */
} S4;
struct {
struct CmdHdr CmdHdr;
BYTE PcCommandText[1];
BYTE __crud__[20];
BYTE PcIDNum2; /* It had to go somewhere! */
u8 PcCommandText[1];
u8 __crud__[20];
u8 PcIDNum2; /* It had to go somewhere! */
} S5;
struct {
struct CmdHdr CmdHdr;
Expand Down
106 changes: 24 additions & 82 deletions trunk/drivers/char/rio/link.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,95 +37,37 @@
#ifndef _link_h
#define _link_h 1

#ifndef lint
#ifdef SCCS_LABELS
/* static char *_rio_link_h_sccs = "@(#)link.h 1.15"; */
#endif
#endif



/*************************************************
* Define the Link Status stuff
************************************************/
#define LRT_ACTIVE ((ushort) 0x01)
#define LRT_SPARE1 ((ushort) 0x02)
#define INTRO_RCVD ((ushort) 0x04)
#define FORCED_DISCONNECT ((ushort) 0x08)
#define LRT_SPARE2 ((ushort) 0x80)

#define TOP_OF_RTA_RAM ((ushort) 0x7000)
#define HOST_SERIAL_POINTER (unsigned char **) (TOP_OF_RTA_RAM - 2 * sizeof (ushort))

/* Flags for ltt_status */
#define WAITING_ACK (ushort) 0x0001
#define DATA_SENT (ushort) 0x0002
#define WAITING_RUP (ushort) 0x0004
#define WAITING_RETRY (ushort) 0x0008
#define WAITING_TOPOLOGY (ushort) 0x0010
#define SEND_SYNC (ushort) 0x0020
#define FOAD_THIS_LINK (ushort) 0x0040
#define REQUEST_SYNC (ushort) 0x0080
#define REMOTE_DYING (ushort) 0x0100
#define DIE_NOW (ushort) 0x0200

/* Boot request stuff */
#define BOOT_REQUEST ((ushort) 0) /* Request for a boot */
#define BOOT_ABORT ((ushort) 1) /* Abort a boot */
#define BOOT_SEQUENCE ((ushort) 2) /* Packet with the number of packets
and load address */
#define BOOT_COMPLETED ((ushort) 3) /* Boot completed */

/* States that a link can be in */
#define LINK_DISCONNECTED ((ushort) 0) /* Disconnected */
#define LINK_BOOT1 ((ushort) 1) /* Trying to send 1st stage boot */
#define LINK_BOOT2 ((ushort) 2) /* Trying to send 2nd stage boot */
#define LINK_BOOT2WAIT ((ushort) 3) /* Waiting for selftest results */
#define LINK_BOOT3 ((ushort) 4) /* Trying to send 3rd stage boots */
#define LINK_SYNC ((ushort) 5) /* Syncing */

#define LINK_INTRO ((ushort) 10) /* Introductory packet */
#define LINK_SUPPLYID ((ushort) 11) /* Trying to supply an ID */
#define LINK_TOPOLOGY ((ushort) 12) /* Send a topology update */
#define LINK_REQUESTID ((ushort) 13) /* Waiting for an ID */
#define LINK_CONNECTED ((ushort) 14) /* Connected */

#define LINK_INTERCONNECT ((ushort) 20) /* Subnets interconnected */

#define LINK_SPARE ((ushort) 40)

/*
** Set the default timeout for link communications.
*/
#define LINKTIMEOUT (400 * MILLISECOND)

/*
** LED stuff
*/
#define LED_SET_COLOUR(colour)
#define LED_OR_COLOUR(colour)
#define LED_TIMEOUT(time)

struct LPB {
WORD link_number; /* Link Number */
u16 link_number; /* Link Number */
Channel_ptr in_ch; /* Link In Channel */
Channel_ptr out_ch; /* Link Out Channel */
BYTE attached_serial[4]; /* Attached serial number */
BYTE attached_host_serial[4];
u8 attached_serial[4]; /* Attached serial number */
u8 attached_host_serial[4];
/* Serial number of Host who
booted the other end */
WORD descheduled; /* Currently Descheduled */
WORD state; /* Current state */
WORD send_poll; /* Send a Poll Packet */
u16 descheduled; /* Currently Descheduled */
u16 state; /* Current state */
u16 send_poll; /* Send a Poll Packet */
Process_ptr ltt_p; /* Process Descriptor */
Process_ptr lrt_p; /* Process Descriptor */
WORD lrt_status; /* Current lrt status */
WORD ltt_status; /* Current ltt status */
WORD timeout; /* Timeout value */
WORD topology; /* Topology bits */
WORD mon_ltt;
WORD mon_lrt;
WORD WaitNoBoot; /* Secs to hold off booting */
u16 lrt_status; /* Current lrt status */
u16 ltt_status; /* Current ltt status */
u16 timeout; /* Timeout value */
u16 topology; /* Topology bits */
u16 mon_ltt;
u16 mon_lrt;
u16 WaitNoBoot; /* Secs to hold off booting */
PKT_ptr add_packet_list; /* Add packets to here */
PKT_ptr remove_packet_list; /* Send packets from here */

Expand All @@ -136,17 +78,17 @@ struct LPB {
struct RUP rup;
struct RUP link_rup; /* RUP for the link (POLL,
topology etc.) */
WORD attached_link; /* Number of attached link */
WORD csum_errors; /* csum errors */
WORD num_disconnects; /* number of disconnects */
WORD num_sync_rcvd; /* # sync's received */
WORD num_sync_rqst; /* # sync requests */
WORD num_tx; /* Num pkts sent */
WORD num_rx; /* Num pkts received */
WORD module_attached; /* Module tpyes of attached */
WORD led_timeout; /* LED timeout */
WORD first_port; /* First port to service */
WORD last_port; /* Last port to service */
u16 attached_link; /* Number of attached link */
u16 csum_errors; /* csum errors */
u16 num_disconnects; /* number of disconnects */
u16 num_sync_rcvd; /* # sync's received */
u16 num_sync_rqst; /* # sync requests */
u16 num_tx; /* Num pkts sent */
u16 num_rx; /* Num pkts received */
u16 module_attached; /* Module tpyes of attached */
u16 led_timeout; /* LED timeout */
u16 first_port; /* First port to service */
u16 last_port; /* Last port to service */
};

#endif
Expand Down
54 changes: 27 additions & 27 deletions trunk/drivers/char/rio/parmmap.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,39 +48,39 @@ typedef struct PARM_MAP PARM_MAP;

struct PARM_MAP {
PHB_ptr phb_ptr; /* Pointer to the PHB array */
WORD_ptr phb_num_ptr; /* Ptr to Number of PHB's */
u16 phb_num_ptr; /* Ptr to Number of PHB's */
FREE_LIST_ptr free_list; /* Free List pointer */
FREE_LIST_ptr free_list_end; /* Free List End pointer */
Q_BUF_ptr_ptr q_free_list_ptr; /* Ptr to Q_BUF variable */
BYTE_ptr unit_id_ptr; /* Unit Id */
u16 unit_id_ptr; /* Unit Id */
LPB_ptr link_str_ptr; /* Link Structure Array */
BYTE_ptr bootloader_1; /* 1st Stage Boot Loader */
BYTE_ptr bootloader_2; /* 2nd Stage Boot Loader */
WORD_ptr port_route_map_ptr; /* Port Route Map */
u16 bootloader_1; /* 1st Stage Boot Loader */
u16 bootloader_2; /* 2nd Stage Boot Loader */
u16 port_route_map_ptr; /* Port Route Map */
ROUTE_STR_ptr route_ptr; /* Unit Route Map */
NUMBER_ptr map_present; /* Route Map present */
NUMBER pkt_num; /* Total number of packets */
NUMBER q_num; /* Total number of Q packets */
WORD buffers_per_port; /* Number of buffers per port */
WORD heap_size; /* Initial size of heap */
WORD heap_left; /* Current Heap left */
WORD error; /* Error code */
WORD tx_max; /* Max number of tx pkts per phb */
WORD rx_max; /* Max number of rx pkts per phb */
WORD rx_limit; /* For high / low watermarks */
NUMBER links; /* Links to use */
NUMBER timer; /* Interrupts per second */
u16 map_present; /* Route Map present */
s16 pkt_num; /* Total number of packets */
s16 q_num; /* Total number of Q packets */
u16 buffers_per_port; /* Number of buffers per port */
u16 heap_size; /* Initial size of heap */
u16 heap_left; /* Current Heap left */
u16 error; /* Error code */
u16 tx_max; /* Max number of tx pkts per phb */
u16 rx_max; /* Max number of rx pkts per phb */
u16 rx_limit; /* For high / low watermarks */
s16 links; /* Links to use */
s16 timer; /* Interrupts per second */
RUP_ptr rups; /* Pointer to the RUPs */
WORD max_phb; /* Mostly for debugging */
WORD living; /* Just increments!! */
WORD init_done; /* Initialisation over */
WORD booting_link;
WORD idle_count; /* Idle time counter */
WORD busy_count; /* Busy counter */
WORD idle_control; /* Control Idle Process */
WORD tx_intr; /* TX interrupt pending */
WORD rx_intr; /* RX interrupt pending */
WORD rup_intr; /* RUP interrupt pending */
u16 max_phb; /* Mostly for debugging */
u16 living; /* Just increments!! */
u16 init_done; /* Initialisation over */
u16 booting_link;
u16 idle_count; /* Idle time counter */
u16 busy_count; /* Busy counter */
u16 idle_control; /* Control Idle Process */
u16 tx_intr; /* TX interrupt pending */
u16 rx_intr; /* RX interrupt pending */
u16 rup_intr; /* RUP interrupt pending */
};

#endif
Expand Down
Loading

0 comments on commit c9274cb

Please sign in to comment.