From 9047c29951456bcea83933b4bf38aa97b881fc05 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Tue, 11 Dec 2012 12:16:23 -0500 Subject: [PATCH] [linux] Delete the selphy_print_linux tool. The libusb backend does everything, and better. Also, it can't handle the CP-10 properly. --- Makefile | 5 +- selphy_print_linux.c | 255 ------------------------------------------- 2 files changed, 1 insertion(+), 259 deletions(-) delete mode 100644 selphy_print_linux.c diff --git a/Makefile b/Makefile index 523d12e..9e35501 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,7 @@ CFLAGS = -Wall CUPS_BACKENDS = /usr/lib/cups/backend -all: selphy_print_linux selphy_print - -selphy_print_linux: selphy_print_linux.c selphy_print_common.h - gcc -o selphy_print_linux selphy_print_linux.c $(CFLAGS) +all: selphy_print selphy_print: selphy_print.c selphy_print_common.h gcc -o selphy_print selphy_print.c -lusb-1.0 $(CFLAGS) diff --git a/selphy_print_linux.c b/selphy_print_linux.c deleted file mode 100644 index eaf7dfb..0000000 --- a/selphy_print_linux.c +++ /dev/null @@ -1,255 +0,0 @@ -/* - * Canon SELPHY ES/CP series print assister -- Native Linux version - * - * (c) 2007-2012 Solomon Peachy - * - * The latest version of this program can be found at - * - * http://git.shaftnet.org/git/gitweb.cgi?p=selphy_print.git - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 3 of the License, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * [http://www.gnu.org/licenses/gpl-3.0.html] - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "selphy_print_common.h" - -#define dump_data dump_data_linux - -int dump_data_linux(int remaining, int present, int data_fd, - int dev_fd, uint8_t *buf, uint16_t buflen) -{ - int cnt; - int i; - int wrote; - - while (remaining > 0) { - cnt = read(data_fd, buf, (remaining < buflen) ? remaining : buflen); - - if (cnt < 0) - return -1; - - if (present) { - cnt += present; - present = 0; - } - - i = write(dev_fd, buf, cnt); - if (i < 0) - return wrote; - if (i != cnt) { - /* Realign buffer.. */ - present = cnt - i; - memmove(buf, buf + i, present); - } - wrote += i; - remaining -= cnt; - } - - DEBUG("Wrote %d bytes (%d)\n", wrote, buflen); - - return wrote; -} - -int main(int argc, char **argv) -{ - int dev_fd, data_fd; - - uint8_t buffer[BUF_LEN]; - uint8_t rdbuf[READBACK_LEN]; - uint8_t rdbuf2[READBACK_LEN]; - - int last_state, state = S_IDLE; - int printer_type = P_END; - int printer_type2 = P_END; - int plane_len = 0; - int bw_mode = 0; - int16_t paper_code_offset = -1; - int16_t paper_code = -1; - - /* Static initialization */ - setup_paper_codes(); - - /* Cmdline help */ - if (argc < 2) { - DEBUG("SELPHY ES/CP Print Assist version %s\n\nUsage:\n\t%s [ infile | - ] [ outdev ]\n\n", - VERSION, - argv[0]); - exit(1); - } - - /* Open input file */ - data_fd = fileno(stdin); - if (strcmp("-", argv[1])) { - data_fd = open(argv[1], O_RDONLY); - if (data_fd < 0) { - perror("Can't open input file"); - exit(1); - } - } - - /* Open output device */ - dev_fd = open(argv[2], O_RDWR); - if (dev_fd < 0) { - perror("Can't open output device"); - exit(1); - } - - /* Figure out the printer type based on the readback */ - read(dev_fd, rdbuf, READBACK_LEN); - for (printer_type2 = 0; printer_type2 < P_END ; printer_type2++) { - if (!fancy_memcmp(rdbuf, printers[printer_type2].init_readback, READBACK_LEN, -1, -1)) - break; - } - if (printer_type2 == P_END) { - ERROR("Unrecognized printer!\n"); - DEBUG("readback: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n", - rdbuf[0], rdbuf[1], rdbuf[2], rdbuf[3], - rdbuf[4], rdbuf[5], rdbuf[6], rdbuf[7], - rdbuf[8], rdbuf[9], rdbuf[10], rdbuf[11]); - } - - /* Figure out printer this file is intended for */ - read(data_fd, buffer, MAX_HEADER); - - printer_type = parse_printjob(buffer, &bw_mode, &plane_len); - if (printer_type < 0) { - ERROR("Unrecognized file format!\n"); - exit(-1); - } - - if (printer_type != printer_type2) { - ERROR("File intended for a %s printer, aborting!\n", printers[printer_type].model); - exit(-1); - } else { - DEBUG("Printing a %s file\n", printers[printer_type].model); - } - - plane_len += 12; /* Add in plane header */ - paper_code_offset = printers[printer_type].paper_code_offset; - if (paper_code_offset != -1) - paper_code = printers[printer_type].paper_codes[buffer[printers[printer_type].pgcode_offset]]; - - read(dev_fd, rdbuf, READBACK_LEN); /* Read the status from printer */ -top: - - read(dev_fd, rdbuf, READBACK_LEN); /* Read the status from printer */ - if (memcmp(rdbuf, rdbuf2, READBACK_LEN)) { - DEBUG("readback: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n", - rdbuf[0], rdbuf[1], rdbuf[2], rdbuf[3], - rdbuf[4], rdbuf[5], rdbuf[6], rdbuf[7], - rdbuf[8], rdbuf[9], rdbuf[10], rdbuf[11]); - memcpy(rdbuf2, rdbuf, READBACK_LEN); - } else { - sleep(1); - } - if (state != last_state) { - DEBUG("last_state %d new %d\n", last_state, state); - last_state = state; - } - fflush(stderr); - - /* Error detection */ - if (printers[printer_type].error_offset != -1 && - rdbuf[printers[printer_type].error_offset]) { - ERROR("error condition %02x; aborting. (Out of ribbon/paper?)\n", rdbuf[printers[printer_type].error_offset]); - return 4; - } - - switch(state) { - case S_IDLE: - if (!fancy_memcmp(rdbuf, printers[printer_type].init_readback, READBACK_LEN, paper_code_offset, paper_code)) { - state = S_PRINTER_READY; - break; - } - break; - case S_PRINTER_READY: - DEBUG("Sending init sequence (%d bytes)\n", printers[printer_type].init_length); - write(dev_fd, buffer, printers[printer_type].init_length); /* Send printer_init */ - /* Realign plane data to start of buffer.. */ - memmove(buffer, buffer+printers[printer_type].init_length, - MAX_HEADER-printers[printer_type].init_length); - - state = S_PRINTER_INIT_SENT; - break; - case S_PRINTER_INIT_SENT: - if (!fancy_memcmp(rdbuf, printers[printer_type].ready_y_readback, READBACK_LEN, paper_code_offset, paper_code)) { - state = S_PRINTER_READY_Y; - } - break; - case S_PRINTER_READY_Y: - if (bw_mode) - DEBUG("Sending BLACK plane\n"); - else - DEBUG("Sending YELLOW plane\n"); - dump_data(plane_len, MAX_HEADER-printers[printer_type].init_length, data_fd, dev_fd, buffer, BUF_LEN); - state = S_PRINTER_Y_SENT; - break; - case S_PRINTER_Y_SENT: - if (!fancy_memcmp(rdbuf, printers[printer_type].ready_m_readback, READBACK_LEN, paper_code_offset, paper_code)) { - if (bw_mode) - state = S_PRINTER_DONE; - else - state = S_PRINTER_READY_M; - } - break; - case S_PRINTER_READY_M: - DEBUG("Sending MAGENTA plane\n"); - dump_data(plane_len, 0, data_fd, dev_fd, buffer, BUF_LEN); - state = S_PRINTER_M_SENT; - break; - case S_PRINTER_M_SENT: - if (!fancy_memcmp(rdbuf, printers[printer_type].ready_c_readback, READBACK_LEN, paper_code_offset, paper_code)) { - state = S_PRINTER_READY_C; - } - break; - case S_PRINTER_READY_C: - DEBUG("Sending CYAN plane\n"); - dump_data(plane_len, 0, data_fd, dev_fd, buffer, BUF_LEN); - state = S_PRINTER_C_SENT; - break; - case S_PRINTER_C_SENT: - if (!fancy_memcmp(rdbuf, printers[printer_type].done_c_readback, READBACK_LEN, paper_code_offset, paper_code)) { - state = S_PRINTER_DONE; - } - break; - case S_PRINTER_DONE: - if (printers[printer_type].foot_length) { - DEBUG("Sending cleanup sequence\n"); - dump_data(printers[printer_type].foot_length, 0, data_fd, dev_fd, buffer, BUF_LEN); - } - state = S_FINISHED; - /* Intentional Fallthrough */ - case S_FINISHED: - DEBUG("All data sent to printer!\n"); - break; - } - if (state != S_FINISHED) - goto top; - - return 0; -}