@@ -210,108 +210,108 @@ extern int uclogic_params_init(struct uclogic_params *params,
210210
211211/* Tablet interface parameters *printf format string */
212212#define UCLOGIC_PARAMS_FMT_STR \
213- ".invalid = %s\n" \
214- ".desc_ptr = %p\n" \
215- ".desc_size = %u\n" \
216- ".pen = {\n" \
217- "\t.desc_ptr = %p\n" \
218- "\t.desc_size = %u\n" \
219- "\t.id = %u\n" \
220- "\t.subreport_list = {\n" \
221- "\t\t{0x%02hhx, %hhu},\n" \
222- "\t\t{0x%02hhx, %hhu},\n" \
223- "\t\t{0x%02hhx, %hhu},\n" \
224- "\t}\n" \
225- "\t.inrange = %s\n" \
226- "\t.fragmented_hires = %s\n" \
227- "\t.tilt_y_flipped = %s\n" \
228- "}\n" \
229- ".frame_list = {\n" \
230- "\t{\n" \
231- "\t\t.desc_ptr = %p\n" \
232- "\t\t.desc_size = %u\n" \
233- "\t\t.id = %u\n" \
234- "\t\t.suffix = %s\n" \
235- "\t\t.re_lsb = %u\n" \
236- "\t\t.dev_id_byte = %u\n" \
237- "\t\t.touch_ring_byte = %u\n" \
238- "\t\t.touch_ring_max = %hhd\n" \
239- "\t\t.touch_ring_flip_at = %hhd\n" \
240- "\t\t.bitmap_dial_byte = %u\n" \
241- "\t},\n" \
242- "\t{\n" \
243- "\t\t.desc_ptr = %p\n" \
244- "\t\t.desc_size = %u\n" \
245- "\t\t.id = %u\n" \
246- "\t\t.suffix = %s\n" \
247- "\t\t.re_lsb = %u\n" \
248- "\t\t.dev_id_byte = %u\n" \
249- "\t\t.touch_ring_byte = %u\n" \
250- "\t\t.touch_ring_max = %hhd\n" \
251- "\t\t.touch_ring_flip_at = %hhd\n" \
252- "\t\t.bitmap_dial_byte = %u\n" \
253- "\t},\n" \
254- "\t{\n" \
255- "\t\t.desc_ptr = %p\n" \
256- "\t\t.desc_size = %u\n" \
257- "\t\t.id = %u\n" \
258- "\t\t.suffix = %s\n" \
259- "\t\t.re_lsb = %u\n" \
260- "\t\t.dev_id_byte = %u\n" \
261- "\t\t.touch_ring_byte = %u\n" \
262- "\t\t.touch_ring_max = %hhd\n" \
263- "\t\t.touch_ring_flip_at = %hhd\n" \
264- "\t\t.bitmap_dial_byte = %u\n" \
265- "\t},\n" \
266- "}\n"
213+ ".invalid = %s\n" \
214+ ".desc_ptr = %p\n" \
215+ ".desc_size = %u\n" \
216+ ".pen = {\n" \
217+ "\t.desc_ptr = %p\n" \
218+ "\t.desc_size = %u\n" \
219+ "\t.id = %u\n" \
220+ "\t.subreport_list = {\n" \
221+ "\t\t{0x%02hhx, %hhu},\n" \
222+ "\t\t{0x%02hhx, %hhu},\n" \
223+ "\t\t{0x%02hhx, %hhu},\n" \
224+ "\t}\n" \
225+ "\t.inrange = %s\n" \
226+ "\t.fragmented_hires = %s\n" \
227+ "\t.tilt_y_flipped = %s\n" \
228+ "}\n" \
229+ ".frame_list = {\n" \
230+ "\t{\n" \
231+ "\t\t.desc_ptr = %p\n" \
232+ "\t\t.desc_size = %u\n" \
233+ "\t\t.id = %u\n" \
234+ "\t\t.suffix = %s\n" \
235+ "\t\t.re_lsb = %u\n" \
236+ "\t\t.dev_id_byte = %u\n" \
237+ "\t\t.touch_ring_byte = %u\n" \
238+ "\t\t.touch_ring_max = %hhd\n" \
239+ "\t\t.touch_ring_flip_at = %hhd\n" \
240+ "\t\t.bitmap_dial_byte = %u\n" \
241+ "\t},\n" \
242+ "\t{\n" \
243+ "\t\t.desc_ptr = %p\n" \
244+ "\t\t.desc_size = %u\n" \
245+ "\t\t.id = %u\n" \
246+ "\t\t.suffix = %s\n" \
247+ "\t\t.re_lsb = %u\n" \
248+ "\t\t.dev_id_byte = %u\n" \
249+ "\t\t.touch_ring_byte = %u\n" \
250+ "\t\t.touch_ring_max = %hhd\n" \
251+ "\t\t.touch_ring_flip_at = %hhd\n" \
252+ "\t\t.bitmap_dial_byte = %u\n" \
253+ "\t},\n" \
254+ "\t{\n" \
255+ "\t\t.desc_ptr = %p\n" \
256+ "\t\t.desc_size = %u\n" \
257+ "\t\t.id = %u\n" \
258+ "\t\t.suffix = %s\n" \
259+ "\t\t.re_lsb = %u\n" \
260+ "\t\t.dev_id_byte = %u\n" \
261+ "\t\t.touch_ring_byte = %u\n" \
262+ "\t\t.touch_ring_max = %hhd\n" \
263+ "\t\t.touch_ring_flip_at = %hhd\n" \
264+ "\t\t.bitmap_dial_byte = %u\n" \
265+ "\t},\n" \
266+ "}\n"
267267
268268/* Tablet interface parameters *printf format arguments */
269269#define UCLOGIC_PARAMS_FMT_ARGS (_params ) \
270- ((_params)->invalid ? "true" : "false"), \
271- (_params)->desc_ptr, \
272- (_params)->desc_size, \
273- (_params)->pen.desc_ptr, \
274- (_params)->pen.desc_size, \
275- (_params)->pen.id, \
276- (_params)->pen.subreport_list[0].value, \
277- (_params)->pen.subreport_list[0].id, \
278- (_params)->pen.subreport_list[1].value, \
279- (_params)->pen.subreport_list[1].id, \
280- (_params)->pen.subreport_list[2].value, \
281- (_params)->pen.subreport_list[2].id, \
282- uclogic_params_pen_inrange_to_str((_params)->pen.inrange), \
283- ((_params)->pen.fragmented_hires ? "true" : "false"), \
284- ((_params)->pen.tilt_y_flipped ? "true" : "false"), \
285- (_params)->frame_list[0].desc_ptr, \
286- (_params)->frame_list[0].desc_size, \
287- (_params)->frame_list[0].id, \
288- (_params)->frame_list[0].suffix, \
289- (_params)->frame_list[0].re_lsb, \
290- (_params)->frame_list[0].dev_id_byte, \
291- (_params)->frame_list[0].touch_ring_byte, \
292- (_params)->frame_list[0].touch_ring_max, \
293- (_params)->frame_list[0].touch_ring_flip_at, \
294- (_params)->frame_list[0].bitmap_dial_byte, \
295- (_params)->frame_list[1].desc_ptr, \
296- (_params)->frame_list[1].desc_size, \
297- (_params)->frame_list[1].id, \
298- (_params)->frame_list[1].suffix, \
299- (_params)->frame_list[1].re_lsb, \
300- (_params)->frame_list[1].dev_id_byte, \
301- (_params)->frame_list[1].touch_ring_byte, \
302- (_params)->frame_list[1].touch_ring_max, \
303- (_params)->frame_list[1].touch_ring_flip_at, \
304- (_params)->frame_list[1].bitmap_dial_byte, \
305- (_params)->frame_list[2].desc_ptr, \
306- (_params)->frame_list[2].desc_size, \
307- (_params)->frame_list[2].id, \
308- (_params)->frame_list[2].suffix, \
309- (_params)->frame_list[2].re_lsb, \
310- (_params)->frame_list[2].dev_id_byte, \
311- (_params)->frame_list[2].touch_ring_byte, \
312- (_params)->frame_list[2].touch_ring_max, \
313- (_params)->frame_list[2].touch_ring_flip_at, \
314- (_params)->frame_list[2].bitmap_dial_byte
270+ ((_params)->invalid ? "true" : "false"), \
271+ (_params)->desc_ptr, \
272+ (_params)->desc_size, \
273+ (_params)->pen.desc_ptr, \
274+ (_params)->pen.desc_size, \
275+ (_params)->pen.id, \
276+ (_params)->pen.subreport_list[0].value, \
277+ (_params)->pen.subreport_list[0].id, \
278+ (_params)->pen.subreport_list[1].value, \
279+ (_params)->pen.subreport_list[1].id, \
280+ (_params)->pen.subreport_list[2].value, \
281+ (_params)->pen.subreport_list[2].id, \
282+ uclogic_params_pen_inrange_to_str((_params)->pen.inrange), \
283+ ((_params)->pen.fragmented_hires ? "true" : "false"), \
284+ ((_params)->pen.tilt_y_flipped ? "true" : "false"), \
285+ (_params)->frame_list[0].desc_ptr, \
286+ (_params)->frame_list[0].desc_size, \
287+ (_params)->frame_list[0].id, \
288+ (_params)->frame_list[0].suffix, \
289+ (_params)->frame_list[0].re_lsb, \
290+ (_params)->frame_list[0].dev_id_byte, \
291+ (_params)->frame_list[0].touch_ring_byte, \
292+ (_params)->frame_list[0].touch_ring_max, \
293+ (_params)->frame_list[0].touch_ring_flip_at, \
294+ (_params)->frame_list[0].bitmap_dial_byte, \
295+ (_params)->frame_list[1].desc_ptr, \
296+ (_params)->frame_list[1].desc_size, \
297+ (_params)->frame_list[1].id, \
298+ (_params)->frame_list[1].suffix, \
299+ (_params)->frame_list[1].re_lsb, \
300+ (_params)->frame_list[1].dev_id_byte, \
301+ (_params)->frame_list[1].touch_ring_byte, \
302+ (_params)->frame_list[1].touch_ring_max, \
303+ (_params)->frame_list[1].touch_ring_flip_at, \
304+ (_params)->frame_list[1].bitmap_dial_byte, \
305+ (_params)->frame_list[2].desc_ptr, \
306+ (_params)->frame_list[2].desc_size, \
307+ (_params)->frame_list[2].id, \
308+ (_params)->frame_list[2].suffix, \
309+ (_params)->frame_list[2].re_lsb, \
310+ (_params)->frame_list[2].dev_id_byte, \
311+ (_params)->frame_list[2].touch_ring_byte, \
312+ (_params)->frame_list[2].touch_ring_max, \
313+ (_params)->frame_list[2].touch_ring_flip_at, \
314+ (_params)->frame_list[2].bitmap_dial_byte
315315
316316/* Get a replacement report descriptor for a tablet's interface. */
317317extern int uclogic_params_get_desc (const struct uclogic_params * params ,
0 commit comments