=================================================================== RCS file: /cvs/funnyos/sys/device.h,v retrieving revision 1.1.1.1 retrieving revision 1.3 diff -u -r1.1.1.1 -r1.3 --- funnyos/sys/device.h 2007/10/16 09:41:05 1.1.1.1 +++ funnyos/sys/device.h 2007/10/25 20:49:49 1.3 @@ -1,5 +1,5 @@ /* - * $Id: device.h,v 1.1.1.1 2007/10/16 08:41:05 init Exp $ + * $Id: device.h,v 1.3 2007/10/25 19:49:49 init Exp $ */ #ifndef _SYS_DEVICE_H #define _SYS_DEVICE_H @@ -32,7 +32,7 @@ /* * Associate actual driver with device name. */ - char di_dname[DVNAMELEN]; /* device name */ + char *di_dname; /* device name */ struct driver *di_driverp; /* pointer to driver */ int8_t di_ninstances; /* number of already created devices; for dv_minor */ }; @@ -43,19 +43,14 @@ * Attach hint. Describes where to attach particular device. * "child" at "parent" 0 loc 0x16000000 flags 0x00 */ - char ai_cname[DVNAMELEN]; /* child device name */ - char ai_pname[DVNAMELEN]; /* parent device name */ + char *ai_cname; /* child device name */ + char *ai_pname; /* parent device name */ uint8_t ai_pminor; /* parent minor */ uint32_t ai_locator; /* location on parent (0 - default) */ // uint8_t ai_intrno; /* interrupt line */ uint8_t ai_flags; /* flags passed to dr_attach() */ }; - - -#define ATTACH(x) devlist[x].dv_parent -#define AT = -#define PARENT(y) &devlist[y] #endif /* _SYS_DEVICE_H */