Changes in uspace/drv/ns8250/ns8250.c [33dbbd2:49698fa] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/ns8250/ns8250.c
r33dbbd2 r49698fa 123 123 static void delete_ns8250_dev_data(ns8250_dev_data_t *data) 124 124 { 125 if ( data != NULL)125 if (NULL != data) 126 126 free(data); 127 127 } … … 251 251 static void ns8250_dev_cleanup(device_t *dev) 252 252 { 253 if ( dev->driver_data != NULL) {253 if (NULL != dev->driver_data) { 254 254 delete_ns8250_dev_data((ns8250_dev_data_t*) dev->driver_data); 255 255 dev->driver_data = NULL; … … 332 332 /* Allocate driver data for the device. */ 333 333 ns8250_dev_data_t *data = create_ns8250_dev_data(); 334 if ( data == NULL)334 if (NULL == data) 335 335 return ENOMEM; 336 336 dev->driver_data = data; … … 436 436 /* Enable interrupt globally. */ 437 437 res = interrupt_enable(data->irq); 438 if ( res != EOK)438 if (EOK != res) 439 439 return res; 440 440 … … 480 480 uint8_t div_low, div_high; 481 481 482 if ( baud_rate < 50 || MAX_BAUD_RATE % baud_rate != 0) {482 if (50 > baud_rate || 0 != MAX_BAUD_RATE % baud_rate) { 483 483 printf(NAME ": error - somebody tried to set invalid baud rate " 484 484 "%d\n", baud_rate); … … 534 534 * @param stop_bits The number of stop bits used (one or two). 535 535 */ 536 static void ns8250_port_get_com_props(ioport8_t *port, unsigned int *parity, 536 static void 537 ns8250_port_get_com_props(ioport8_t *port, unsigned int *parity, 537 538 unsigned int *word_length, unsigned int *stop_bits) 538 539 { … … 571 572 * is invalid. 572 573 */ 573 static int ns8250_port_set_com_props(ioport8_t *port, unsigned int parity, 574 static int 575 ns8250_port_set_com_props(ioport8_t *port, unsigned int parity, 574 576 unsigned int word_length, unsigned int stop_bits) 575 577 { … … 689 691 * @param dev The serial port device. 690 692 */ 691 static inline void ns8250_interrupt_handler(device_t *dev, ipc_callid_t iid,692 693 static inline void 694 ns8250_interrupt_handler(device_t *dev, ipc_callid_t iid, ipc_call_t *icall) 693 695 { 694 696 ns8250_read_from_device(dev); … … 724 726 * @param dev The serial port device. 725 727 */ 726 static int ns8250_add_device(device_t *dev) 728 static int ns8250_add_device(device_t *dev) 727 729 { 728 730 printf(NAME ": ns8250_add_device %s (handle = %d)\n", … … 730 732 731 733 int res = ns8250_dev_initialize(dev); 732 if ( res != EOK)734 if (EOK != res) 733 735 return res; 734 736 … … 748 750 749 751 /* Register interrupt handler. */ 750 if ( ns8250_register_interrupt_handler(dev) != EOK) {752 if (EOK != ns8250_register_interrupt_handler(dev)) { 751 753 printf(NAME ": failed to register interrupt handler.\n"); 752 754 ns8250_dev_cleanup(dev); … … 756 758 /* Enable interrupt. */ 757 759 res = ns8250_interrupt_enable(dev); 758 if ( res != EOK) {760 if (EOK != res) { 759 761 printf(NAME ": failed to enable the interrupt. Error code = " 760 762 "%d.\n", res); … … 857 859 * @param stop_bits The number of stop bits to be used. 858 860 */ 859 static int ns8250_set_props(device_t *dev, unsigned int baud_rate, 860 unsigned int parity, unsigned int word_length, unsigned int stop_bits) 861 static int 862 ns8250_set_props(device_t *dev, unsigned int baud_rate, unsigned int parity, 863 unsigned int word_length, unsigned int stop_bits) 861 864 { 862 865 printf(NAME ": ns8250_set_props: baud rate %d, parity 0x%x, word " … … 871 874 ns8250_port_interrupts_disable(port); 872 875 ret = ns8250_port_set_baud_rate(port, baud_rate); 873 if ( ret == EOK)876 if (EOK == ret) 874 877 ret = ns8250_port_set_com_props(port, parity, word_length, stop_bits); 875 878 ns8250_port_interrupts_enable(port); … … 884 887 * Configure the parameters of the serial communication. 885 888 */ 886 static void ns8250_default_handler(device_t *dev, ipc_callid_t callid,887 889 static void 890 ns8250_default_handler(device_t *dev, ipc_callid_t callid, ipc_call_t *call) 888 891 { 889 892 ipcarg_t method = IPC_GET_METHOD(*call);
Note:
See TracChangeset
for help on using the changeset viewer.