Context Navigation

Changeset 95f1b8f in mainline

Timestamp:

2018-02-24T19:51:28Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

Children:

5ef3afd

Parents:

0539c14

git-author:

Ondřej Hlavatý <aearsis@…> (2018-02-24 18:29:28)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-02-24 19:51:28)

Message:

usb: structures shared with hardware are both packed and aligned

Location:

uspace/drv/bus/usb

Files:

r0539c14	r95f1b8f
72	72	/* 64 bit struct only */
73	73	volatile uint32_t extended_bp[7];
74		} itd_t;
	74	} __attribute__((packed,aligned(32))) itd_t;
75	75	#endif
76	76	/**

r0539c14	r95f1b8f
143	143	/* 64 bit struct only */
144	144	volatile uint32_t extended_bp[5];
145		} qh_t;
	145	} __attribute__((packed,aligned(32))) qh_t;
146	146
147	147	static inline void qh_append_qh(qh_t qh, const qh_t next)

r0539c14	r95f1b8f
89	89	/* 64 bit struct only */
90	90	volatile uint32_t extended_bp[2];
91		} sitd_t;
	91	} __attribute__((packed,aligned(32))) sitd_t;
92	92	#endif
93	93	/**

-              r0539c14
+              r95f1b8f
         volatile uint32_t extended_bp[5];
+        /* TDs must be 32-byte aligned */
+        PADD32 [3];
+} __attribute__((packed)) td_t;
+} __attribute__((packed,aligned(32))) td_t;
 static_assert(sizeof(td_t) % 32 == 0);

r0539c14	r95f1b8f
106	106	#define ED_NEXT_PTR_MASK (0xfffffff0)
107	107	#define ED_NEXT_PTR_SHIFT (0)
108		} __attribute__((packed)) ed_t;
	108	} __attribute__((packed,aligned(32))) ed_t;
109	109
110	110	void ed_init(ed_t instance, const endpoint_t ep, const td_t *td);

r0539c14	r95f1b8f
69	69	#define ITD_OFFSET_CC_SHIFT (12)
70	70
71		} __attribute__((packed)) itd_t;
	71	} __attribute__((packed,aligned(32))) itd_t;
72	72
73	73	#endif

r0539c14	r95f1b8f
90	90	*/
91	91	volatile uint32_t be;
92		} __attribute__((packed)) td_t;
	92	} __attribute__((packed,aligned(32))) td_t;
93	93
94	94	void td_init(td_t , const td_t , usb_direction_t, const void *, size_t, int);

r0539c14	r95f1b8f
50	50	/** Pointer to the contained entities (execution controlled by vertical flag*/
51	51	volatile link_pointer_t element;
52		} __attribute__((packed)) qh_t;
	52	} __attribute__((packed,aligned(16))) qh_t;
53	53
54	54	/** Initialize queue head structure

r0539c14	r95f1b8f
95	95	* memory just needs to be aligned. We don't use it anyway.
96	96	*/
97		} __attribute__((packed)) td_t;
	97	} __attribute__((packed,aligned(16))) td_t;
98	98
99	99

Note: See TracChangeset for help on using the changeset viewer.