← Back to branch summary

~ubuntu-branches/ubuntu/trusty/grub2/trusty

« back to all changes in this revision

Viewing changes to grub-core/term/efi/serial.c

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2014-01-16 15:18:04 UTC
  • mfrom: (17.6.38 experimental)
  • Revision ID: package-import@ubuntu.com-20140116151804-3foouk7fpqcq3sxx
Tags: 2.02~beta2-2
* Convert patch handling to git-dpm.
* Add bi-endian support to ELF parser (Tomohiro B Berry).
* Adjust restore_mkdevicemap.patch to mark get_kfreebsd_version as static,
  to appease "gcc -Werror=missing-prototypes".
* Cherry-pick from upstream:
  - Change grub-macbless' manual page section to 8.
* Install grub-glue-efi, grub-macbless, grub-render-label, and
  grub-syslinux2cfg.
* grub-shell: Pass -no-pad to xorriso when building floppy images.

Show diffs side-by-side

added added

removed removed

Lines of Context:
grub-core/term/efi/serial.c
44
44
  };
45
45
  const grub_efi_stop_bits_t stop_bits[] = {
46
46
    [GRUB_SERIAL_STOP_BITS_1] = GRUB_EFI_SERIAL_1_STOP_BIT,
 
47
    [GRUB_SERIAL_STOP_BITS_1_5] = GRUB_EFI_SERIAL_1_5_STOP_BITS,
47
48
    [GRUB_SERIAL_STOP_BITS_2] = GRUB_EFI_SERIAL_2_STOP_BITS,
48
49
  };
49
50
 
57
58
                       stop_bits[port->config.stop_bits]);
58
59
  if (status != GRUB_EFI_SUCCESS)
59
60
    port->broken = 1;
 
61
 
 
62
  status = efi_call_2 (port->interface->set_control_bits, port->interface,
 
63
                       port->config.rtscts ? 0x4002 : 0x2);
 
64
 
60
65
  port->configured = 1;
61
66
}
62
67
 
111
116
                       N_("unsupported serial port parity"));
112
117
 
113
118
  if (config->stop_bits != GRUB_SERIAL_STOP_BITS_1
 
119
      && config->stop_bits != GRUB_SERIAL_STOP_BITS_1_5
114
120
      && config->stop_bits != GRUB_SERIAL_STOP_BITS_2)
115
121
    return grub_error (GRUB_ERR_BAD_ARGUMENT,
116
122
                       N_("unsupported serial port stop bits number"));