Index: boot/generic/src/inflate.c =================================================================== --- boot/generic/src/inflate.c (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ boot/generic/src/inflate.c (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -319,8 +319,15 @@ uint16_t *symbol) { - uint16_t code = 0; /* Decoded bits */ - size_t first = 0; /* First code of the given length */ - size_t index = 0; /* Index of the first code of the given length - in the symbol table */ + /* Decoded bits */ + uint16_t code = 0; + + /* First code of the given length */ + size_t first = 0; + + /* + * Index of the first code of the given length + * in the symbol table + */ + size_t index = 0; size_t len; /* Current number of bits in the code */ Index: kernel/arch/arm32/include/arch/cp15.h =================================================================== --- kernel/arch/arm32/include/arch/cp15.h (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ kernel/arch/arm32/include/arch/cp15.h (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -40,5 +40,6 @@ /** See ARM Architecture reference manual ch. B3.17.1 page B3-1456 - * for the list */ + * for the list + */ #define CONTROL_REG_GEN_READ(name, crn, opc1, crm, opc2) \ @@ -183,4 +184,6 @@ CCSIDR_LINESIZE_MASK = 0x7, CCSIDR_LINESIZE_SHIFT = 0, +}; + #define CCSIDR_SETS(val) \ (((val >> CCSIDR_NUMSETS_SHIFT) & CCSIDR_NUMSETS_MASK) + 1) @@ -190,5 +193,5 @@ #define CCSIDR_LINESIZE_LOG(val) \ (((val >> CCSIDR_LINESIZE_SHIFT) & CCSIDR_LINESIZE_MASK) + 2 + 2) -}; + CONTROL_REG_GEN_READ(CCSIDR, c0, 1, c0, 0); @@ -206,7 +209,9 @@ CLIDR_UNI_CACHE = 0x4, CLIDR_CACHE_MASK = 0x7, +}; + /** levels counted from 0 */ #define CLIDR_CACHE(level, val) ((val >> (level * 3)) & CLIDR_CACHE_MASK) -}; + CONTROL_REG_GEN_READ(CLIDR, c0, 1, c0, 1); CONTROL_REG_GEN_READ(AIDR, c0, 1, c0, 7); /* Implementation defined or MIDR */ @@ -225,6 +230,8 @@ /* System control registers */ -/* COntrol register bit values see ch. B4.1.130 of ARM Architecture Reference - * Manual ARMv7-A and ARMv7-R edition, page 1687 */ +/* + * Control register bit values see ch. B4.1.130 of ARM Architecture Reference + * Manual ARMv7-A and ARMv7-R edition, page 1687 + */ enum { SCTLR_MMU_EN_FLAG = 1 << 0, Index: kernel/arch/sparc64/include/arch/mm/sun4u/tsb.h =================================================================== --- kernel/arch/sparc64/include/arch/mm/sun4u/tsb.h (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ kernel/arch/sparc64/include/arch/mm/sun4u/tsb.h (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -66,13 +66,13 @@ uint64_t value; struct { - uint64_t base : 51; /**< TSB base address, bits 63:13. */ - unsigned split : 1; /**< Split vs. common TSB for 8K and 64K - * pages. HelenOS uses only 8K pages - * for user mappings, so we always set - * this to 0. - */ + /** TSB base address, bits 63:13. */ + uint64_t base : 51; + /** Split vs. common TSB for 8K and 64K pages. HelenOS uses + * only 8K pages for user mappings, so we always set this to 0. + */ + unsigned split : 1; unsigned : 9; - unsigned size : 3; /**< TSB size. Number of entries is - * 512 * 2^size. */ + /** TSB size. Number of entries is 512 * 2^size. */ + unsigned size : 3; } __attribute__((packed)); } tsb_base_reg_t; Index: kernel/arch/sparc64/include/arch/sun4u/cpu.h =================================================================== --- kernel/arch/sparc64/include/arch/sun4u/cpu.h (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ kernel/arch/sparc64/include/arch/sun4u/cpu.h (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -62,11 +62,13 @@ typedef struct { - uint32_t mid; /**< Processor ID as read from - UPA_CONFIG/FIREPLANE_CONFIG. */ + /** Processor ID as read from UPA_CONFIG/FIREPLANE_CONFIG. */ + uint32_t mid; ver_reg_t ver; - uint32_t clock_frequency; /**< Processor frequency in Hz. */ - uint64_t next_tick_cmpr; /**< Next clock interrupt should be - generated when the TICK register - matches this value. */ + /** Processor frequency in Hz. */ + uint32_t clock_frequency; + /** Next clock interrupt should be generated when the TICK register + * matches this value. + */ + uint64_t next_tick_cmpr; } cpu_arch_t; Index: kernel/arch/sparc64/include/arch/sun4v/cpu.h =================================================================== --- kernel/arch/sparc64/include/arch/sun4v/cpu.h (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ kernel/arch/sparc64/include/arch/sun4v/cpu.h (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -59,12 +59,16 @@ typedef struct cpu_arch { - uint64_t id; /**< virtual processor ID */ - uint32_t clock_frequency; /**< Processor frequency in Hz. */ - uint64_t next_tick_cmpr; /**< Next clock interrupt should be - generated when the TICK register - matches this value. */ - exec_unit_t *exec_unit; /**< Physical core. */ - unsigned long proposed_nrdy; /**< Proposed No. of ready threads - so that cores are equally balanced. */ + /** Virtual processor ID */ + uint64_t id; + /** Processor frequency in Hz */ + uint32_t clock_frequency; + /** Next clock interrupt should be generated when the TICK register + * matches this value. + */ + uint64_t next_tick_cmpr; + /** Physical core. */ + exec_unit_t *exec_unit; + /** Proposed No. of ready threads so that cores are equally balanced. */ + unsigned long proposed_nrdy; } cpu_arch_t; Index: kernel/arch/sparc64/src/mm/sun4u/tsb.c =================================================================== --- kernel/arch/sparc64/src/mm/sun4u/tsb.c (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ kernel/arch/sparc64/src/mm/sun4u/tsb.c (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -97,7 +97,6 @@ */ - tte->tag.invalid = true; /* invalidate the entry - * (tag target has this - * set to 0) */ + /* Invalidate the entry (tag target has this set to 0) */ + tte->tag.invalid = true; write_barrier(); @@ -142,7 +141,6 @@ */ - tte->tag.invalid = true; /* invalidate the entry - * (tag target has this - * set to 0) */ + /* Invalidate the entry (tag target has this set to 0) */ + tte->tag.invalid = true; write_barrier(); Index: kernel/arch/sparc64/src/sun4v/md.c =================================================================== --- kernel/arch/sparc64/src/sun4v/md.c (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ kernel/arch/sparc64/src/sun4v/md.c (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -66,10 +66,15 @@ /** machine description element (in the node block) */ typedef struct { - uint8_t tag; /**< Type of element */ - uint8_t name_len; /**< Length in bytes of element name */ - uint16_t _reserved_field; /**< reserved field (zeros) */ - uint32_t name_offset; /**< Location offset of name associated - with this element relative to - start of name block */ + /** Type of element */ + uint8_t tag; + /** Length in bytes of element name */ + uint8_t name_len; + /** Reserved field (zeros) */ + uint16_t _reserved_field; + /** Location offset of name associated with this element relative to + * start of name block + */ + uint32_t name_offset; + union { /** for elements of type “PROP_STR” and of type “PROP_DATA” */ Index: kernel/doc/doxygroups.h =================================================================== --- kernel/doc/doxygroups.h (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ kernel/doc/doxygroups.h (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -1,4 +1,7 @@ /* Definitions of modules and its relations for generating Doxygen documentation */ + +/** @defgroup kernel Kernel + */ /** @defgroup genericadt Data types @@ -14,74 +17,72 @@ */ -/** - * @defgroup time Time management - * @ingroup kernel - */ - -/** - * @defgroup proc Scheduling - * @ingroup kernel - */ - - /** @defgroup genericproc generic - * @ingroup proc - */ - - - /** - * @cond amd64 - * @defgroup amd64proc amd64 - * @ingroup proc - * @endcond - */ - - /** - * @cond arm32 - * @defgroup arm32proc arm32 - * @ingroup proc - * @endcond - */ - - /** - * @cond ia32 - * @defgroup ia32proc ia32 - * @ingroup proc - * @endcond - */ - - /** - * @cond ia64 - * @defgroup ia64proc ia64 - * @ingroup proc - * @endcond - */ - - /** - * @cond mips32 - * @defgroup mips32proc mips32 - * @ingroup proc - * @endcond - */ - - /** - * @cond ppc32 - * @defgroup ppc32proc ppc32 - * @ingroup proc - * @endcond - */ - - /** - * @cond ppc64 - * @defgroup ppc64proc ppc64 - * @ingroup proc - * @endcond - */ - - /** - * @cond sparc64 - * @defgroup sparc64proc sparc64 - * @ingroup proc - * @endcond - */ +/** @defgroup time Time management + * @ingroup kernel + */ + +/** @defgroup proc Scheduling + * @ingroup kernel + */ + +/** @defgroup genericproc generic + * @ingroup proc + */ + + +/** + * @cond amd64 + * @defgroup amd64proc amd64 + * @ingroup proc + * @endcond + */ + +/** + * @cond arm32 + * @defgroup arm32proc arm32 + * @ingroup proc + * @endcond + */ + +/** + * @cond ia32 + * @defgroup ia32proc ia32 + * @ingroup proc + * @endcond + */ + +/** + * @cond ia64 + * @defgroup ia64proc ia64 + * @ingroup proc + * @endcond + */ + +/** + * @cond mips32 + * @defgroup mips32proc mips32 + * @ingroup proc + * @endcond + */ + +/** + * @cond ppc32 + * @defgroup ppc32proc ppc32 + * @ingroup proc + * @endcond + */ + +/** + * @cond ppc64 + * @defgroup ppc64proc ppc64 + * @ingroup proc + * @endcond + */ + +/** + * @cond sparc64 + * @defgroup sparc64proc sparc64 + * @ingroup proc + * @endcond + */ @@ -91,73 +92,73 @@ - /** @defgroup mm Memory management - * @ingroup kernel - */ - - /** - * @defgroup genericmm generic - * @ingroup mm - */ - - /** - * @defgroup genarchmm genarch - * @ingroup mm - */ - - /** - * @cond amd64 - * @defgroup amd64mm amd64 - * @ingroup mm - * @endcond - */ - - /** - * @cond arm32 - * @defgroup arm32mm arm32 - * @ingroup mm - * @endcond - */ - - /** - * @cond ia32 - * @defgroup ia32mm ia32 - * @ingroup mm - * @endcond - */ - - /** - * @cond ia64 - * @defgroup ia64mm ia64 - * @ingroup mm - * @endcond - */ - - /** - * @cond mips32 - * @defgroup mips32mm mips32 - * @ingroup mm - * @endcond - */ - - /** - * @cond ppc32 - * @defgroup ppc32mm ppc32 - * @ingroup mm - * @endcond - */ - - /** - * @cond ppc64 - * @defgroup ppc64mm ppc64 - * @ingroup mm - * @endcond - */ - - /** - * @cond sparc64 - * @defgroup sparc64mm sparc64 - * @ingroup mm - * @endcond - */ +/** @defgroup mm Memory management + * @ingroup kernel + */ + +/** + * @defgroup genericmm generic + * @ingroup mm + */ + +/** + * @defgroup genarchmm genarch + * @ingroup mm + */ + +/** + * @cond amd64 + * @defgroup amd64mm amd64 + * @ingroup mm + * @endcond + */ + +/** + * @cond arm32 + * @defgroup arm32mm arm32 + * @ingroup mm + * @endcond + */ + +/** + * @cond ia32 + * @defgroup ia32mm ia32 + * @ingroup mm + * @endcond + */ + +/** + * @cond ia64 + * @defgroup ia64mm ia64 + * @ingroup mm + * @endcond + */ + +/** + * @cond mips32 + * @defgroup mips32mm mips32 + * @ingroup mm + * @endcond + */ + +/** + * @cond ppc32 + * @defgroup ppc32mm ppc32 + * @ingroup mm + * @endcond + */ + +/** + * @cond ppc64 + * @defgroup ppc64mm ppc64 + * @ingroup mm + * @endcond + */ + +/** + * @cond sparc64 + * @defgroup sparc64mm sparc64 + * @ingroup mm + * @endcond + */ @@ -177,191 +178,193 @@ */ - /** @defgroup genericddi generic - * @ingroup ddi - */ - - /** - * @cond amd64 - * @defgroup amd64ddi amd64 - * @ingroup ddi - * @endcond - */ - - /** - * @cond arm32 - * @defgroup arm32ddi arm32 - * @ingroup ddi - * @endcond - */ - - /** - * @cond ia32 - * @defgroup ia32ddi ia32 - * @ingroup ddi - * @endcond - */ - - /** - * @cond ia64 - * @defgroup ia64ddi ia64 - * @ingroup ddi - * @endcond - */ - - /** - * @cond mips32 - * @defgroup mips32ddi mips32 - * @ingroup ddi - * @endcond - */ - - /** - * @cond ppc32 - * @defgroup ppc32ddi ppc32 - * @ingroup ddi - * @endcond - */ - - /** - * @cond ppc64 - * @defgroup ppc64ddi ppc64 - * @ingroup ddi - * @endcond - */ - - /** - * @cond sparc64 - * @defgroup sparc64ddi sparc64 - * @ingroup ddi - * @endcond - */ - - /** @defgroup debug Debugging +/** + * @defgroup genericddi generic + * @ingroup ddi + */ + +/** + * @cond amd64 + * @defgroup amd64ddi amd64 + * @ingroup ddi + * @endcond + */ + +/** + * @cond arm32 + * @defgroup arm32ddi arm32 + * @ingroup ddi + * @endcond + */ + +/** + * @cond ia32 + * @defgroup ia32ddi ia32 + * @ingroup ddi + * @endcond + */ + +/** + * @cond ia64 + * @defgroup ia64ddi ia64 + * @ingroup ddi + * @endcond + */ + +/** + * @cond mips32 + * @defgroup mips32ddi mips32 + * @ingroup ddi + * @endcond + */ + +/** + * @cond ppc32 + * @defgroup ppc32ddi ppc32 + * @ingroup ddi + * @endcond + */ + +/** + * @cond ppc64 + * @defgroup ppc64ddi ppc64 + * @ingroup ddi + * @endcond + */ + +/** + * @cond sparc64 + * @defgroup sparc64ddi sparc64 + * @ingroup ddi + * @endcond + */ + +/** @defgroup debug Debugging * @ingroup others */ - /** @defgroup genericdebug generic - * @ingroup debug - */ - - /** - * @cond amd64 - * @defgroup amd64debug ia32/amd64 - * @ingroup debug - * @endcond - */ - - /** - * @cond arm32 - * @defgroup arm32debug arm32 - * @ingroup debug - * @endcond - */ - - /** - * @cond ia32 - * @defgroup amd64debug ia32/amd64 - * @ingroup debug - * @endcond - */ - - /** - * @cond ia64 - * @defgroup ia64debug ia64 - * @ingroup debug - * @endcond - */ - - /** - * @cond mips32 - * @defgroup mips32debug mips32 - * @ingroup debug - * @endcond - */ - - /** - * @cond ppc32 - * @defgroup ppc32debug ppc32 - * @ingroup debug - * @endcond - */ - - /** - * @cond ppc64 - * @defgroup ppc64debug ppc64 - * @ingroup debug - * @endcond - */ - - /** - * @cond sparc64 - * @defgroup sparc64debug sparc64 - * @ingroup debug - * @endcond - */ - - /** @defgroup interrupt Interrupt handling and dispatching - * @ingroup kernel - */ - /** - * @defgroup genericinterrupt generic - * @ingroup interrupt - */ - - /** - * @cond amd64 - * @defgroup amd64interrupt amd64 - * @ingroup interrupt - * @endcond - */ - - /** - * @cond arm32 - * @defgroup arm32interrupt arm32 - * @ingroup interrupt - * @endcond - */ - - /** - * @cond ia32 - * @defgroup ia32interrupt ia32 - * @ingroup interrupt - * @endcond - */ - - /** - * @cond ia64 - * @defgroup ia64interrupt ia64 - * @ingroup interrupt - * @endcond - */ - - /** - * @cond mips32 - * @defgroup mips32interrupt mips32 - * @ingroup interrupt - * @endcond - */ - - /** - * @cond ppc32 - * @defgroup ppc32interrupt ppc32 - * @ingroup interrupt - * @endcond - */ - - /** - * @cond ppc64 - * @defgroup ppc64interrupt ppc64 - * @ingroup interrupt - * @endcond - */ - - /** - * @cond sparc64 - * @defgroup sparc64interrupt sparc64 - * @ingroup interrupt - * @endcond - */ +/** + * @defgroup genericdebug generic + * @ingroup debug + */ + +/** + * @cond amd64 + * @defgroup amd64debug ia32/amd64 + * @ingroup debug + * @endcond + */ + +/** + * @cond arm32 + * @defgroup arm32debug arm32 + * @ingroup debug + * @endcond + */ + +/** + * @cond ia32 + * @defgroup amd64debug ia32/amd64 + * @ingroup debug + * @endcond + */ + +/** + * @cond ia64 + * @defgroup ia64debug ia64 + * @ingroup debug + * @endcond + */ + +/** + * @cond mips32 + * @defgroup mips32debug mips32 + * @ingroup debug + * @endcond + */ + +/** + * @cond ppc32 + * @defgroup ppc32debug ppc32 + * @ingroup debug + * @endcond + */ + +/** + * @cond ppc64 + * @defgroup ppc64debug ppc64 + * @ingroup debug + * @endcond + */ + +/** + * @cond sparc64 + * @defgroup sparc64debug sparc64 + * @ingroup debug + * @endcond + */ + +/** @defgroup interrupt Interrupt handling and dispatching + * @ingroup kernel + */ +/** + * @defgroup genericinterrupt generic + * @ingroup interrupt + */ + +/** + * @cond amd64 + * @defgroup amd64interrupt amd64 + * @ingroup interrupt + * @endcond + */ + +/** + * @cond arm32 + * @defgroup arm32interrupt arm32 + * @ingroup interrupt + * @endcond + */ + +/** + * @cond ia32 + * @defgroup ia32interrupt ia32 + * @ingroup interrupt + * @endcond + */ + +/** + * @cond ia64 + * @defgroup ia64interrupt ia64 + * @ingroup interrupt + * @endcond + */ + +/** + * @cond mips32 + * @defgroup mips32interrupt mips32 + * @ingroup interrupt + * @endcond + */ + +/** + * @cond ppc32 + * @defgroup ppc32interrupt ppc32 + * @ingroup interrupt + * @endcond + */ + +/** + * @cond ppc64 + * @defgroup ppc64interrupt ppc64 + * @ingroup interrupt + * @endcond + */ + +/** + * @cond sparc64 + * @defgroup sparc64interrupt sparc64 + * @ingroup interrupt + * @endcond + */ @@ -369,65 +372,68 @@ * @ingroup kernel */ - /** @defgroup generic generic - * @ingroup others - */ - - /** @defgroup genarch genarch - * @ingroup others - */ - - /** - * @cond amd64 - * @defgroup amd64 amd64 - * @ingroup others - * @endcond - */ - - /** - * @cond arm32 - * @defgroup arm32 arm32 - * @ingroup others - * @endcond - */ - - /** - * @cond ia32 - * @defgroup ia32 ia32 - * @ingroup others - * @endcond - */ - - /** - * @cond ia64 - * @defgroup ia64 ia64 - * @ingroup others - * @endcond - */ - - /** - * @cond mips32 - * @defgroup mips32 mips32 - * @ingroup others - * @endcond - */ - - /** - * @cond ppc32 - * @defgroup ppc32 ppc32 - * @ingroup others - * @endcond - */ - - /** - * @cond ppc64 - * @defgroup ppc64 ppc64 - * @ingroup others - * @endcond - */ - - /** - * @cond sparc64 - * @defgroup sparc64 sparc64 - * @ingroup others - * @endcond - */ + +/** + * @defgroup generic generic + * @ingroup others + */ + +/** + * @defgroup genarch genarch + * @ingroup others + */ + +/** + * @cond amd64 + * @defgroup amd64 amd64 + * @ingroup others + * @endcond + */ + +/** + * @cond arm32 + * @defgroup arm32 arm32 + * @ingroup others + * @endcond + */ + +/** + * @cond ia32 + * @defgroup ia32 ia32 + * @ingroup others + * @endcond + */ + +/** + * @cond ia64 + * @defgroup ia64 ia64 + * @ingroup others + * @endcond + */ + +/** + * @cond mips32 + * @defgroup mips32 mips32 + * @ingroup others + * @endcond + */ + +/** + * @cond ppc32 + * @defgroup ppc32 ppc32 + * @ingroup others + * @endcond + */ + +/** + * @cond ppc64 + * @defgroup ppc64 ppc64 + * @ingroup others + * @endcond + */ + +/** + * @cond sparc64 + * @defgroup sparc64 sparc64 + * @ingroup others + * @endcond + */ Index: kernel/genarch/include/genarch/drivers/omap/irc.h =================================================================== --- kernel/genarch/include/genarch/drivers/omap/irc.h (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ kernel/genarch/include/genarch/drivers/omap/irc.h (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -50,5 +50,6 @@ const uint8_t padd0[12]; - /* This register controls the various parameters + /* + * This register controls the various parameters * of the OCP interface. */ @@ -78,5 +79,6 @@ #define OMAP_IRC_CONTROL_NEWFIQAGR_FLAG (1 << 1) - /* This register controls protection of the other registers. + /* + * This register controls protection of the other registers. * This register can only be accessed in priviledged mode, regardless * of the current value of the protection bit. @@ -85,5 +87,6 @@ #define OMAP_IRC_PROTECTION_FLAG (1 << 0) - /* This register controls the clock auto-idle for the functional + /* + * This register controls the clock auto-idle for the functional * clock and the input synchronizers. */ @@ -119,15 +122,18 @@ ioport32_t mir; - /* This register is used to clear the interrupt mask bits, + /* + * This register is used to clear the interrupt mask bits, * Write 1 clears the mask bit to 0. */ ioport32_t mir_clear; - /* This register is used to set the interrupt mask bits, + /* + * This register is used to set the interrupt mask bits, * Write 1 sets the mask bit to 1. */ ioport32_t mir_set; - /* This register is used to set the software interrupt bits, + /* + * This register is used to set the software interrupt bits, * it is also used to read the current active software * interrupts. @@ -136,5 +142,6 @@ ioport32_t isr_set; - /* This register is used to clear the software interrups bits. + /* + * This register is used to clear the software interrups bits. * Write 1 clears the software interrupt bits to 0. */ @@ -150,8 +157,12 @@ const uint32_t padd4[8 * OMAP_IRC_IRQ_GROUPS_PAD]; - /* These registers contain the priority for the interrups and + /* + * These registers contain the priority for the interrups and * the FIQ/IRQ steering. */ ioport32_t ilr[OMAP_IRC_IRQ_COUNT]; + +} omap_irc_regs_t; + /* 0 = Interrupt routed to IRQ, 1 = interrupt routed to FIQ */ #define OMAP_IRC_ILR_FIQNIRQ_FLAG (1 << 0) @@ -159,6 +170,4 @@ #define OMAP_IRC_ILR_PRIORITY_SHIFT 2 -} omap_irc_regs_t; - static inline void omap_irc_init(omap_irc_regs_t *regs) { @@ -167,10 +176,12 @@ /* Initialization sequence */ - /* 1 - Program the SYSCONFIG register: if necessary, enable the + /* + * 1 - Program the SYSCONFIG register: if necessary, enable the * autogating by setting the AUTOIDLE bit. */ regs->sysconfig &= ~OMAP_IRC_SYSCONFIG_AUTOIDLE_FLAG; - /* 2 - Program the IDLE register: if necessary, disable functional + /* + * 2 - Program the IDLE register: if necessary, disable functional * clock autogating or enable synchronizer autogating by setting * the FUNCIDLE bit or the TURBO bit accordingly. @@ -179,5 +190,6 @@ regs->idle &= ~OMAP_IRC_IDLE_TURBO_FLAG; - /* 3 - Program ILRm register for each interrupt line: Assign a + /* + * 3 - Program ILRm register for each interrupt line: Assign a * priority level and set the FIQNIRQ bit for an FIQ interrupt * (by default, interrupts are mapped to IRQ and @@ -188,5 +200,6 @@ regs->ilr[i] = 0; - /* 4 - Program the MIRn register: Enable interrupts (by default, + /* + * 4 - Program the MIRn register: Enable interrupts (by default, * all interrupt lines are masked). */ Index: kernel/generic/include/ddi/ddi.h =================================================================== --- kernel/generic/include/ddi/ddi.h (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ kernel/generic/include/ddi/ddi.h (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -43,11 +43,15 @@ /** Structure representing contiguous physical memory area. */ typedef struct { - link_t link; /**< Linked list link */ + /** Linked list link */ + link_t link; - uintptr_t pbase; /**< Physical base of the area. */ - pfn_t frames; /**< Number of frames in the area. */ - bool unpriv; /**< Allow mapping by unprivileged tasks. */ - bool mapped; /**< Indicate whether the area is actually - mapped. */ + /** Physical base of the area. */ + uintptr_t pbase; + /** Number of frames in the area. */ + pfn_t frames; + /** Allow mapping by unprivileged tasks. */ + bool unpriv; + /** Indicate whether the area is actually mapped. */ + bool mapped; } parea_t; Index: uspace/app/mkfat/fat.h =================================================================== --- uspace/app/mkfat/fat.h (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/app/mkfat/fat.h (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -51,20 +51,34 @@ typedef struct fat_bs { - uint8_t ji[3]; /**< Jump instruction. */ + /** Jump instruction */ + uint8_t ji[3]; uint8_t oem_name[8]; + /* BIOS Parameter Block */ - uint16_t bps; /**< Bytes per sector. */ - uint8_t spc; /**< Sectors per cluster. */ - uint16_t rscnt; /**< Reserved sector count. */ - uint8_t fatcnt; /**< Number of FATs. */ - uint16_t root_ent_max; /**< Maximum number of root directory - entries. */ - uint16_t totsec16; /**< Total sectors. 16-bit version. */ - uint8_t mdesc; /**< Media descriptor. */ - uint16_t sec_per_fat; /**< Sectors per FAT12/FAT16. */ - uint16_t sec_per_track; /**< Sectors per track. */ - uint16_t headcnt; /**< Number of heads. */ - uint32_t hidden_sec; /**< Hidden sectors. */ - uint32_t totsec32; /**< Total sectors. 32-bit version. */ + + /** Bytes per sector */ + uint16_t bps; + /** Sectors per cluster */ + uint8_t spc; + /** Reserved sector count */ + uint16_t rscnt; + /** Number of FATs */ + uint8_t fatcnt; + /** Maximum number of root directory entries */ + uint16_t root_ent_max; + /** Total sectors. 16-bit version */ + uint16_t totsec16; + /** Media descriptor */ + uint8_t mdesc; + /** Sectors per FAT12/FAT16 */ + uint16_t sec_per_fat; + /** Sectors per track */ + uint16_t sec_per_track; + /** Number of heads */ + uint16_t headcnt; + /** Hidden sectors */ + uint32_t hidden_sec; + /** Total sectors. 32-bit version */ + uint32_t totsec32; union { Index: uspace/app/mkmfs/mkmfs.c =================================================================== --- uspace/app/mkmfs/mkmfs.c (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/app/mkmfs/mkmfs.c (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -98,11 +98,11 @@ static struct option const long_options[] = { - { "help", no_argument, 0, 'h' }, - { "long-names", no_argument, 0, 'l' }, - { "block-size", required_argument, 0, 'b' }, - { "inodes", required_argument, 0, 'i' }, - { NULL, no_argument, 0, '1' }, - { NULL, no_argument, 0, '2' }, - { 0, 0, 0, 0 } + { "help", no_argument, 0, 'h' }, + { "long-names", no_argument, 0, 'l' }, + { "block-size", required_argument, 0, 'b' }, + { "inodes", required_argument, 0, 'i' }, + { NULL, no_argument, 0, '1' }, + { NULL, no_argument, 0, '2' }, + { 0, 0, 0, 0 } }; @@ -495,5 +495,5 @@ if (sb->fs_version == 3) { - if(INT32_MAX / sb->block_size < zones) + if (INT32_MAX / sb->block_size < zones) sb->max_file_size = INT32_MAX; sb->ino_per_block = V3_INODES_PER_BLOCK(sb->block_size); @@ -730,5 +730,5 @@ { if (level == HELP_SHORT) { - printf(NAME": tool to create new Minix file systems\n"); + printf(NAME ": tool to create new Minix file systems\n"); } else { printf("Usage: [options] device\n" @@ -737,7 +737,7 @@ "-b ## Specify the block size in bytes (V3 only),\n" " valid block size values are 1024, 2048 and" - " 4096 bytes per block\n" + /* ... */ " 4096 bytes per block\n" "-i ## Specify the number of inodes" - " for the filesystem\n" + /* ... */ " for the filesystem\n" "-l Use 30-char long filenames (V1/V2 only)\n"); } Index: uspace/app/sbi/src/builtin/bi_error.c =================================================================== --- uspace/app/sbi/src/builtin/bi_error.c (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/app/sbi/src/builtin/bi_error.c (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -48,15 +48,16 @@ builtin_code_snippet(bi, - "class Error is\n" - /* Common ancestor of all error classes */ - "class Base is\n" - "end\n" - /* Accessing nil reference */ - "class NilReference : Base is\n" - "end\n" - /* Array index out of bounds */ - "class OutOfBounds : Base is\n" - "end\n" - "end\n");} + "class Error is\n" + " -- Common ancestor of all error classes\n" + " class Base is\n" + " end\n" + " -- Accessing nil reference\n" + " class NilReference : Base is\n" + " end\n" + " -- Array index out of bounds\n" + " class OutOfBounds : Base is\n" + " end\n" + "end\n"); +} /** Bind error class hierarchy. Index: uspace/app/sbi/src/builtin/bi_textfile.c =================================================================== --- uspace/app/sbi/src/builtin/bi_textfile.c (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/app/sbi/src/builtin/bi_textfile.c (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -62,21 +62,21 @@ builtin_code_snippet(bi, - "class TextFile is\n" - "var f : resource;\n" - "\n" - "fun OpenRead(fname : string), builtin;\n" - "fun OpenWrite(fname : string), builtin;\n" - "fun Close(), builtin;\n" - "fun ReadLine() : string, builtin;\n" - "fun WriteLine(line : string), builtin;\n" - "\n" - "prop EOF : bool is\n" - "get is\n" - "return is_eof();\n" - "end\n" - "end\n" - "\n" - "fun is_eof() : bool, builtin;\n" - "end\n"); + "class TextFile is\n" + " var f : resource;\n" + "\n" + " fun OpenRead(fname : string), builtin;\n" + " fun OpenWrite(fname : string), builtin;\n" + " fun Close(), builtin;\n" + " fun ReadLine() : string, builtin;\n" + " fun WriteLine(line : string), builtin;\n" + "\n" + " prop EOF : bool is\n" + " get is\n" + " return is_eof();\n" + " end\n" + " end\n" + "\n" + " fun is_eof() : bool, builtin;\n" + "end\n"); } @@ -189,5 +189,5 @@ { FILE *file; - rdata_var_t *self_f_var; + rdata_var_t *self_f_var; run_proc_ar_t *proc_ar; @@ -227,5 +227,5 @@ { FILE *file; - rdata_var_t *self_f_var; + rdata_var_t *self_f_var; rdata_string_t *str; @@ -297,5 +297,5 @@ { FILE *file; - rdata_var_t *self_f_var; + rdata_var_t *self_f_var; rdata_var_t *line_var; const char *line; @@ -340,5 +340,5 @@ { FILE *file; - rdata_var_t *self_f_var; + rdata_var_t *self_f_var; bool_t eof_flag; Index: uspace/app/trace/syscalls.c =================================================================== --- uspace/app/trace/syscalls.c (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/app/trace/syscalls.c (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -38,49 +38,49 @@ const sc_desc_t syscall_desc[] = { - [SYS_KIO] ={ "kio", 3, V_INT_ERRNO }, + [SYS_KIO] = { "kio", 3, V_INT_ERRNO }, - [SYS_THREAD_CREATE] = { "thread_create", 3, V_ERRNO }, - [SYS_THREAD_EXIT] = { "thread_exit", 1, V_ERRNO }, - [SYS_THREAD_GET_ID] = { "thread_get_id", 1, V_ERRNO }, + [SYS_THREAD_CREATE] = { "thread_create", 3, V_ERRNO }, + [SYS_THREAD_EXIT] = { "thread_exit", 1, V_ERRNO }, + [SYS_THREAD_GET_ID] = { "thread_get_id", 1, V_ERRNO }, - [SYS_TASK_GET_ID] = { "task_get_id", 1, V_ERRNO }, - [SYS_TASK_SET_NAME] = { "task_set_name", 2, V_ERRNO }, - [SYS_FUTEX_SLEEP] = { "futex_sleep_timeout", 3, V_ERRNO }, - [SYS_FUTEX_WAKEUP] = { "futex_wakeup", 1, V_ERRNO }, + [SYS_TASK_GET_ID] = { "task_get_id", 1, V_ERRNO }, + [SYS_TASK_SET_NAME] = { "task_set_name", 2, V_ERRNO }, + [SYS_FUTEX_SLEEP] = { "futex_sleep_timeout", 3, V_ERRNO }, + [SYS_FUTEX_WAKEUP] = { "futex_wakeup", 1, V_ERRNO }, - [SYS_AS_AREA_CREATE] = { "as_area_create", 5, V_ERRNO }, - [SYS_AS_AREA_RESIZE] = { "as_area_resize", 3, V_ERRNO }, - [SYS_AS_AREA_DESTROY] = { "as_area_destroy", 1, V_ERRNO }, + [SYS_AS_AREA_CREATE] = { "as_area_create", 5, V_ERRNO }, + [SYS_AS_AREA_RESIZE] = { "as_area_resize", 3, V_ERRNO }, + [SYS_AS_AREA_DESTROY] = { "as_area_destroy", 1, V_ERRNO }, - [SYS_IPC_CALL_ASYNC_FAST] = { "ipc_call_async_fast", 6, V_HASH }, - [SYS_IPC_CALL_ASYNC_SLOW] = { "ipc_call_async_slow", 3, V_HASH }, + [SYS_IPC_CALL_ASYNC_FAST] = { "ipc_call_async_fast", 6, V_HASH }, + [SYS_IPC_CALL_ASYNC_SLOW] = { "ipc_call_async_slow", 3, V_HASH }, - [SYS_IPC_ANSWER_FAST] = { "ipc_answer_fast", 6, V_ERRNO }, - [SYS_IPC_ANSWER_SLOW] = { "ipc_answer_slow", 2, V_ERRNO }, - [SYS_IPC_FORWARD_FAST] = { "ipc_forward_fast", 6, V_ERRNO }, - [SYS_IPC_FORWARD_SLOW] = { "ipc_forward_slow", 3, V_ERRNO }, - [SYS_IPC_WAIT] = { "ipc_wait_for_call", 3, V_HASH }, - [SYS_IPC_POKE] = { "ipc_poke", 0, V_ERRNO }, - [SYS_IPC_HANGUP] = { "ipc_hangup", 1, V_ERRNO }, + [SYS_IPC_ANSWER_FAST] = { "ipc_answer_fast", 6, V_ERRNO }, + [SYS_IPC_ANSWER_SLOW] = { "ipc_answer_slow", 2, V_ERRNO }, + [SYS_IPC_FORWARD_FAST] = { "ipc_forward_fast", 6, V_ERRNO }, + [SYS_IPC_FORWARD_SLOW] = { "ipc_forward_slow", 3, V_ERRNO }, + [SYS_IPC_WAIT] = { "ipc_wait_for_call", 3, V_HASH }, + [SYS_IPC_POKE] = { "ipc_poke", 0, V_ERRNO }, + [SYS_IPC_HANGUP] = { "ipc_hangup", 1, V_ERRNO }, - [SYS_IPC_EVENT_SUBSCRIBE] = { "ipc_event_subscribe", 2, V_ERRNO }, - [SYS_IPC_EVENT_UNSUBSCRIBE] = { "ipc_event_unsubscribe", 1, V_ERRNO }, - [SYS_IPC_EVENT_UNMASK] = { "ipc_event_unmask", 1, V_ERRNO }, + [SYS_IPC_EVENT_SUBSCRIBE] = { "ipc_event_subscribe", 2, V_ERRNO }, + [SYS_IPC_EVENT_UNSUBSCRIBE] = { "ipc_event_unsubscribe", 1, V_ERRNO }, + [SYS_IPC_EVENT_UNMASK] = { "ipc_event_unmask", 1, V_ERRNO }, - [SYS_PERM_GRANT] = { "perm_grant", 2, V_ERRNO }, - [SYS_PERM_REVOKE] = { "perm_revoke", 2, V_ERRNO }, - [SYS_PHYSMEM_MAP] = { "physmem_map", 4, V_ERRNO }, - [SYS_IOSPACE_ENABLE] = { "iospace_enable", 1, V_ERRNO }, + [SYS_PERM_GRANT] = { "perm_grant", 2, V_ERRNO }, + [SYS_PERM_REVOKE] = { "perm_revoke", 2, V_ERRNO }, + [SYS_PHYSMEM_MAP] = { "physmem_map", 4, V_ERRNO }, + [SYS_IOSPACE_ENABLE] = { "iospace_enable", 1, V_ERRNO }, - [SYS_IPC_IRQ_SUBSCRIBE] = { "ipc_irq_subscribe", 4, V_ERRNO }, - [SYS_IPC_IRQ_UNSUBSCRIBE] = { "ipc_irq_unsubscribe", 2, V_ERRNO }, + [SYS_IPC_IRQ_SUBSCRIBE] = { "ipc_irq_subscribe", 4, V_ERRNO }, + [SYS_IPC_IRQ_UNSUBSCRIBE] = { "ipc_irq_unsubscribe", 2, V_ERRNO }, - [SYS_SYSINFO_GET_VAL_TYPE] = { "sysinfo_get_val_type", 2, V_INTEGER }, - [SYS_SYSINFO_GET_VALUE] = { "sysinfo_get_value", 3, V_ERRNO }, - [SYS_SYSINFO_GET_DATA_SIZE] = { "sysinfo_get_data_size", 3, V_ERRNO }, - [SYS_SYSINFO_GET_DATA] = { "sysinfo_get_data", 5, V_ERRNO }, + [SYS_SYSINFO_GET_VAL_TYPE] = { "sysinfo_get_val_type", 2, V_INTEGER }, + [SYS_SYSINFO_GET_VALUE] = { "sysinfo_get_value", 3, V_ERRNO }, + [SYS_SYSINFO_GET_DATA_SIZE] = { "sysinfo_get_data_size", 3, V_ERRNO }, + [SYS_SYSINFO_GET_DATA] = { "sysinfo_get_data", 5, V_ERRNO }, - [SYS_DEBUG_CONSOLE] = { "debug_console", 0, V_ERRNO }, - [SYS_IPC_CONNECT_KBOX] = { "ipc_connect_kbox", 1, V_ERRNO } + [SYS_DEBUG_CONSOLE] = { "debug_console", 0, V_ERRNO }, + [SYS_IPC_CONNECT_KBOX] = { "ipc_connect_kbox", 1, V_ERRNO } }; Index: uspace/app/vuhid/hids/bootkbd.c =================================================================== --- uspace/app/vuhid/hids/bootkbd.c (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/app/vuhid/hids/bootkbd.c (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -45,37 +45,39 @@ USAGE1(USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYBOARD), START_COLLECTION(COLLECTION_APPLICATION), - STD_USAGE_PAGE(USB_HIDUT_PAGE_KEYBOARD), - USAGE_MINIMUM1(224), - USAGE_MAXIMUM1(231), - LOGICAL_MINIMUM1(0), - LOGICAL_MAXIMUM1(1), - REPORT_SIZE1(1), - REPORT_COUNT1(8), - /* Modifiers */ - INPUT(IOF_DATA | IOF_VARIABLE | IOF_ABSOLUTE), - REPORT_COUNT1(1), - REPORT_SIZE1(8), - /* Reserved */ - INPUT(IOF_CONSTANT), - REPORT_COUNT1(5), - REPORT_SIZE1(1), - STD_USAGE_PAGE(USB_HIDUT_PAGE_LED), - USAGE_MINIMUM1(1), - USAGE_MAXIMUM1(5), - /* LED states */ - OUTPUT(IOF_DATA | IOF_VARIABLE | IOF_ABSOLUTE), - REPORT_COUNT1(1), - REPORT_SIZE1(3), - /* LED states padding */ - OUTPUT(IOF_CONSTANT), - REPORT_COUNT1(6), - REPORT_SIZE1(8), - LOGICAL_MINIMUM1(0), - LOGICAL_MAXIMUM1(101), - STD_USAGE_PAGE(USB_HIDUT_PAGE_KEYBOARD), - USAGE_MINIMUM1(0), - USAGE_MAXIMUM1(101), - /* Key array */ - INPUT(IOF_DATA | IOF_ARRAY), + + STD_USAGE_PAGE(USB_HIDUT_PAGE_KEYBOARD), + USAGE_MINIMUM1(224), + USAGE_MAXIMUM1(231), + LOGICAL_MINIMUM1(0), + LOGICAL_MAXIMUM1(1), + REPORT_SIZE1(1), + REPORT_COUNT1(8), + /* Modifiers */ + INPUT(IOF_DATA | IOF_VARIABLE | IOF_ABSOLUTE), + REPORT_COUNT1(1), + REPORT_SIZE1(8), + /* Reserved */ + INPUT(IOF_CONSTANT), + REPORT_COUNT1(5), + REPORT_SIZE1(1), + STD_USAGE_PAGE(USB_HIDUT_PAGE_LED), + USAGE_MINIMUM1(1), + USAGE_MAXIMUM1(5), + /* LED states */ + OUTPUT(IOF_DATA | IOF_VARIABLE | IOF_ABSOLUTE), + REPORT_COUNT1(1), + REPORT_SIZE1(3), + /* LED states padding */ + OUTPUT(IOF_CONSTANT), + REPORT_COUNT1(6), + REPORT_SIZE1(8), + LOGICAL_MINIMUM1(0), + LOGICAL_MAXIMUM1(101), + STD_USAGE_PAGE(USB_HIDUT_PAGE_KEYBOARD), + USAGE_MINIMUM1(0), + USAGE_MAXIMUM1(101), + /* Key array */ + INPUT(IOF_DATA | IOF_ARRAY), + END_COLLECTION() }; @@ -84,16 +86,16 @@ static uint8_t in_data[] = { - 0, 0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0, 0, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, // Caps Lock - 0, 0, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, // Num Lock - 0, 0, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, // Caps Lock + 0, 0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0, 0, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, // Caps Lock + 0, 0, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, // Num Lock + 0, 0, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, // Caps Lock 1 << 2, 0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1 << 2, 0, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 1 << 2, 0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0, 0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + 0, 0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static vuhid_interface_life_t boot_life = { .data_in = in_data, - .data_in_count = sizeof(in_data)/INPUT_SIZE, + .data_in_count = sizeof(in_data) / INPUT_SIZE, .data_in_pos_change_delay = 500, .msg_born = "Boot keyboard comes to life...", Index: uspace/doc/doxygroups.h =================================================================== --- uspace/doc/doxygroups.h (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/doc/doxygroups.h (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -7,147 +7,147 @@ */ - /** - * @defgroup ns Naming Service - * @ingroup srvcs - */ - - /** - * @defgroup kbd Keyboard Service - * @ingroup srvcs - */ - - /** - * @defgroup fbs Framebuffer Service - * @ingroup srvcs - */ - - /** - * @defgroup console Console Service - * @ingroup srvcs - */ - - /** - * @defgroup net Networking Stack - * @ingroup srvcs - */ - - /** - * @defgroup nic Network interface controllers - * @ingroup net - */ - - /** - * @defgroup libnic Base NIC framework library - * @ingroup nic - */ - - /** - * @defgroup nic_drivers Drivers using the NICF - * @ingroup nic - */ - - /** - * @defgroup net_nil Network interface layer - * @ingroup net - */ - - /** - * @defgroup eth Ethernet (IEEE 802.3) network interface layer Service - * @ingroup net_nil - */ - - /** - * @defgroup nildummy Dummy network interface layer Service - * @ingroup net_nil - */ - - /** - * @defgroup net_il Inter-networking layer - * @ingroup net - */ - - /** - * @defgroup arp Address Resolution Protocol (ARP) Service - * @ingroup net_il - */ - - /** - * @defgroup ip Internet Protocol (IP) Service - * @ingroup net_il - */ - - /** - * @defgroup net_tl Transport layer - * @ingroup net - */ - - /** - * @defgroup icmp Internet Control Message Protocol (ICMP) Service - * @ingroup net_tl - */ - - /** - * @defgroup udp User Datagram Protocol (UDP) Service - * @ingroup net_tl - */ - - /** - * @defgroup tcp Transmission Control Protocol (TCP) Service - * @ingroup net_tl - */ - - /** - * @defgroup packet Packet management system - * @ingroup net - */ - - /** - * @defgroup net_app Applications - * @ingroup net - */ - - /** - * @defgroup echo Echo Service - * @ingroup net_app - */ - - /** - * @defgroup ping Ping - * @ingroup net_app - */ - - /** - * @defgroup nettest Networking tests - * @ingroup net_app - */ - - /** - * @defgroup net_lib Application library - * @ingroup net - */ - - /** - * @defgroup socket Sockets - * @ingroup net_lib - */ - - /** - * @defgroup netdb Netdb - * @ingroup net_lib - */ - - /** - * @cond amd64 - * @defgroup pci PCI Service - * @ingroup srvcs - * @endcond - */ - - /** - * @cond ia32 - * @defgroup pci PCI Service - * @ingroup srvcs - * @endcond - */ +/** + * @defgroup ns Naming Service + * @ingroup srvcs + */ + +/** + * @defgroup kbd Keyboard Service + * @ingroup srvcs + */ + +/** + * @defgroup fbs Framebuffer Service + * @ingroup srvcs + */ + +/** + * @defgroup console Console Service + * @ingroup srvcs + */ + +/** + * @defgroup net Networking Stack + * @ingroup srvcs + */ + +/** + * @defgroup nic Network interface controllers + * @ingroup net + */ + +/** + * @defgroup libnic Base NIC framework library + * @ingroup nic + */ + +/** + * @defgroup nic_drivers Drivers using the NICF + * @ingroup nic + */ + +/** + * @defgroup net_nil Network interface layer + * @ingroup net + */ + +/** + * @defgroup eth Ethernet (IEEE 802.3) network interface layer Service + * @ingroup net_nil + */ + +/** + * @defgroup nildummy Dummy network interface layer Service + * @ingroup net_nil + */ + +/** + * @defgroup net_il Inter-networking layer + * @ingroup net + */ + +/** + * @defgroup arp Address Resolution Protocol (ARP) Service + * @ingroup net_il + */ + +/** + * @defgroup ip Internet Protocol (IP) Service + * @ingroup net_il + */ + +/** + * @defgroup net_tl Transport layer + * @ingroup net + */ + +/** + * @defgroup icmp Internet Control Message Protocol (ICMP) Service + * @ingroup net_tl + */ + +/** + * @defgroup udp User Datagram Protocol (UDP) Service + * @ingroup net_tl + */ + +/** + * @defgroup tcp Transmission Control Protocol (TCP) Service + * @ingroup net_tl + */ + +/** + * @defgroup packet Packet management system + * @ingroup net + */ + +/** + * @defgroup net_app Applications + * @ingroup net + */ + +/** + * @defgroup echo Echo Service + * @ingroup net_app + */ + +/** + * @defgroup ping Ping + * @ingroup net_app + */ + +/** + * @defgroup nettest Networking tests + * @ingroup net_app + */ + +/** + * @defgroup net_lib Application library + * @ingroup net + */ + +/** + * @defgroup socket Sockets + * @ingroup net_lib + */ + +/** + * @defgroup netdb Netdb + * @ingroup net_lib + */ + +/** + * @cond amd64 + * @defgroup pci PCI Service + * @ingroup srvcs + * @endcond + */ + +/** + * @cond ia32 + * @defgroup pci PCI Service + * @ingroup srvcs + * @endcond + */ /** @@ -156,13 +156,13 @@ */ - /** - * @defgroup sfl Softloat - * @ingroup emul - */ - - /** - * @defgroup softint Softint - * @ingroup emul - */ +/** + * @defgroup sfl Softloat + * @ingroup emul + */ + +/** + * @defgroup softint Softint + * @ingroup emul + */ /** @@ -171,139 +171,137 @@ * @brief USB support for HelenOS. */ - /** - * @defgroup libusb Base USB library - * @ingroup usb - * @brief Common definitions for any driver or application - * dealing with USB. - */ - - /** - * @defgroup libusbdev USB library for device drivers - * @ingroup usb - * @brief Library for writing drivers of endpoint devices (functions). - */ - - /** - * @defgroup libusbhost USB library for host controller drivers - * @ingroup usb - * @brief Library for writing host controller drivers. - */ - - /** - * @defgroup libusbhid USB library for HID devices - * @ingroup usb - * @brief Library for writing USB HID drivers. - */ - - /** - * @defgroup usbvirt USB virtualization - * @ingroup usb - * @brief Support for virtual USB devices. - */ - - /** - * @defgroup libusbvirt USB virtualization library - * @ingroup usbvirt - * @brief Library for creating virtual USB devices. - */ - - /** - * @defgroup drvusbvhc Virtual USB host controller - * @ingroup usbvirt - * @brief Driver simulating work of USB host controller. - */ - - /** - * @defgroup usbvirthub Virtual USB hub - * @ingroup usbvirt - * @brief Extra virtual USB hub for virtual host controller. - * @details - * Some of the sources are shared with virtual host controller, - * see @ref drvusbvhc for the rest of the files. - */ - - /** - * @defgroup usbvirtkbd Virtual USB keybaord - * @ingroup usbvirt - * @brief Virtual USB keyboard for virtual host controller. - */ - - /** - * @defgroup usbinfo USB info application - * @ingroup usb - * @brief Application for querying USB devices. - * @details - * The intended usage of this application is to query new USB devices - * for their descriptors etc. to simplify driver writing. - */ - - /** - * @defgroup lsusb HelenOS version of lsusb command - * @ingroup usb - * @brief Application for listing USB host controllers. - * @details - * List all found host controllers. - */ - - /** - * @defgroup drvusbmid USB multi interface device driver - * @ingroup usb - * @brief USB multi interface device driver - * @details - * This driver serves as a mini hub (or bus) driver for devices - * that have the class defined at interface level (those devices - * usually have several interfaces). - * - * The term multi interface device driver (MID) was borrowed - * Solaris operating system. - */ - - /** - * @defgroup drvusbhub USB hub driver - * @ingroup usb - * @brief USB hub driver. - */ - - /** - * @defgroup drvusbhid USB HID driver - * @ingroup usb - * @brief USB driver for HID devices. - */ - - /** - * @defgroup drvusbmast USB mass storage driver - * @ingroup usb - * @brief USB driver for mass storage devices (bulk-only protocol). - * This driver is a only a stub and is currently used only for - * testing that bulk transfers work. - */ - - /** - * @defgroup drvusbuhci UHCI driver - * @ingroup usb - * @brief Drivers for USB UHCI host controller and root hub. - */ - - /** - * @defgroup drvusbohci OHCI driver - * @ingroup usb - * @brief Driver for OHCI host controller. - */ - - /** - * @defgroup drvusbehci EHCI driver - * @ingroup usb - * @brief Driver for EHCI host controller. - */ - - /** - * @defgroup drvusbfallback USB fallback driver - * @ingroup usb - * @brief Fallback driver for any USB device. - * @details - * The purpose of this driver is to simplify querying of unknown - * devices from within HelenOS (without a driver, no node at all - * may appear under /loc/devices). - */ - - +/** + * @defgroup libusb Base USB library + * @ingroup usb + * @brief Common definitions for any driver or application + * dealing with USB. + */ + +/** + * @defgroup libusbdev USB library for device drivers + * @ingroup usb + * @brief Library for writing drivers of endpoint devices (functions). + */ + +/** + * @defgroup libusbhost USB library for host controller drivers + * @ingroup usb + * @brief Library for writing host controller drivers. + */ + +/** + * @defgroup libusbhid USB library for HID devices + * @ingroup usb + * @brief Library for writing USB HID drivers. + */ + +/** + * @defgroup usbvirt USB virtualization + * @ingroup usb + * @brief Support for virtual USB devices. + */ + +/** + * @defgroup libusbvirt USB virtualization library + * @ingroup usbvirt + * @brief Library for creating virtual USB devices. + */ + +/** + * @defgroup drvusbvhc Virtual USB host controller + * @ingroup usbvirt + * @brief Driver simulating work of USB host controller. + */ + +/** + * @defgroup usbvirthub Virtual USB hub + * @ingroup usbvirt + * @brief Extra virtual USB hub for virtual host controller. + * @details + * Some of the sources are shared with virtual host controller, + * see @ref drvusbvhc for the rest of the files. + */ + +/** + * @defgroup usbvirtkbd Virtual USB keybaord + * @ingroup usbvirt + * @brief Virtual USB keyboard for virtual host controller. + */ + +/** + * @defgroup usbinfo USB info application + * @ingroup usb + * @brief Application for querying USB devices. + * @details + * The intended usage of this application is to query new USB devices + * for their descriptors etc. to simplify driver writing. + */ + +/** + * @defgroup lsusb HelenOS version of lsusb command + * @ingroup usb + * @brief Application for listing USB host controllers. + * @details + * List all found host controllers. + */ + +/** + * @defgroup drvusbmid USB multi interface device driver + * @ingroup usb + * @brief USB multi interface device driver + * @details + * This driver serves as a mini hub (or bus) driver for devices + * that have the class defined at interface level (those devices + * usually have several interfaces). + * + * The term multi interface device driver (MID) was borrowed + * Solaris operating system. + */ + +/** + * @defgroup drvusbhub USB hub driver + * @ingroup usb + * @brief USB hub driver. + */ + +/** + * @defgroup drvusbhid USB HID driver + * @ingroup usb + * @brief USB driver for HID devices. + */ + +/** + * @defgroup drvusbmast USB mass storage driver + * @ingroup usb + * @brief USB driver for mass storage devices (bulk-only protocol). + * This driver is a only a stub and is currently used only for + * testing that bulk transfers work. + */ + +/** + * @defgroup drvusbuhci UHCI driver + * @ingroup usb + * @brief Drivers for USB UHCI host controller and root hub. + */ + +/** + * @defgroup drvusbohci OHCI driver + * @ingroup usb + * @brief Driver for OHCI host controller. + */ + +/** + * @defgroup drvusbehci EHCI driver + * @ingroup usb + * @brief Driver for EHCI host controller. + */ + +/** + * @defgroup drvusbfallback USB fallback driver + * @ingroup usb + * @brief Fallback driver for any USB device. + * @details + * The purpose of this driver is to simplify querying of unknown + * devices from within HelenOS (without a driver, no node at all + * may appear under /loc/devices). + */ Index: uspace/doc/main_page.h =================================================================== --- uspace/doc/main_page.h (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/doc/main_page.h (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -1,12 +1,12 @@ /** - @mainpage HelenOS Operating System Source Code Reference - -HelenOS is a portable microkernel-based multiserver operating system designed and implemented from scratch. It decomposes key operating system functionality such as file systems, networking, device drivers and graphical user interface into a collection of fine-grained user space components that interact with each other via message passing. A failure or crash of one component does not directly harm others. HelenOS is therefore flexible, modular, extensible, fault tolerant and easy to understand. - -HelenOS does not aim to be a clone of any existing operating system and trades compatibility with legacy APIs for cleaner design. Most of HelenOS components have been made to order specifically for HelenOS so that its essential parts can stay free of adaptation layers, glue code, franken-components and the maintenance burden incurred by them. - -HelenOS runs on seven different processor architectures and machines ranging from embedded ARM devices and single-board computers through multicore 32-bit and 64-bit desktop PCs to 64-bit Itanium and SPARC rack-mount servers. - -HelenOS is open source, free software. Its source code is available under the BSD license. Some third-party components are licensed under GPL. - -*/ + * @mainpage HelenOS Operating System Source Code Reference + * + * HelenOS is a portable microkernel-based multiserver operating system designed and implemented from scratch. It decomposes key operating system functionality such as file systems, networking, device drivers and graphical user interface into a collection of fine-grained user space components that interact with each other via message passing. A failure or crash of one component does not directly harm others. HelenOS is therefore flexible, modular, extensible, fault tolerant and easy to understand. + * + * HelenOS does not aim to be a clone of any existing operating system and trades compatibility with legacy APIs for cleaner design. Most of HelenOS components have been made to order specifically for HelenOS so that its essential parts can stay free of adaptation layers, glue code, franken-components and the maintenance burden incurred by them. + * + * HelenOS runs on seven different processor architectures and machines ranging from embedded ARM devices and single-board computers through multicore 32-bit and 64-bit desktop PCs to 64-bit Itanium and SPARC rack-mount servers. + * + * HelenOS is open source, free software. Its source code is available under the BSD license. Some third-party components are licensed under GPL. + * + */ Index: uspace/drv/audio/sb16/dsp_commands.h =================================================================== --- uspace/drv/audio/sb16/dsp_commands.h (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/drv/audio/sb16/dsp_commands.h (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -38,127 +38,236 @@ /** See Sound Blaster Series HW programming Guide Chapter 6. */ typedef enum dsp_command { - DIRECT_8B_OUTPUT = 0x10, /* Followed by unsigned byte of digital data, - * software controls sampling rate */ - DIRECT_8B_INPUT = 0x20, /* Same as DIRECT_8B_OUTPUT but for input */ - - TRANSFER_TIME_CONSTANT = 0x40, /* Followed by time constant. - * TC = 65536 - (256 000 000 / - * (channels * sampling rate)) - * Send only high byte */ - - SINGLE_DMA_8B_OUTPUT = 0x14, /* Followed by length.high and length.low - * starts single-cycle DMA, length is -1 */ - SINGLE_DMA_8B_INPUT = 0x24, /* Same as SINGLE_DMA_8B_OUTPUT, but for - * input */ - SINGLE_DMA_8B_ADPCM_2B_OUT = 0x16, /* Starts single-cycle DMA using - * Creative ADPSM 8->2 bit compressed - * data, Followed by length.low - * and length.high. Length is -1 */ - SINGLE_DMA_8B_ADPCM_2B_OUT_REF = 0x17, /* Starts single-cycle DMA using - * DPSM 8->2 bit compressed data - * with reference byte. - * Followed by length.low and - * length.high. Length is -1 */ - SINGLE_DMA_8B_ADPCM_4B_OUT = 0x74, /* Same as - * SINGLE_DMA_8B_ADPCM_2B_OUT */ - SINGLE_DMA_8B_ADPCM_4B_OUT_REF = 0x75, /* Same as - * SINGLE_DMA_8B_ADPCM_2B_OUT_REF - */ - SINGLE_DMA_8B_ADPCM_3B_OUT = 0x76, /* Same as - * SINGLE_DMA_8B_ADPCM_2B_OUT */ - SINGLE_DMA_8B_ADPCM_3B_OUT_REF = 0x77, /* Same as - * SINGLE_DMA_8B_ADPCM_2B_OUT_REF - */ - - DMA_8B_PAUSE = 0xd0, /* Stop sending DMA request, - * works for SINGLE and AUTO */ - DMA_8B_CONTINUE = 0xd4, /* Resume transfers paused by DMA_8B_PAUSE */ - - SPEAKER_ON = 0xd1, /* Connect speaker via internal amplifier, - * has no effect on 4.xx */ - SPEAKER_OFF = 0xd3, /* Disconnect output from the amplifier, - * has no effect on 4.xx */ - - MIDI_POLLING = 0x30, /* Read DSP for MIDI data */ - MIDI_INTERRUPT = 0x31, /* Start interrupt mode, interrupt will be - * generated when there is in-bound data. - * To exit send again */ - MIDI_OUTPUT = 0x38, /* Followed by midi_data */ - - PAUSE = 0x80, /* Followed by duration.low, duration.high. Duration is -1 - * In the units of sampling period. Generates interrupt - * at the end of period */ - DSP_VERSION = 0xe1, /* Read 2 bytes, major and minor number */ - - AUTO_DMA_8B_OUTPUT = 0x1c, /* Starts auto-init DMA mode using 8-bit - * Interrupt after every block. - * To terminate, switch to single or use - * EXIT command*/ - AUTO_DMA_8B_INPUT = 0x2c, /* Same as AUTO_DMA_8B_OUTPUT, but for input*/ - AUTO_DMA_8B_ADPCM_2B_REF = 0x1f, /* Same as AUTO_DMA_8B_OUTPUT, but use - * 8->2bit ADPCM audio format */ - AUTO_DMA_8B_ADPCM_4B_REF = 0x7d, /* Same as AUTO_DMA_8B_ADPCM_2B_REF */ - AUTO_DMA_8B_ADPCM_3B_REF = 0x7f, /* Same as AUTO_DMA_8B_ADPCM_2B_REF */ - - DMA_8B_EXIT = 0xda, /* Ends DMA transfer and terminates I/O process */ - - BLOCK_TRANSFER_SIZE = 0x48, /* Followed by size.low, size.high - * Used with HIGH_SPEED AUTO_DMA */ - - UART_MIDI_POLLING = 0x34, /* Start UART MIDI polling mode, read and - * write from/to DSP is interpreted as - * read/write from/to MIDI. - * To exit use reset signal. Note that reset - * will restore previous state and won't do - * complete reset */ - UART_MIDI_INTERRUPT = 0x35, /* Same as UART_MIDI_POLLING, but use - * interrupts instead of polling. */ - UART_MIDI_POLLING_TS = 0x36, /* Add time stamp to inbound data, the - * order is time.low time.mid time.high - * data */ - UART_MIDI_INTERRUPT_TS = 0x37, /* Same as UART_MIDI_POLLING_TS, but use - * interrupts instead of polling */ - - SPEAKER_STATUS = 0xd8, /* 0xff means amp is on, 0x00 means it's off */ - - AUTO_DMA_8B_HIGH_OUTPUT = 0x90, /* DSP will generate interrupt after - * every block. No other commands are - * accepted in this mode. To exit - * the mode send RESET command. - * Note that reset will restore - * previous state. */ - AUTO_DMA_8B_HIGH_INPUT = 0x98, /* Same as AUTO_DMA_8B_HIGH_OUTPUT */ - SINGLE_DMA_8B_HIGH_OUTPUT = 0x91, /* Transfer one block and exit, - * generates interrupt */ - SINGLE_DMA_8B_HIGH_INPUT = 0x99, /* Same as SINGLE_DMA_8B_HIGH_OUTPUT */ - - SET_MONO_INPUT = 0xa0, /* Mono mode is the default, only on 3.xx */ - SET_STEREO_INPUT = 0xa8, /* Switch to stereo recording, only on 3.xx */ - - SET_SAMPLING_RATE_OUTPUT = 0x41, /* Followed by sapling rate - * 5000 to 45000 Hz, inclusive */ - SET_SAMPLING_RATE_INPUT = 0x42, /* Same as SET_SAMPLING_RATE_OUTPUT */ - - SINGLE_DMA_16B_DA = 0xb0, /* Followed by mode, size.low, size.high*/ - SINGLE_DMA_16B_DA_FIFO = 0xb2,/* mode format is: */ - AUTO_DMA_16B_DA = 0xb4, /* 0x00 - unsigned mono */ - AUTO_DMA_16B_DA_FIFO = 0xb6, /* 0x10 - signed mono */ - SINGLE_DMA_16B_AD = 0xb8, /* 0x20 - unsigned stereo */ - SINGLE_DMA_16B_AD_FIFO = 0xba,/* 0x30 - signed stereo */ - AUTO_DMA_16B_AD = 0xbc, /* Size is -1. Terminate by EXIT */ - AUTO_DMA_16B_AD_FIFO = 0xbe, /* or switch to SINGLE_DMA */ - - SINGLE_DMA_8B_DA = 0xc0, /* Followed by mode, size.low, size.high */ - SINGLE_DMA_8B_DA_FIFO = 0xc2,/* mode format is: */ - AUTO_DMA_8B_DA = 0xc4, /* 0x00 - unsigned mono */ - AUTO_DMA_8B_DA_FIFO = 0xc6, /* 0x10 - signed mono */ - SINGLE_DMA_8B_AD = 0xc8, /* 0x20 - unsigned stereo */ - SINGLE_DMA_8B_AD_FIFO = 0xca,/* 0x30 - signed stereo */ - AUTO_DMA_8B_AD = 0xcc, /* Size is -1. Terminate by EXIT */ - AUTO_DMA_8B_AD_FIFO = 0xce, /* or switch to SINGLE_DMA */ - - DMA_16B_PAUSE = 0xd5,/* Stop sending DMA request, both SINGLE and AUTO*/ - DMA_16B_CONTINUE = 0xd6, /* Resume requests paused by DMA_16B_PAUSE */ - DMA_16B_EXIT = 0xd9, /* Ends DMA transfer and terminates I/O process */ + /* + * Followed by unsigned byte of digital data, + * software controls sampling rate + */ + DIRECT_8B_OUTPUT = 0x10, + /* Same as DIRECT_8B_OUTPUT but for input */ + DIRECT_8B_INPUT = 0x20, + + /* + * Followed by time constant. + * TC = 65536 - (256 000 000 / + * (channels * sampling rate)) + * Send only high byte + */ + TRANSFER_TIME_CONSTANT = 0x40, + + /* + * Followed by length.high and length.low + * starts single-cycle DMA, length is -1 + */ + SINGLE_DMA_8B_OUTPUT = 0x14, + /* + * Same as SINGLE_DMA_8B_OUTPUT, but for + * input + */ + SINGLE_DMA_8B_INPUT = 0x24, + /* + * Starts single-cycle DMA using + * Creative ADPSM 8->2 bit compressed + * data, Followed by length.low + * and length.high. Length is -1 + */ + SINGLE_DMA_8B_ADPCM_2B_OUT = 0x16, + /* + * Starts single-cycle DMA using + * DPSM 8->2 bit compressed data + * with reference byte. + * Followed by length.low and + * length.high. Length is -1 + */ + SINGLE_DMA_8B_ADPCM_2B_OUT_REF = 0x17, + /* + * Same as + * SINGLE_DMA_8B_ADPCM_2B_OUT + */ + SINGLE_DMA_8B_ADPCM_4B_OUT = 0x74, + /* + * Same as + * SINGLE_DMA_8B_ADPCM_2B_OUT_REF + */ + SINGLE_DMA_8B_ADPCM_4B_OUT_REF = 0x75, + /* + * Same as + * SINGLE_DMA_8B_ADPCM_2B_OUT + */ + SINGLE_DMA_8B_ADPCM_3B_OUT = 0x76, + /* + * Same as + * SINGLE_DMA_8B_ADPCM_2B_OUT_REF + */ + SINGLE_DMA_8B_ADPCM_3B_OUT_REF = 0x77, + /* + * Stop sending DMA request, + * works for SINGLE and AUTO + */ + DMA_8B_PAUSE = 0xd0, + /* Resume transfers paused by DMA_8B_PAUSE */ + DMA_8B_CONTINUE = 0xd4, + + /* + * Connect speaker via internal amplifier, + * has no effect on 4.xx + */ + SPEAKER_ON = 0xd1, + /* + * Disconnect output from the amplifier, + * has no effect on 4.xx + */ + SPEAKER_OFF = 0xd3, + + /* Read DSP for MIDI data */ + MIDI_POLLING = 0x30, + /* + * Start interrupt mode, interrupt will be + * generated when there is in-bound data. + * To exit send again + */ + MIDI_INTERRUPT = 0x31, + /* Followed by midi_data */ + MIDI_OUTPUT = 0x38, + + /* + * Followed by duration.low, duration.high. Duration is -1 + * In the units of sampling period. Generates interrupt + * at the end of period + */ + PAUSE = 0x80, + /* Read 2 bytes, major and minor number */ + DSP_VERSION = 0xe1, + + /* + * Starts auto-init DMA mode using 8-bit + * Interrupt after every block. + * To terminate, switch to single or use + * EXIT command + */ + AUTO_DMA_8B_OUTPUT = 0x1c, + /* Same as AUTO_DMA_8B_OUTPUT, but for input */ + AUTO_DMA_8B_INPUT = 0x2c, + /* + * Same as AUTO_DMA_8B_OUTPUT, but use + * 8->2bit ADPCM audio format + */ + AUTO_DMA_8B_ADPCM_2B_REF = 0x1f, + /* Same as AUTO_DMA_8B_ADPCM_2B_REF */ + AUTO_DMA_8B_ADPCM_4B_REF = 0x7d, + /* Same as AUTO_DMA_8B_ADPCM_2B_REF */ + AUTO_DMA_8B_ADPCM_3B_REF = 0x7f, + + /* Ends DMA transfer and terminates I/O process */ + DMA_8B_EXIT = 0xda, + + /* + * Followed by size.low, size.high + * Used with HIGH_SPEED AUTO_DMA + */ + BLOCK_TRANSFER_SIZE = 0x48, + /* + * Start UART MIDI polling mode, read and + * write from/to DSP is interpreted as + * read/write from/to MIDI. + * To exit use reset signal. Note that reset + * will restore previous state and won't do + * complete reset + */ + UART_MIDI_POLLING = 0x34, + /* + * Same as UART_MIDI_POLLING, but use + * interrupts instead of polling. + */ + UART_MIDI_INTERRUPT = 0x35, + /* + * Add time stamp to inbound data, the + * order is time.low time.mid time.high + * data + */ + UART_MIDI_POLLING_TS = 0x36, + /* + * Same as UART_MIDI_POLLING_TS, but use + * interrupts instead of polling + */ + UART_MIDI_INTERRUPT_TS = 0x37, + + /* 0xff means amp is on, 0x00 means it's off */ + SPEAKER_STATUS = 0xd8, + + /* + * DSP will generate interrupt after + * every block. No other commands are + * accepted in this mode. To exit + * the mode send RESET command. + * Note that reset will restore + * previous state. + */ + AUTO_DMA_8B_HIGH_OUTPUT = 0x90, + /* Same as AUTO_DMA_8B_HIGH_OUTPUT */ + AUTO_DMA_8B_HIGH_INPUT = 0x98, + /* + * Transfer one block and exit, + * generates interrupt + */ + SINGLE_DMA_8B_HIGH_OUTPUT = 0x91, + /* Same as SINGLE_DMA_8B_HIGH_OUTPUT */ + SINGLE_DMA_8B_HIGH_INPUT = 0x99, + + /* Mono mode is the default, only on 3.xx */ + SET_MONO_INPUT = 0xa0, + /* Switch to stereo recording, only on 3.xx */ + SET_STEREO_INPUT = 0xa8, + + /* + * Followed by sapling rate + * 5000 to 45000 Hz, inclusive + */ + SET_SAMPLING_RATE_OUTPUT = 0x41, + /* Same as SET_SAMPLING_RATE_OUTPUT */ + SET_SAMPLING_RATE_INPUT = 0x42, + + /* + * Followed by mode, size.low, size.high + * mode format is: + * 0x00 - unsigned mono + * 0x10 - signed mono + * 0x20 - unsigned stereo + * 0x30 - signed stereo + * Size is -1. Terminate AUTO_DMA by EXIT + * or switch to SINGLE_DMA + */ + SINGLE_DMA_16B_DA = 0xb0, + SINGLE_DMA_16B_DA_FIFO = 0xb2, + AUTO_DMA_16B_DA = 0xb4, + AUTO_DMA_16B_DA_FIFO = 0xb6, + SINGLE_DMA_16B_AD = 0xb8, + SINGLE_DMA_16B_AD_FIFO = 0xba, + AUTO_DMA_16B_AD = 0xbc, + AUTO_DMA_16B_AD_FIFO = 0xbe, + + /* + * Followed by mode, size.low, size.high + * mode format is: + * 0x00 - unsigned mono + * 0x10 - signed mono + * 0x20 - unsigned stereo + * 0x30 - signed stereo + * Size is -1. Terminate AUTO_DMA by EXIT + * or switch to SINGLE_DMA + */ + SINGLE_DMA_8B_DA = 0xc0, + SINGLE_DMA_8B_DA_FIFO = 0xc2, + AUTO_DMA_8B_DA = 0xc4, + AUTO_DMA_8B_DA_FIFO = 0xc6, + SINGLE_DMA_8B_AD = 0xc8, + SINGLE_DMA_8B_AD_FIFO = 0xca, + AUTO_DMA_8B_AD = 0xcc, + AUTO_DMA_8B_AD_FIFO = 0xce, + + /* Stop sending DMA request, both SINGLE and AUTO */ + DMA_16B_PAUSE = 0xd5, + /* Resume requests paused by DMA_16B_PAUSE */ + DMA_16B_CONTINUE = 0xd6, + /* Ends DMA transfer and terminates I/O process */ + DMA_16B_EXIT = 0xd9, } dsp_command_t; Index: uspace/drv/bus/usb/ehci/hw_struct/iso_transfer_descriptor.h =================================================================== --- uspace/drv/bus/usb/ehci/hw_struct/iso_transfer_descriptor.h (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/drv/bus/usb/ehci/hw_struct/iso_transfer_descriptor.h (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -43,4 +43,13 @@ volatile uint32_t transaction[8]; + volatile uint32_t buffer_pointer[7]; + + /* 64 bit struct only */ + volatile uint32_t extended_bp[7]; +} __attribute__((packed, aligned(32))) itd_t; + +/* + * itd_t.transaction + */ #define ITD_TRANSACTION_STATUS_ACTIVE_FLAG (1 << 31) #define ITD_TRANSACTION_STATUS_BUFFER_ERROR_FLAG (1 << 30) @@ -55,5 +64,7 @@ #define ITD_TRANSACTION_OFFSET_SHIFT 0 - volatile uint32_t buffer_pointer[7]; +/* + * itd_t.buffer_pointer + */ #define ITD_BUFFER_POINTER_MASK 0xfffff000 /* First buffer pointer */ @@ -70,8 +81,6 @@ #define ITD_BUFFER_POINTER_MULTI_SHIFT 0 - /* 64 bit struct only */ - volatile uint32_t extended_bp[7]; -} __attribute__((packed, aligned(32))) itd_t; #endif + /** * @} Index: uspace/drv/bus/usb/ehci/hw_struct/queue_head.h =================================================================== --- uspace/drv/bus/usb/ehci/hw_struct/queue_head.h (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/drv/bus/usb/ehci/hw_struct/queue_head.h (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -49,4 +49,20 @@ volatile uint32_t ep_char; + volatile uint32_t ep_cap; + + link_pointer_t current; + /* Transfer overlay starts here */ + link_pointer_t next; + link_pointer_t alternate; + volatile uint32_t status; + volatile uint32_t buffer_pointer[5]; + + /* 64 bit struct only */ + volatile uint32_t extended_bp[5]; +} __attribute__((packed, aligned(32))) qh_t; + +/* + * qh_t.ep_char + */ #define QH_EP_CHAR_RL_MASK 0xf #define QH_EP_CHAR_RL_SHIFT 28 @@ -78,5 +94,7 @@ (((val) >> QH_EP_CHAR_ADDR_SHIFT) & QH_EP_CHAR_ADDR_MASK) - volatile uint32_t ep_cap; +/* + * qh_t.ep_cap + */ #define QH_EP_CAP_MULTI_MASK 0x3 #define QH_EP_CAP_MULTI_SHIFT 30 @@ -100,12 +118,13 @@ (((val) & QH_EP_CAP_S_MASK_MASK) << QH_EP_CAP_S_MASK_SHIFT) - link_pointer_t current; -/* Transfer overlay starts here */ - link_pointer_t next; - link_pointer_t alternate; +/* + * qh_t.alternate + */ #define QH_ALTERNATE_NACK_CNT_MASK 0x7 #define QH_ALTERNATE_NACK_CNT_SHIFT 1 - volatile uint32_t status; +/* + * qh_t.status + */ #define QH_STATUS_TOGGLE_FLAG (1 << 31) #define QH_STATUS_TOTAL_MASK 0x7fff @@ -127,5 +146,7 @@ #define QH_STATUS_PING_FLAG (1 << 0) - volatile uint32_t buffer_pointer[5]; +/* + * qh_t.buffer_pointer + */ #define QH_BUFFER_POINTER_MASK 0xfffff000 /* Only the first buffer pointer */ @@ -141,7 +162,4 @@ #define QH_BUFFER_POINTER_FTAG_SHIFT 0 - /* 64 bit struct only */ - volatile uint32_t extended_bp[5]; -} __attribute__((packed, aligned(32))) qh_t; static inline void qh_append_qh(qh_t *qh, const qh_t *next) @@ -212,6 +230,6 @@ } - -void qh_init(qh_t *instance, const endpoint_t *ep); +extern void qh_init(qh_t *instance, const endpoint_t *ep); + #endif /** Index: uspace/drv/bus/usb/ehci/hw_struct/split_iso_transfer_descriptor.h =================================================================== --- uspace/drv/bus/usb/ehci/hw_struct/split_iso_transfer_descriptor.h (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/drv/bus/usb/ehci/hw_struct/split_iso_transfer_descriptor.h (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -43,4 +43,16 @@ volatile uint32_t ep; + volatile uint32_t uframe; + volatile uint32_t status; + volatile uint32_t buffer_pointer[2]; + link_pointer_t back; + + /* 64 bit struct only */ + volatile uint32_t extended_bp[2]; +} __attribute__((packed, aligned(32))) sitd_t; + +/* + * sitd_t.ep + */ #define SITD_EP_IN_FLAG (1 << 31) #define SITD_EP_PORT_MASK 0x3f @@ -53,5 +65,7 @@ #define SITD_EP_ADDR_SHIFT 0 - volatile uint32_t uframe; +/* + * sitd_t.uframe + */ #define SITD_uFRAME_CMASK_MASK 0xff #define SITD_uFRAME_CMASK_SHIFT 8 @@ -59,5 +73,7 @@ #define SITD_uFRAME_SMASK_SHIFT 0 - volatile uint32_t status; +/* + * sitd_t.status + */ #define SITD_STATUS_IOC_FLAG (1 << 31) #define SITD_STATUS_PAGE_FLAG (1 << 30) @@ -74,5 +90,7 @@ #define SITD_STATUS_SPLIT_COMPLETE_FLAG (1 << 1) - volatile uint32_t buffer_pointer[2]; +/* + * sitd_t.buffer_pointer + */ #define SITD_BUFFER_POINTER_MASK 0xfffff000 /* Only the first page pointer */ @@ -85,10 +103,6 @@ #define SITD_BUFFER_POINTER_COUNT_SHIFT 0 - link_pointer_t back; +#endif - /* 64 bit struct only */ - volatile uint32_t extended_bp[2]; -} __attribute__((packed, aligned(32))) sitd_t; -#endif /** * @} Index: uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.h =================================================================== --- uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.h (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.h (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -47,4 +47,15 @@ volatile uint32_t status; + + volatile uint32_t buffer_pointer[5]; + + /* 64 bit struct only */ + volatile uint32_t extended_bp[5]; + +} __attribute__((packed, aligned(32))) td_t; + +/* + * td_t.status + */ #define TD_STATUS_TOGGLE_FLAG (1 << 31) #define TD_STATUS_TOTAL_MASK 0x7fff @@ -69,13 +80,11 @@ #define TD_STATUS_PING_FLAG (1 << 0) - volatile uint32_t buffer_pointer[5]; +/* + * td_t.buffer_pointer + */ + #define TD_BUFFER_POINTER_MASK 0xfffff000 /* Only the first page pointer */ #define TD_BUFFER_POINTER_OFFSET_MASK 0xfff - - /* 64 bit struct only */ - volatile uint32_t extended_bp[5]; - -} __attribute__((packed, aligned(32))) td_t; static_assert(sizeof(td_t) % 32 == 0); Index: uspace/drv/bus/usb/ohci/ohci_regs.h =================================================================== --- uspace/drv/bus/usb/ohci/ohci_regs.h (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/drv/bus/usb/ohci/ohci_regs.h (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -50,69 +50,20 @@ typedef struct ohci_regs { const ioport32_t revision; -#define R_REVISION_MASK (0x3f) -#define R_LEGACY_FLAG (0x80) ioport32_t control; -/* Control-bulk service ratio */ -#define C_CBSR_1_1 (0x0) -#define C_CBSR_1_2 (0x1) -#define C_CBSR_1_3 (0x2) -#define C_CBSR_1_4 (0x3) -#define C_CBSR_MASK (0x3) -#define C_CBSR_SHIFT 0 - -#define C_PLE (1 << 2) /* Periodic list enable */ -#define C_IE (1 << 3) /* Isochronous enable */ -#define C_CLE (1 << 4) /* Control list enable */ -#define C_BLE (1 << 5) /* Bulk list enable */ - -/* Host controller functional state */ -#define C_HCFS_RESET (0x0) -#define C_HCFS_RESUME (0x1) -#define C_HCFS_OPERATIONAL (0x2) -#define C_HCFS_SUSPEND (0x3) -#define C_HCFS_GET(reg) ((OHCI_RD(reg) >> 6) & 0x3) -#define C_HCFS_SET(reg, value) \ -do { \ - uint32_t r = OHCI_RD(reg); \ - r &= ~(0x3 << 6); \ - r |= (value & 0x3) << 6; \ - OHCI_WR(reg, r); \ -} while (0) - -#define C_IR (1 << 8) /* Interrupt routing, make sure it's 0 */ -#define C_RWC (1 << 9) /* Remote wakeup connected, host specific */ -#define C_RWE (1 << 10) /* Remote wakeup enable */ ioport32_t command_status; -#define CS_HCR (1 << 0) /* Host controller reset */ -#define CS_CLF (1 << 1) /* Control list filled */ -#define CS_BLF (1 << 2) /* Bulk list filled */ -#define CS_OCR (1 << 3) /* Ownership change request */ -#if 0 -#define CS_SOC_MASK (0x3) /* Scheduling overrun count */ -#define CS_SOC_SHIFT (16) -#endif /** Interupt enable/disable/status, * reads give the same value, * writing causes enable/disable, - * status is write-clean (writing 1 clears the bit*/ + * status is write-clean (writing 1 clears the bit + */ ioport32_t interrupt_status; ioport32_t interrupt_enable; ioport32_t interrupt_disable; -#define I_SO (1 << 0) /* Scheduling overrun */ -#define I_WDH (1 << 1) /* Done head write-back */ -#define I_SF (1 << 2) /* Start of frame */ -#define I_RD (1 << 3) /* Resume detect */ -#define I_UE (1 << 4) /* Unrecoverable error */ -#define I_FNO (1 << 5) /* Frame number overflow */ -#define I_RHSC (1 << 6) /* Root hub status change */ -#define I_OC (1 << 30) /* Ownership change */ -#define I_MI (1 << 31) /* Master interrupt (any/all) */ /** HCCA pointer (see hw_struct hcca.h) */ ioport32_t hcca; -#define HCCA_PTR_MASK 0xffffff00 /* HCCA is 256B aligned */ /** Currently executed periodic endpoint */ @@ -136,82 +87,25 @@ /** Frame time and max packet size for all transfers */ ioport32_t fm_interval; -#define FMI_FI_MASK (0x3fff) /* Frame interval in bit times (should be 11999)*/ -#define FMI_FI_SHIFT (0) -#define FMI_FSMPS_MASK (0x7fff) /* Full speed max packet size */ -#define FMI_FSMPS_SHIFT (16) -#define FMI_TOGGLE_FLAG (1 << 31) /** Bit times remaining in current frame */ const ioport32_t fm_remaining; -#define FMR_FR_MASK FMI_FI_MASK -#define FMR_FR_SHIFT FMI_FI_SHIFT -#define FMR_TOGGLE_FLAG FMI_TOGGLE_FLAG /** Frame number */ const ioport32_t fm_number; -#define FMN_NUMBER_MASK (0xffff) /** Remaining bit time in frame to start periodic transfers */ ioport32_t periodic_start; -#define PS_MASK 0x3fff -#define PS_SHIFT 0 /** Threshold for starting LS transaction */ ioport32_t ls_threshold; -#define LST_LST_MASK (0x7fff) /** The first root hub control register */ ioport32_t rh_desc_a; -/** Number of downstream ports, max 15 */ -#define RHDA_NDS_MASK (0xff) -/** Power switching mode: 0-global, 1-per port*/ -#define RHDA_PSM_FLAG (1 << 8) -/** No power switch: 1-power on, 0-use PSM*/ -#define RHDA_NPS_FLAG (1 << 9) -/** 1-Compound device, must be 0 */ -#define RHDA_DT_FLAG (1 << 10) -/** Over-current mode: 0-global, 1-per port */ -#define RHDA_OCPM_FLAG (1 << 11) -/** OC control: 0-use OCPM, 1-OC off */ -#define RHDA_NOCP_FLAG (1 << 12) -/** Power on to power good time */ -#define RHDA_POTPGT_SHIFT 24 /** The other root hub control register */ ioport32_t rh_desc_b; -/** Device removable mask */ -#define RHDB_DR_SHIFT 0 -#define RHDB_DR_MASK 0xffffU -/** Power control mask */ -#define RHDB_PCC_MASK 0xffffU -#define RHDB_PCC_SHIFT 16 /** Root hub status register */ ioport32_t rh_status; -/* read: 0, - * write: 0-no effect, - * 1-turn off port power for ports - * specified in PPCM(RHDB), or all ports, - * if power is set globally */ -#define RHS_LPS_FLAG (1 << 0) -#define RHS_CLEAR_GLOBAL_POWER RHS_LPS_FLAG /* synonym for the above */ -/** Over-current indicator, if per-port: 0 */ -#define RHS_OCI_FLAG (1 << 1) - -/* read: 0-connect status change does not wake HC - * 1-connect status change wakes HC - * write: 1-set DRWE, 0-no effect */ -#define RHS_DRWE_FLAG (1 << 15) -#define RHS_SET_DRWE RHS_DRWE_FLAG -/* read: 0, - * write: 0-no effect - * 1-turn on port power for ports - * specified in PPCM(RHDB), or all ports, - * if power is set globally */ -#define RHS_LPSC_FLAG (1 << 16) -#define RHS_SET_GLOBAL_POWER RHS_LPSC_FLAG /* synonym for the above */ -/** Over-current change indicator*/ -#define RHS_OCIC_FLAG (1 << 17) -#define RHS_CLEAR_DRWE (1 << 31) /** Root hub per port status */ @@ -249,5 +143,223 @@ } ohci_regs_t; +/* + * ohci_regs_t.revision + */ + +#define R_REVISION_MASK (0x3f) +#define R_LEGACY_FLAG (0x80) + +/* + * ohci_regs_t.control + */ + +/* Control-bulk service ratio */ +#define C_CBSR_1_1 (0x0) +#define C_CBSR_1_2 (0x1) +#define C_CBSR_1_3 (0x2) +#define C_CBSR_1_4 (0x3) +#define C_CBSR_MASK (0x3) +#define C_CBSR_SHIFT 0 + +#define C_PLE (1 << 2) /* Periodic list enable */ +#define C_IE (1 << 3) /* Isochronous enable */ +#define C_CLE (1 << 4) /* Control list enable */ +#define C_BLE (1 << 5) /* Bulk list enable */ + +/* Host controller functional state */ +#define C_HCFS_RESET (0x0) +#define C_HCFS_RESUME (0x1) +#define C_HCFS_OPERATIONAL (0x2) +#define C_HCFS_SUSPEND (0x3) +#define C_HCFS_GET(reg) ((OHCI_RD(reg) >> 6) & 0x3) +#define C_HCFS_SET(reg, value) \ +do { \ + uint32_t r = OHCI_RD(reg); \ + r &= ~(0x3 << 6); \ + r |= (value & 0x3) << 6; \ + OHCI_WR(reg, r); \ +} while (0) + +#define C_IR (1 << 8) /* Interrupt routing, make sure it's 0 */ +#define C_RWC (1 << 9) /* Remote wakeup connected, host specific */ +#define C_RWE (1 << 10) /* Remote wakeup enable */ + +/* + * ohci_regs_t.command_status + */ + +#define CS_HCR (1 << 0) /* Host controller reset */ +#define CS_CLF (1 << 1) /* Control list filled */ +#define CS_BLF (1 << 2) /* Bulk list filled */ +#define CS_OCR (1 << 3) /* Ownership change request */ +#if 0 +#define CS_SOC_MASK (0x3) /* Scheduling overrun count */ +#define CS_SOC_SHIFT (16) #endif + +/* + * ohci_regs_t.interrupt_xxx + */ + +#define I_SO (1 << 0) /* Scheduling overrun */ +#define I_WDH (1 << 1) /* Done head write-back */ +#define I_SF (1 << 2) /* Start of frame */ +#define I_RD (1 << 3) /* Resume detect */ +#define I_UE (1 << 4) /* Unrecoverable error */ +#define I_FNO (1 << 5) /* Frame number overflow */ +#define I_RHSC (1 << 6) /* Root hub status change */ +#define I_OC (1 << 30) /* Ownership change */ +#define I_MI (1 << 31) /* Master interrupt (any/all) */ + + +/* + * ohci_regs_t.hcca + */ + +#define HCCA_PTR_MASK 0xffffff00 /* HCCA is 256B aligned */ + +/* + * ohci_regs_t.fm_interval + */ + +#define FMI_FI_MASK (0x3fff) /* Frame interval in bit times (should be 11999)*/ +#define FMI_FI_SHIFT (0) +#define FMI_FSMPS_MASK (0x7fff) /* Full speed max packet size */ +#define FMI_FSMPS_SHIFT (16) +#define FMI_TOGGLE_FLAG (1 << 31) + +/* + * ohci_regs_t.fm_remaining + */ + +#define FMR_FR_MASK FMI_FI_MASK +#define FMR_FR_SHIFT FMI_FI_SHIFT +#define FMR_TOGGLE_FLAG FMI_TOGGLE_FLAG + +/* + * ohci_regs_t.fm_number + */ + +#define FMN_NUMBER_MASK (0xffff) + +/* + * ohci_regs_t.periodic_start + */ + +#define PS_MASK 0x3fff +#define PS_SHIFT 0 + +/* + * ohci_regs_t.ls_threshold + */ + +#define LST_LST_MASK (0x7fff) + +/* + * ohci_regs_t.rh_desc_a + */ + +/** Number of downstream ports, max 15 */ +#define RHDA_NDS_MASK (0xff) +/** Power switching mode: 0-global, 1-per port*/ +#define RHDA_PSM_FLAG (1 << 8) +/** No power switch: 1-power on, 0-use PSM*/ +#define RHDA_NPS_FLAG (1 << 9) +/** 1-Compound device, must be 0 */ +#define RHDA_DT_FLAG (1 << 10) +/** Over-current mode: 0-global, 1-per port */ +#define RHDA_OCPM_FLAG (1 << 11) +/** OC control: 0-use OCPM, 1-OC off */ +#define RHDA_NOCP_FLAG (1 << 12) +/** Power on to power good time */ +#define RHDA_POTPGT_SHIFT 24 + +/* + * ohci_regs_t.rh_desc_b + */ + +/** Device removable mask */ +#define RHDB_DR_SHIFT 0 +#define RHDB_DR_MASK 0xffffU + +/** Power control mask */ +#define RHDB_PCC_MASK 0xffffU +#define RHDB_PCC_SHIFT 16 + +/* + * ohci_regs_t.rh_status + */ + +/* + * read: 0, + * write: 0-no effect, + * 1-turn off port power for ports + * specified in PPCM(RHDB), or all ports, + * if power is set globally + */ +#define RHS_LPS_FLAG (1 << 0) +#define RHS_CLEAR_GLOBAL_POWER RHS_LPS_FLAG /* synonym for the above */ +/** Over-current indicator, if per-port: 0 */ +#define RHS_OCI_FLAG (1 << 1) +/* + * read: 0-connect status change does not wake HC + * 1-connect status change wakes HC + * write: 1-set DRWE, 0-no effect + */ +#define RHS_DRWE_FLAG (1 << 15) +#define RHS_SET_DRWE RHS_DRWE_FLAG +/* + * read: 0, + * write: 0-no effect + * 1-turn on port power for ports + * specified in PPCM(RHDB), or all ports, + * if power is set globally + */ +#define RHS_LPSC_FLAG (1 << 16) +#define RHS_SET_GLOBAL_POWER RHS_LPSC_FLAG /* synonym for the above */ +/** Over-current change indicator*/ +#define RHS_OCIC_FLAG (1 << 17) +#define RHS_CLEAR_DRWE (1 << 31) + +#endif + +/* + * ohci_regs_t.rh_port_status[x] + */ + +/** r: current connect status, w: 1-clear port enable, 0-N/S*/ +#define RHPS_CCS_FLAG (1 << 0) +#define RHPS_CLEAR_PORT_ENABLE RHPS_CCS_FLAG +/** r: port enable status, w: 1-set port enable, 0-N/S */ +#define RHPS_PES_FLAG (1 << 1) +#define RHPS_SET_PORT_ENABLE RHPS_PES_FLAG +/** r: port suspend status, w: 1-set port suspend, 0-N/S */ +#define RHPS_PSS_FLAG (1 << 2) +#define RHPS_SET_PORT_SUSPEND RHPS_PSS_FLAG +/** r: port over-current (if reports are per-port + * w: 1-clear port suspend (start resume if suspened), 0-nothing + */ +#define RHPS_POCI_FLAG (1 << 3) +#define RHPS_CLEAR_PORT_SUSPEND RHPS_POCI_FLAG +/** r: port reset status, w: 1-set port reset, 0-N/S */ +#define RHPS_PRS_FLAG (1 << 4) +#define RHPS_SET_PORT_RESET RHPS_PRS_FLAG +/** r: port power status, w: 1-set port power, 0-N/S */ +#define RHPS_PPS_FLAG (1 << 8) +#define RHPS_SET_PORT_POWER RHPS_PPS_FLAG +/** r: low speed device attached, w: 1-clear port power, 0-N/S */ +#define RHPS_LSDA_FLAG (1 << 9) +#define RHPS_CLEAR_PORT_POWER RHPS_LSDA_FLAG +/** connect status change WC */ +#define RHPS_CSC_FLAG (1 << 16) +/** port enable status change WC */ +#define RHPS_PESC_FLAG (1 << 17) +/** port suspend status change WC */ +#define RHPS_PSSC_FLAG (1 << 18) +/** port over-current change WC */ +#define RHPS_OCIC_FLAG (1 << 19) +/** port reset status change WC */ +#define RHPS_PRSC_FLAG (1 << 20) +#define RHPS_CHANGE_WC_MASK (0x1f0000) /** Index: uspace/drv/bus/usb/uhci/hc.c =================================================================== --- uspace/drv/bus/usb/uhci/hc.c (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/drv/bus/usb/uhci/hc.c (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -531,6 +531,8 @@ &instance->transfers_control_slow); - /*FSBR, This feature is not needed (adds no benefit) and is supposedly - * buggy on certain hw, enable at your own risk. */ + /* + * FSBR, This feature is not needed (adds no benefit) and is supposedly + * buggy on certain hw, enable at your own risk. + */ #ifdef FSBR transfer_list_set_next(&instance->transfers_bulk_full, Index: uspace/drv/bus/usb/xhci/commands.h =================================================================== --- uspace/drv/bus/usb/xhci/commands.h (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/drv/bus/usb/xhci/commands.h (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -79,12 +79,15 @@ xhci_trb_ring_t trb_ring; - fibril_mutex_t guard; /**< Guard access to this structure. */ + /** Guard access to this structure. */ + fibril_mutex_t guard; list_t cmd_list; - xhci_cr_state_t state; /**< Whether commands are allowed to be - added. */ - fibril_condvar_t state_cv; /**< For waiting on CR state change. */ + /** Whether commands are allowed to be added. */ + xhci_cr_state_t state; + /** For waiting on CR state change. */ + fibril_condvar_t state_cv; - fibril_condvar_t stopped_cv; /**< For waiting on CR stopped event. */ + /** For waiting on CR stopped event. */ + fibril_condvar_t stopped_cv; } xhci_cmd_ring_t; @@ -108,5 +111,6 @@ /** Below are arguments of all commands mixed together. - * Be sure to know which command accepts what arguments. */ + * Be sure to know which command accepts what arguments. + */ uint32_t slot_id; Index: uspace/drv/nic/ne2k/dp8390.c =================================================================== --- uspace/drv/nic/ne2k/dp8390.c (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/drv/nic/ne2k/dp8390.c (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -475,7 +475,9 @@ size_t frames_count = 0; - /* We may block sending in this loop - after so many received frames there + /* + * We may block sending in this loop - after so many received frames there * must be some interrupt pending (for the frames not yet downloaded) and - * we will continue in its handler. */ + * we will continue in its handler. + */ while (frames_count < 16) { //TODO: isn't some locking necessary here? Index: uspace/drv/nic/rtl8139/defs.h =================================================================== --- uspace/drv/nic/rtl8139/defs.h (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/drv/nic/rtl8139/defs.h (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -280,38 +280,57 @@ /** Receiver control register values */ enum rtl8139_rcr { - RCR_ERTH_SHIFT = 24, /**< Early Rx treshold part shift */ - RCR_ERTH_SIZE = 4, /**< Early Rx treshold part size */ - - RCR_MulERINT = 1 << 17, /**< Multiple early interrupt select */ - - /** Minimal error frame length (1 = 8B, 0 = 64B). If AER/AR is set, RER8 - * is "Don't care" + /** Early Rx treshold part shift */ + RCR_ERTH_SHIFT = 24, + /** Early Rx treshold part size */ + RCR_ERTH_SIZE = 4, + + /** Multiple early interrupt select */ + RCR_MulERINT = 1 << 17, + + /** Minimal error frame length (1 = 8B, 0 = 64B). + * If AER/AR is set, RER8 is "Don't care" */ RCR_RER8 = 1 << 16, - RCR_RXFTH_SHIFT = 13, /**< Rx FIFO treshold part shitf */ - RCR_RXFTH_SIZE = 3, /**< Rx FIFO treshold part size */ - - RCR_RBLEN_SHIFT = 11, /**< Rx buffer length part shift */ - RCR_RBLEN_SIZE = 2, /**< Rx buffer length part size */ - - RCR_RBLEN_8k = 0x00 << RCR_RBLEN_SHIFT, /**< 8K + 16 byte rx buffer */ - RCR_RBLEN_16k = 0x01 << RCR_RBLEN_SHIFT, /**< 16K + 16 byte rx buffer */ - RCR_RBLEN_32k = 0x02 << RCR_RBLEN_SHIFT, /**< 32K + 16 byte rx buffer */ - RCR_RBLEN_64k = 0x03 << RCR_RBLEN_SHIFT, /**< 64K + 16 byte rx buffer */ - - RCR_MXDMA_SHIFT = 8, /**< Max DMA Burst Size part shift */ - RCR_MXDMA_SIZE = 3, /**< Max DMA Burst Size part size */ - - RCR_WRAP = 1 << 7, /**< Rx buffer wrapped */ - RCR_ACCEPT_ERROR = 1 << 5, /**< Accept error frame */ - RCR_ACCEPT_RUNT = 1 << 4, /**< Accept Runt (8-64 bytes) frames */ - RCR_ACCEPT_BROADCAST = 1 << 3, /**< Accept broadcast */ - RCR_ACCEPT_MULTICAST = 1 << 2, /**< Accept multicast */ - RCR_ACCEPT_PHYS_MATCH = 1 << 1, /**< Accept device MAC address match */ - RCR_ACCEPT_ALL_PHYS = 1 << 0, /**< Accept all frames with - * phys. desticnation - */ - RCR_ACCEPT_MASK = (1 << 6) - 1 /**< Mask of accept part */ + /** Rx FIFO treshold part shift */ + RCR_RXFTH_SHIFT = 13, + /** Rx FIFO treshold part size */ + RCR_RXFTH_SIZE = 3, + + /** Rx buffer length part shift */ + RCR_RBLEN_SHIFT = 11, + /** Rx buffer length part size */ + RCR_RBLEN_SIZE = 2, + + /** 8K + 16 byte rx buffer */ + RCR_RBLEN_8k = 0x00 << RCR_RBLEN_SHIFT, + /** 16K + 16 byte rx buffer */ + RCR_RBLEN_16k = 0x01 << RCR_RBLEN_SHIFT, + /** 32K + 16 byte rx buffer */ + RCR_RBLEN_32k = 0x02 << RCR_RBLEN_SHIFT, + /** 64K + 16 byte rx buffer */ + RCR_RBLEN_64k = 0x03 << RCR_RBLEN_SHIFT, + + /** Max DMA Burst Size part shift */ + RCR_MXDMA_SHIFT = 8, + /** Max DMA Burst Size part size */ + RCR_MXDMA_SIZE = 3, + + /** Rx buffer wrapped */ + RCR_WRAP = 1 << 7, + /** Accept error frame */ + RCR_ACCEPT_ERROR = 1 << 5, + /** Accept Runt (8-64 bytes) frames */ + RCR_ACCEPT_RUNT = 1 << 4, + /** Accept broadcast */ + RCR_ACCEPT_BROADCAST = 1 << 3, + /** Accept multicast */ + RCR_ACCEPT_MULTICAST = 1 << 2, + /** Accept device MAC address match */ + RCR_ACCEPT_PHYS_MATCH = 1 << 1, + /** Accept all frames with phys. destination */ + RCR_ACCEPT_ALL_PHYS = 1 << 0, + /** Mask of accept part */ + RCR_ACCEPT_MASK = (1 << 6) - 1 }; @@ -320,14 +339,18 @@ enum rtl8139_cscr { CS_Testfun = (1 << 15), - CS_LD = (1 << 9), /**< Low TPI link disable signal */ - CS_HEART_BEAT = (1 << 8), /**< Heart beat enable; 10Mbit mode only */ - CS_JABBER_ENABLE = (1 << 7), /**< Enable jabber function */ + /** Low TPI link disable signal */ + CS_LD = (1 << 9), + /** Heart beat enable; 10Mbit mode only */ + CS_HEART_BEAT = (1 << 8), + /** Enable jabber function */ + CS_JABBER_ENABLE = (1 << 7), CS_F_LINK100 = (1 << 6), CS_F_CONNECT = (1 << 5), - CS_CON_STATUS = (1 << 3), /**< connection status: - * 1 = valid, 0 = disconnected - */ - CS_CON_STATUS_EN = (1 << 2), /**< LED1 pin connection status indication */ - CS_PASS_SCR = (1 << 0) /**< Bypass Scramble */ + /** connection status: 1 = valid, 0 = disconnected */ + CS_CON_STATUS = (1 << 3), + /** LED1 pin connection status indication */ + CS_CON_STATUS_EN = (1 << 2), + /** Bypass Scramble */ + CS_PASS_SCR = (1 << 0) }; @@ -360,18 +383,24 @@ /** Auto-negotiation advertisement register */ enum rtl8139_anar { - ANAR_NEXT_PAGE = (1 << 15), /**< Next page bit, 0 - primary capability - * 1 - protocol specific - */ - ANAR_ACK = (1 << 14), /**< Capability reception acknowledge */ - ANAR_REMOTE_FAULT = (1 << 13), /**< Remote fault detection capability */ - ANAR_PAUSE = (1 << 10), /**< Symetric pause frame capability */ - ANAR_100T4 = (1 << 9), /**< T4, not supported by the device */ - ANAR_100TX_FD = (1 << 8), /**< 100BASE_TX full duplex */ - ANAR_100TX_HD = (1 << 7), /**< 100BASE_TX half duplex */ - ANAR_10_FD = (1 << 6), /**< 10BASE_T full duplex */ - ANAR_10_HD = (1 << 5), /**< 10BASE_T half duplex */ - ANAR_SELECTOR = 0x1 /**< Selector, - * CSMA/CD (0x1) supported only - */ + /** Next page bit, 0 - primary capability, 1 - protocol specific */ + ANAR_NEXT_PAGE = (1 << 15), + /** Capability reception acknowledge */ + ANAR_ACK = (1 << 14), + /** Remote fault detection capability */ + ANAR_REMOTE_FAULT = (1 << 13), + /** Symetric pause frame capability */ + ANAR_PAUSE = (1 << 10), + /** T4, not supported by the device */ + ANAR_100T4 = (1 << 9), + /** 100BASE_TX full duplex */ + ANAR_100TX_FD = (1 << 8), + /** 100BASE_TX half duplex */ + ANAR_100TX_HD = (1 << 7), + /** 10BASE_T full duplex */ + ANAR_10_FD = (1 << 6), + /** 10BASE_T half duplex */ + ANAR_10_HD = (1 << 5), + /** Selector, CSMA/CD (0x1) supported only */ + ANAR_SELECTOR = 0x1 }; @@ -409,12 +438,16 @@ enum rtl8139_config4 { - CONFIG4_RxFIFOAutoClr = (1 << 7), /**< Automatic RxFIFO owerflow clear */ - CONFIG4_AnaOff = (1 << 6), /**< Analog poweroff */ - CONFIG4_LongWF = (1 << 5), /**< Long wakeup frame - * (2xCRC8 + 3xCRC16) - */ - CONFIG4_LWPME = (1 << 4), /**< LWAKE and PMEB assertion */ - CONFIG4_LWPTN = (1 << 2), /**< LWake pattern */ - CONFIG4_PBWakeup = (1 << 0) /**< Preboot wakeup */ + /** Automatic RxFIFO owerflow clear */ + CONFIG4_RxFIFOAutoClr = (1 << 7), + /** Analog poweroff */ + CONFIG4_AnaOff = (1 << 6), + /** Long wakeup frame (2xCRC8 + 3xCRC16) */ + CONFIG4_LongWF = (1 << 5), + /** LWAKE and PMEB assertion */ + CONFIG4_LWPME = (1 << 4), + /** LWake pattern */ + CONFIG4_LWPTN = (1 << 2), + /** Preboot wakeup */ + CONFIG4_PBWakeup = (1 << 0) }; @@ -438,31 +471,43 @@ enum rtl8139_tcr_bits { - HWVERID_A_SHIFT = 26, /**< HW version id, part A shift */ - HWVERID_A_SIZE = 5, /**< HW version id, part A bit size */ - HWVERID_A_MASK = (1 << 5) - 1, /**< HW version id, part A mask */ - - IFG_SHIFT = 24, /**< The interframe gap time setting shift */ - IFG_SIZE = 2, /**< The interframe gap time setting bit size */ - - HWVERID_B_SHIFT = 22, /**< HW version id, part B shift */ - HWVERID_B_SIZE = 2, /**< HW version id, part B bit size */ - HWVERID_B_MASK = (1 << 2) - 1, /**< HW version id, part B mask */ - - LOOPBACK_SHIFT = 17, /**< Loopback mode shift */ - LOOPBACK_SIZE = 2, /**< Loopback mode size - * 00 = normal, 11 = loopback - */ - - APPEND_CRC = 1 << 16, /**< Append CRC at the end of a frame */ - - MXTxDMA_SHIFT = 8, /**< Max. DMA Burst per TxDMA shift, burst = 16^value */ - MXTxDMA_SIZE = 3, /**< Max. DMA Burst per TxDMA bit size */ - - TX_RETRY_COUNT_SHIFT = 4, /**< Retries before aborting shift */ - TX_RETRY_COUNT_SIZE = 4, /**< Retries before aborting size */ - - CLEAR_ABORT = 1 << 0 /**< Retransmit aborted frame at the last - * transmitted descriptor - */ + /** HW version id, part A shift */ + HWVERID_A_SHIFT = 26, + /** HW version id, part A bit size */ + HWVERID_A_SIZE = 5, + /** HW version id, part A mask */ + HWVERID_A_MASK = (1 << 5) - 1, + + /** The interframe gap time setting shift */ + IFG_SHIFT = 24, + /** The interframe gap time setting bit size */ + IFG_SIZE = 2, + + /** HW version id, part B shift */ + HWVERID_B_SHIFT = 22, + /** HW version id, part B bit size */ + HWVERID_B_SIZE = 2, + /** HW version id, part B mask */ + HWVERID_B_MASK = (1 << 2) - 1, + + /** Loopback mode shift */ + LOOPBACK_SHIFT = 17, + /** Loopback mode size. 00 = normal, 11 = loopback */ + LOOPBACK_SIZE = 2, + + /** Append CRC at the end of a frame */ + APPEND_CRC = 1 << 16, + + /** Max. DMA Burst per TxDMA shift, burst = 16^value */ + MXTxDMA_SHIFT = 8, + /** Max. DMA Burst per TxDMA bit size */ + MXTxDMA_SIZE = 3, + + /** Retries before aborting shift */ + TX_RETRY_COUNT_SHIFT = 4, + /** Retries before aborting size */ + TX_RETRY_COUNT_SIZE = 4, + + /** Retransmit aborted frame at the last transmitted descriptor */ + CLEAR_ABORT = 1 << 0 }; Index: uspace/lib/compress/inflate.c =================================================================== --- uspace/lib/compress/inflate.c (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/lib/compress/inflate.c (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -319,10 +319,19 @@ uint16_t *symbol) { - uint16_t code = 0; /* Decoded bits */ - size_t first = 0; /* First code of the given length */ - size_t index = 0; /* Index of the first code of the given length - in the symbol table */ - - size_t len; /* Current number of bits in the code */ + /* Decode bits */ + uint16_t code = 0; + + /* First code of the given length */ + size_t first = 0; + + /* + * Index of the first code of the given length + * in the symbol table + */ + size_t index = 0; + + /* Current number of bits in the code */ + size_t len; + for (len = 1; len <= MAX_HUFFMAN_BIT; len++) { /* Get next bit */ Index: uspace/lib/drv/generic/logbuf.c =================================================================== --- uspace/lib/drv/generic/logbuf.c (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/lib/drv/generic/logbuf.c (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -40,5 +40,6 @@ #define REMAINDER_STR_FMT " (%zu)..." /** Expected max size of the remainder string. - * String + terminator + number width (enough for 4GB).*/ + * String + terminator + number width (enough for 4GB). + */ #define REMAINDER_STR_LEN (5 + 1 + 10) @@ -50,4 +51,9 @@ /** Space between two groups. */ #define SPACE_GROUP " " + +/** Formats the dump with space before, takes care of type casting (ugly). */ +#define _FORMAT(digits, bits) \ + snprintf(dump, dump_size, "%s%0" #digits PRIx##bits, \ + space_before, ((uint##bits##_t *)buf)[0]); /** Dump one item into given buffer. @@ -77,9 +83,4 @@ buf += index * item_size; -/* Formats the dump with space before, takes care of type casting (ugly). */ -#define _FORMAT(digits, bits) \ - snprintf(dump, dump_size, "%s%0" #digits PRIx##bits, \ - space_before, ((uint##bits##_t *)buf)[0]); - switch (item_size) { case 4: @@ -90,5 +91,4 @@ return _FORMAT(2, 8); } -#undef _FORMAT } Index: uspace/lib/hound/src/protocol.c =================================================================== --- uspace/lib/hound/src/protocol.c (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/lib/hound/src/protocol.c (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -79,7 +79,7 @@ -/**** +/* * CLIENT - ****/ + */ /** Well defined service name */ @@ -309,9 +309,12 @@ int flags, pcm_format_t format, size_t bsize) { - const format_convert_t c = { .f = { - .channels = format.channels, - .rate = format.sampling_rate / 100, - .format = format.sample_format, - }}; + const format_convert_t c = { + .f = { + .channels = format.channels, + .rate = format.sampling_rate / 100, + .format = format.sample_format, + } + }; + return async_req_4_0(exch, IPC_M_HOUND_STREAM_ENTER, CAP_HANDLE_RAW(id), flags, c.arg, bsize); @@ -362,7 +365,7 @@ } -/**** +/* * SERVER - ****/ + */ static void hound_server_read_data(void *stream); @@ -463,5 +466,5 @@ if (conn) ret = async_data_write_accept( - (void**)&conn_name, true, 0, 0, 0, 0); + (void **)&conn_name, true, 0, 0, 0, 0); if (ret == EOK) @@ -559,7 +562,7 @@ case IPC_M_HOUND_STREAM_ENTER: /* check interface functions */ - if (!server_iface || !server_iface->is_record_context - || !server_iface->add_stream - || !server_iface->rem_stream) { + if (!server_iface || !server_iface->is_record_context || + !server_iface->add_stream || + !server_iface->rem_stream) { async_answer_0(chandle, ENOTSUP); break; @@ -569,9 +572,9 @@ id = (cap_handle_t) IPC_GET_ARG1(call); flags = IPC_GET_ARG2(call); - const format_convert_t c = {.arg = IPC_GET_ARG3(call)}; + const format_convert_t c = { .arg = IPC_GET_ARG3(call) }; const pcm_format_t f = { - .sampling_rate = c.f.rate * 100, - .channels = c.f.channels, - .sample_format = c.f.format, + .sampling_rate = c.f.rate * 100, + .channels = c.f.channels, + .sample_format = c.f.format, }; size_t bsize = IPC_GET_ARG4(call); @@ -587,5 +590,5 @@ server_iface->server, id); if (rec) { - if(server_iface->stream_data_read) { + if (server_iface->stream_data_read) { async_answer_0(chandle, EOK); /* start answering read calls */ @@ -631,6 +634,6 @@ errno_t ret_answer = EOK; /* accept data write or drain */ - while (async_data_write_receive_call(&chandle, &call, &size) - || (IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_DRAIN)) { + while (async_data_write_receive_call(&chandle, &call, &size) || + (IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_DRAIN)) { /* check drain first */ if (IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_DRAIN) { @@ -660,6 +663,6 @@ } } - const errno_t ret = IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_EXIT - ? EOK : EINVAL; + const errno_t ret = IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_EXIT ? + EOK : EINVAL; async_answer_0(chandle, ret); @@ -678,6 +681,6 @@ errno_t ret_answer = EOK; /* accept data read and drain */ - while (async_data_read_receive_call(&chandle, &call, &size) - || (IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_DRAIN)) { + while (async_data_read_receive_call(&chandle, &call, &size) || + (IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_DRAIN)) { /* drain does not make much sense but it is allowed */ if (IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_DRAIN) { @@ -704,6 +707,6 @@ } } - const errno_t ret = IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_EXIT - ? EOK : EINVAL; + const errno_t ret = IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_EXIT ? + EOK : EINVAL; async_answer_0(chandle, ret); @@ -711,7 +714,7 @@ -/*** +/* * SERVER SIDE - ***/ + */ /** Index: uspace/lib/label/include/std/fat.h =================================================================== --- uspace/lib/label/include/std/fat.h (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/lib/label/include/std/fat.h (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -51,20 +51,34 @@ typedef struct fat_bs { - uint8_t ji[3]; /**< Jump instruction. */ + /** Jump instruction */ + uint8_t ji[3]; uint8_t oem_name[8]; + /* BIOS Parameter Block */ - uint16_t bps; /**< Bytes per sector. */ - uint8_t spc; /**< Sectors per cluster. */ - uint16_t rscnt; /**< Reserved sector count. */ - uint8_t fatcnt; /**< Number of FATs. */ - uint16_t root_ent_max; /**< Maximum number of root directory - entries. */ - uint16_t totsec16; /**< Total sectors. 16-bit version. */ - uint8_t mdesc; /**< Media descriptor. */ - uint16_t sec_per_fat; /**< Sectors per FAT12/FAT16. */ - uint16_t sec_per_track; /**< Sectors per track. */ - uint16_t headcnt; /**< Number of heads. */ - uint32_t hidden_sec; /**< Hidden sectors. */ - uint32_t totsec32; /**< Total sectors. 32-bit version. */ + + /** Bytes per sector */ + uint16_t bps; + /** Sectors per cluster */ + uint8_t spc; + /** Reserved sector count */ + uint16_t rscnt; + /** Number of FATs */ + uint8_t fatcnt; + /** Maximum number of root directory entries */ + uint16_t root_ent_max; + /** Total sectors. 16-bit version */ + uint16_t totsec16; + /** Media descriptor */ + uint8_t mdesc; + /** Sectors per FAT12/FAT16 */ + uint16_t sec_per_fat; + /** Sectors per track */ + uint16_t sec_per_track; + /** Number of heads */ + uint16_t headcnt; + /** Hidden sectors */ + uint32_t hidden_sec; + /** Total sectors. 32-bit version */ + uint32_t totsec32; union { Index: uspace/lib/posix/src/fnmatch.c =================================================================== --- uspace/lib/posix/src/fnmatch.c (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/lib/posix/src/fnmatch.c (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -33,5 +33,6 @@ */ -/* This file contains an implementation of the fnmatch() pattern matching +/* + * This file contains an implementation of the fnmatch() pattern matching * function. There is more code than necessary to account for the possibility * of adding POSIX-like locale support to the system in the future. Functions @@ -54,5 +55,6 @@ #define INVALID_PATTERN -1 -/* Type for collating element, simple identity with characters now, +/* + * Type for collating element, simple identity with characters now, * but may be extended for better locale support. */ @@ -70,5 +72,5 @@ * @return Matching collating element or COLL_ELM_INVALID. */ -static coll_elm_t _coll_elm_get(const char* str) +static coll_elm_t _coll_elm_get(const char *str) { if (str[0] == '\0' || str[1] != '\0') { @@ -306,25 +308,5 @@ } -/** - * Matches the beginning of the given string against a bracket expression - * the pattern begins with. - * - * @param pattern Pointer to the beginning of a bracket expression in a pattern. - * On success, the pointer is moved to the first character after the - * bracket expression. - * @param str Unmatched part of the string. - * @param flags Flags given to fnmatch(). - * @return INVALID_PATTERN if the pattern is invalid, 0 if there is no match - * or the number of matched characters on success. - */ -static int _match_bracket_expr(const char **pattern, const char *str, int flags) -{ - const bool pathname = (flags & FNM_PATHNAME) != 0; - const bool special_period = (flags & FNM_PERIOD) != 0; - const char *p = *pattern; - bool negative = false; - int matched = 0; - - #define _matched(match) { \ +#define _matched(match) { \ int _match = match; \ if (_match < 0) { \ @@ -337,4 +319,24 @@ } +/** + * Matches the beginning of the given string against a bracket expression + * the pattern begins with. + * + * @param pattern Pointer to the beginning of a bracket expression in a pattern. + * On success, the pointer is moved to the first character after the + * bracket expression. + * @param str Unmatched part of the string. + * @param flags Flags given to fnmatch(). + * @return INVALID_PATTERN if the pattern is invalid, 0 if there is no match + * or the number of matched characters on success. + */ +static int _match_bracket_expr(const char **pattern, const char *str, int flags) +{ + const bool pathname = (flags & FNM_PATHNAME) != 0; + const bool special_period = (flags & FNM_PERIOD) != 0; + const char *p = *pattern; + bool negative = false; + int matched = 0; + assert(*p == '['); /* calling code should ensure this */ p++; @@ -342,5 +344,6 @@ if (*str == '\0' || (pathname && *str == '/') || (pathname && special_period && *str == '.' && *(str - 1) == '/')) { - /* No bracket expression matches end of string, + /* + * No bracket expression matches end of string, * slash in pathname match or initial period with FNM_PERIOD * option. @@ -398,6 +401,4 @@ return negative ? 0 : matched; } - - #undef _matched } @@ -416,5 +417,6 @@ static bool _partial_match(const char **pattern, const char **string, int flags) { - /* Only a single *-delimited subpattern is matched here. + /* + * Only a single *-delimited subpattern is matched here. * So in this function, '*' is understood as the end of pattern. */ @@ -473,5 +475,6 @@ if (*p == '\0') { - /* End of pattern, must match end of string or + /* + * End of pattern, must match end of string or * an end of subdirectory name (optional). */ @@ -628,12 +631,12 @@ #include +#define fnmatch_test(x) { if (x) printf("SUCCESS: "#x"\n"); else { printf("FAILED: "#x"\n"); fail++; } } +#define match(s1, s2, flags) fnmatch_test(fnmatch(s1, s2, flags) == 0) +#define nomatch(s1, s2, flags) fnmatch_test(fnmatch(s1, s2, flags) == FNM_NOMATCH) + void __posix_fnmatch_test() { int fail = 0; - #undef assert - #define assert(x) { if (x) printf("SUCCESS: "#x"\n"); else { printf("FAILED: "#x"\n"); fail++; } } - #define match(s1, s2, flags) assert(fnmatch(s1, s2, flags) == 0) - #define nomatch(s1, s2, flags) assert(fnmatch(s1, s2, flags) == FNM_NOMATCH) static_assert(FNM_PATHNAME == FNM_FILE_NAME); Index: uspace/lib/usb/include/usb/classes/hub.h =================================================================== --- uspace/lib/usb/include/usb/classes/hub.h (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/lib/usb/include/usb/classes/hub.h (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -149,14 +149,4 @@ uint8_t characteristics; -#define HUB_CHAR_POWER_PER_PORT_FLAG (1 << 0) -#define HUB_CHAR_NO_POWER_SWITCH_FLAG (1 << 1) -#define HUB_CHAR_COMPOUND_DEVICE (1 << 2) -#define HUB_CHAR_OC_PER_PORT_FLAG (1 << 3) -#define HUB_CHAR_NO_OC_FLAG (1 << 4) - -/* These are invalid for superspeed hub */ -#define HUB_CHAR_TT_THINK_16 (1 << 5) -#define HUB_CHAR_TT_THINK_8 (1 << 6) -#define HUB_CHAR_INDICATORS_FLAG (1 << 7) /** Unused part of characteristics field */ @@ -179,4 +169,18 @@ uint8_t max_current; } __attribute__((packed)) usb_hub_descriptor_header_t; + +/* + * USB hub characteristics + */ +#define HUB_CHAR_POWER_PER_PORT_FLAG (1 << 0) +#define HUB_CHAR_NO_POWER_SWITCH_FLAG (1 << 1) +#define HUB_CHAR_COMPOUND_DEVICE (1 << 2) +#define HUB_CHAR_OC_PER_PORT_FLAG (1 << 3) +#define HUB_CHAR_NO_OC_FLAG (1 << 4) + +/* These are invalid for superspeed hub */ +#define HUB_CHAR_TT_THINK_16 (1 << 5) +#define HUB_CHAR_TT_THINK_8 (1 << 6) +#define HUB_CHAR_INDICATORS_FLAG (1 << 7) /** One bit for the device and one bit for every port */ Index: uspace/lib/usbhost/src/ddf_helpers.c =================================================================== --- uspace/lib/usbhost/src/ddf_helpers.c (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/lib/usbhost/src/ddf_helpers.c (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -66,5 +66,5 @@ */ static errno_t register_endpoint(ddf_fun_t *fun, usb_pipe_desc_t *pipe_desc, - const usb_endpoint_descriptors_t *ep_desc) + const usb_endpoint_descriptors_t *ep_desc) { assert(fun); @@ -92,12 +92,12 @@ } - /** - * DDF usbhc_iface callback. Unregister endpoint that makes the other end of - * the pipe described. - * - * @param fun DDF function of the device in question. - * @param pipe_desc Pipe description. - * @return Error code. - */ +/** + * DDF usbhc_iface callback. Unregister endpoint that makes the other end of + * the pipe described. + * + * @param fun DDF function of the device in question. + * @param pipe_desc Pipe description. + * @return Error code. + */ static errno_t unregister_endpoint(ddf_fun_t *fun, const usb_pipe_desc_t *pipe_desc) { @@ -182,5 +182,6 @@ } - /* If the driver didn't name the dev when enumerating, + /* + * If the driver didn't name the dev when enumerating, * do it in some generic way. */ @@ -281,9 +282,11 @@ assert(dev); - const usb_target_t target = {{ - .address = dev->address, - .endpoint = ifreq->endpoint, - .stream = ifreq->stream, - }}; + const usb_target_t target = { + { + .address = dev->address, + .endpoint = ifreq->endpoint, + .stream = ifreq->stream, + } + }; if (!usb_target_is_valid(&target)) Index: uspace/lib/usbhost/src/usb2_bus.c =================================================================== --- uspace/lib/usbhost/src/usb2_bus.c (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/lib/usbhost/src/usb2_bus.c (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -89,8 +89,10 @@ } -static const usb_target_t usb2_default_target = {{ - .address = USB_ADDRESS_DEFAULT, - .endpoint = 0, -}}; +static const usb_target_t usb2_default_target = { + { + .address = USB_ADDRESS_DEFAULT, + .endpoint = 0, + } +}; /** @@ -120,5 +122,5 @@ usb_endpoint_descriptors_t ep0_desc = { - .endpoint.max_packet_size = CTRL_PIPE_MIN_PACKET_SIZE, + .endpoint.max_packet_size = CTRL_PIPE_MIN_PACKET_SIZE, }; Index: uspace/lib/usbhost/src/utility.c =================================================================== --- uspace/lib/usbhost/src/utility.c (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/lib/usbhost/src/utility.c (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -84,8 +84,10 @@ } - const usb_target_t control_ep = {{ - .address = dev->address, - .endpoint = 0, - }}; + const usb_target_t control_ep = { + { + .address = dev->address, + .endpoint = 0, + } + }; usb_standard_device_descriptor_t desc = { 0 }; @@ -123,8 +125,10 @@ int hc_get_device_desc(device_t *device, usb_standard_device_descriptor_t *desc) { - const usb_target_t control_ep = {{ - .address = device->address, - .endpoint = 0, - }}; + const usb_target_t control_ep = { + { + .address = device->address, + .endpoint = 0, + } + }; /* Get std device descriptor */ @@ -147,16 +151,18 @@ int hc_get_hub_desc(device_t *device, usb_hub_descriptor_header_t *desc) { - const usb_target_t control_ep = {{ - .address = device->address, - .endpoint = 0, - }}; - - const usb_descriptor_type_t type = device->speed >= USB_SPEED_SUPER - ? USB_DESCTYPE_SSPEED_HUB : USB_DESCTYPE_HUB; + const usb_target_t control_ep = { + { + .address = device->address, + .endpoint = 0, + } + }; + + const usb_descriptor_type_t type = device->speed >= USB_SPEED_SUPER ? + USB_DESCTYPE_SSPEED_HUB : USB_DESCTYPE_HUB; const usb_device_request_setup_packet_t get_hub_desc = { - .request_type = SETUP_REQUEST_TYPE_DEVICE_TO_HOST - | (USB_REQUEST_TYPE_CLASS << 5) - | USB_REQUEST_RECIPIENT_DEVICE, + .request_type = SETUP_REQUEST_TYPE_DEVICE_TO_HOST | + (USB_REQUEST_TYPE_CLASS << 5) | + USB_REQUEST_RECIPIENT_DEVICE, .request = USB_DEVREQ_GET_DESCRIPTOR, .value = uint16_host2usb(type << 8), @@ -244,14 +250,13 @@ void hc_reset_toggles(const usb_transfer_batch_t *batch, endpoint_reset_toggle_t reset_cb) { - if (batch->ep->transfer_type != USB_TRANSFER_CONTROL - || batch->dir != USB_DIRECTION_OUT) + if (batch->ep->transfer_type != USB_TRANSFER_CONTROL || + batch->dir != USB_DIRECTION_OUT) return; const usb_device_request_setup_packet_t *request = &batch->setup.packet; - device_t * const dev = batch->ep->device; - - switch (request->request) - { - /* Clear Feature ENPOINT_STALL */ + device_t *const dev = batch->ep->device; + + switch (request->request) { + /* Clear Feature ENPOINT_STALL */ case USB_DEVREQ_CLEAR_FEATURE: /*resets only cleared ep */ /* 0x2 ( HOST to device | STANDART | TO ENPOINT) */ @@ -273,9 +278,11 @@ case USB_DEVREQ_SET_CONFIGURATION: case USB_DEVREQ_SET_INTERFACE: - /* Recipient must be device, this resets all endpoints, + /* + * Recipient must be device, this resets all endpoints, * In fact there should be no endpoints but EP 0 registered * as different interfaces use different endpoints, * unless you're changing configuration or alternative - * interface of an already setup device. */ + * interface of an already setup device. + */ if (!(request->request_type & SETUP_REQUEST_TYPE_DEVICE_TO_HOST)) for (usb_endpoint_t i = 0; i < 2 * USB_ENDPOINT_MAX; ++i) Index: uspace/srv/fs/fat/fat.h =================================================================== --- uspace/srv/fs/fat/fat.h (revision 4f8772d4d5ecb28999d787aebab937222f9f97d8) +++ uspace/srv/fs/fat/fat.h (revision 904b1bc3e43b98f81bec9e9296b154371c383776) @@ -70,20 +70,34 @@ typedef struct fat_bs { - uint8_t ji[3]; /**< Jump instruction. */ + /** Jump instruction */ + uint8_t ji[3]; uint8_t oem_name[8]; + /* BIOS Parameter Block */ - uint16_t bps; /**< Bytes per sector. */ - uint8_t spc; /**< Sectors per cluster. */ - uint16_t rscnt; /**< Reserved sector count. */ - uint8_t fatcnt; /**< Number of FATs. */ - uint16_t root_ent_max; /**< Maximum number of root directory - entries. */ - uint16_t totsec16; /**< Total sectors. 16-bit version. */ - uint8_t mdesc; /**< Media descriptor. */ - uint16_t sec_per_fat; /**< Sectors per FAT12/FAT16. */ - uint16_t sec_per_track; /**< Sectors per track. */ - uint16_t headcnt; /**< Number of heads. */ - uint32_t hidden_sec; /**< Hidden sectors. */ - uint32_t totsec32; /**< Total sectors. 32-bit version. */ + + /** Bytes per sector */ + uint16_t bps; + /** Sectors per cluster */ + uint8_t spc; + /** Reserved sector count */ + uint16_t rscnt; + /** Number of FATs */ + uint8_t fatcnt; + /** Maximum number of root directory entries */ + uint16_t root_ent_max; + /** Total sectors. 16-bit version */ + uint16_t totsec16; + /** Media descriptor */ + uint8_t mdesc; + /** Sectors per FAT12/FAT16 */ + uint16_t sec_per_fat; + /** Sectors per track */ + uint16_t sec_per_track; + /** Number of heads */ + uint16_t headcnt; + /** Hidden sectors */ + uint32_t hidden_sec; + /** Total sectors. 32-bit version */ + uint32_t totsec32; union {