Skip to content
Extraits de code Groupes Projets
Valider 4e1ad518 rédigé par Etienne BRATEAU's avatar Etienne BRATEAU
Parcourir les fichiers

move some struct into appropriate files

parent d8f038d8
Branches
Étiquettes
Aucune requête de fusion associée trouvée
#ifndef GATE_H
#define GATE_H
#include <p2c/mylib.h>
#include <p2c/newasm.h>
#include "logdef.h"
typedef struct log_grec {
struct log_grec *next, *confnext;
na_long info;
log_nrec **pin;
log_pinposrec *pinpos;
log_gattrrec *attr;
na_long vars;
log_krec *kind;
short g, x, y, gc, sig;
na_long temp;
uchar rot;
unsigned conflict : 1, oconflict : 1, dimcolor : 1, conflict1 : 1,
conflict2 : 1, f2 : 1, f1 : 1, f0 : 1;
} log_grec; /* Gate */
void uaddgate(short x, short y, short gtype);
void addgate1(short x, short y, short gtype);
......
......@@ -2,6 +2,8 @@
#define LOG_ACTION_H
#include"logdef.h"
#include "gate.h"
#include "wire.h"
#include<limits.h>
typedef enum
......
......@@ -235,48 +235,6 @@ typedef struct log_hnrec {
struct log_hnrec *next;
} log_hnrec; /* History name */
typedef struct log_hwrec {
short x1, x2, y; /* Position of wire */
log_nrec *node; /* Node of wire */
struct log_hwrec *next; /* Next wire in list */
na_long temp;
uchar wcolr; /* Color of wire */
unsigned f7 : 1, f6 : 1, f5 : 1, f4 : 1, f3 : 1, f2 : 1, f1 : 1, f0 : 1;
} log_hwrec; /* Horizontal wire */
typedef struct log_vwrec {
short x, y1, y2; /* Position of wire */
log_nrec *node; /* Node of wire */
struct log_vwrec *next; /* Next wire in list */
na_long temp;
uchar wcolr; /* Color of wire */
unsigned f7 : 1, f6 : 1, f5 : 1, f4 : 1, f3 : 1, f2 : 1, f1 : 1, f0 : 1;
} log_vwrec; /* Vertical wire */
typedef struct log_srec {
short x, y; /* Position of solder point */
log_hwrec *hwire, *hwire2; /* Horizontal wire(s) being soldered */
log_vwrec *vwire, *vwire2; /* Vertical wire(s) being soldered */
struct log_srec *next; /* Next solder point in list */
na_long temp;
unsigned f7 : 1, f6 : 1, f5 : 1, f4 : 1, f3 : 1, f2 : 1, f1 : 1, f0 : 1;
} log_srec; /* Solder point */
typedef struct log_grec {
struct log_grec *next, *confnext;
na_long info;
log_nrec **pin;
log_pinposrec *pinpos;
log_gattrrec *attr;
na_long vars;
log_krec *kind;
short g, x, y, gc, sig;
na_long temp;
uchar rot;
unsigned conflict : 1, oconflict : 1, dimcolor : 1, conflict1 : 1,
conflict2 : 1, f2 : 1, f1 : 1, f0 : 1;
} log_grec; /* Gate */
typedef struct log_lrec {
short x, y, w;
char name[log_lablen + 1];
......
......@@ -3,6 +3,33 @@
#include "logdef.h"
typedef struct log_hwrec {
short x1, x2, y; /* Position of wire */
log_nrec *node; /* Node of wire */
struct log_hwrec *next; /* Next wire in list */
na_long temp;
uchar wcolr; /* Color of wire */
unsigned f7 : 1, f6 : 1, f5 : 1, f4 : 1, f3 : 1, f2 : 1, f1 : 1, f0 : 1;
} log_hwrec; /* Horizontal wire */
typedef struct log_vwrec {
short x, y1, y2; /* Position of wire */
log_nrec *node; /* Node of wire */
struct log_vwrec *next; /* Next wire in list */
na_long temp;
uchar wcolr; /* Color of wire */
unsigned f7 : 1, f6 : 1, f5 : 1, f4 : 1, f3 : 1, f2 : 1, f1 : 1, f0 : 1;
} log_vwrec; /* Vertical wire */
typedef struct log_srec {
short x, y; /* Position of solder point */
log_hwrec *hwire, *hwire2; /* Horizontal wire(s) being soldered */
log_vwrec *vwire, *vwire2; /* Vertical wire(s) being soldered */
struct log_srec *next; /* Next solder point in list */
na_long temp;
unsigned f7 : 1, f6 : 1, f5 : 1, f4 : 1, f3 : 1, f2 : 1, f1 : 1, f0 : 1;
} log_srec; /* Solder point */
void addvwire2(short x, short y1, short y2);
void addhwire2(short x1, short x2, short y);
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter