slp
/
selphy_print
1
0
Fork 0
Code Issues Pull Requests Activity

sonyupdneo: Fix job parsing, and add correct VID/PID to regression list.

This commit is contained in:
Solomon Peachy 2019-11-02 14:32:12 -04:00
parent 1fe3a6066b
commit 3cf41c8018
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend_sonyupdneo.c
View File

@ -166,7 +166,7 @@ static int updneo_read_parse(void *vctx, const void **vjob, int data_fd, int cop
}
/* PDL type */
char *tok = strtok((char*)job->databuf + job->datalen + 8, "\r\n,");
char *tok = strtok((char*)&tmpbuf[8], "\r\n,");
if (!tok) {
updneo_cleanup_job(job);
ERROR("Invalid spool format (PDL)!\n");
@ -207,7 +207,7 @@ static int updneo_read_parse(void *vctx, const void **vjob, int data_fd, int cop
ptr = job->ftrbuf;
lenptr = &job->ftrlen;
run = 0;
} else if (!strncmp("SONY-PDL-DS2", tok, 12)) {
} else if (!strncmp("PDL", tok, 3)) {
job->databuf = malloc(len);
if (!job->databuf) {
ERROR("Memory allocation failure!\n");

3
regression-gp.csv
View File

@ -220,6 +220,9 @@ sony-upcr20l,0x054c,0xbcde,,PageSize=B7
sony-upcr20l,0x054c,0xbcde,,PageSize=w360h504
sony-upcr20l,0x054c,0xbcde,,PageSize=w360h504-div2
#
sony-updr80md,0x054c,0x03c3,,PageSize=Letter
sony-updr80md,0x054c,0x03c3,,PageSize=A4
#
mitsubishi-p93d,0x06d3,0x0398,,PageSize=w213h284
mitsubishi-p93d,0x06d3,0x0398,,PageSize=w227h284
mitsubishi-p93d,0x06d3,0x0398,,PageSize=w284h284

1 #gp_printername,vid,pid,type,gp_options
220 sony-upcr20l,0x054c,0xbcde,,PageSize=w360h504
221 sony-upcr20l,0x054c,0xbcde,,PageSize=w360h504-div2
222 #
223 sony-updr80md,0x054c,0x03c3,,PageSize=Letter
224 sony-updr80md,0x054c,0x03c3,,PageSize=A4
225 #
226 mitsubishi-p93d,0x06d3,0x0398,,PageSize=w213h284
227 mitsubishi-p93d,0x06d3,0x0398,,PageSize=w227h284
228 mitsubishi-p93d,0x06d3,0x0398,,PageSize=w284h284

2
regression.csv
View File

@ -110,7 +110,7 @@ sony-upd897,0x054c,0x01e7,sony_upd897-1280x1280.raw,
#
# 'sonyupdneo'
#
sony-updr80md,0x054c,0xcdef,sony_updr80md-a4.raw,
sony-updr80md,0x054c,0x03c3,sony_updr80md-a4.raw,
sony-upcr20l,0x054c,0xbcde,sony_upcr20l_4x6.raw,
sony-upcr20l,0x054c,0xbcde,sony_upcr20l_8x6.raw,
sony-upd898,0x054c,0xabcd,sony_upd898-1280x960.raw

1 #backend,vid,pid,filename,mediatype
110 #
111 # 'sonyupdneo'
112 #
113 sony-updr80md,0x054c,0xcdef,sony_updr80md-a4.raw, sony-updr80md,0x054c,0x03c3,sony_updr80md-a4.raw,
114 sony-upcr20l,0x054c,0xbcde,sony_upcr20l_4x6.raw,
115 sony-upcr20l,0x054c,0xbcde,sony_upcr20l_8x6.raw,
116 sony-upd898,0x054c,0xabcd,sony_upd898-1280x960.raw